Finishing release 8.0

Merge branch 'release-8.0' Former-commit-id: 7f3ca19
unfoldingWord-dev · May 31, 2016 · 9668551 · 9668551
2 parents 5050ab3 + 0c9d359
commit 9668551
Show file tree

Hide file tree

Showing 69 changed files with 3,497 additions and 1,849 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "translationstudio",
   "productName": "translationStudio",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "A utility for translating the Bible and biblical content into any language.",
   "keywords": [],
   "homepage": "https://github.com/unfoldingWord-dev/ts-desktop",
@@ -34,19 +34,20 @@
     "request": "^2.58.0",
     "rimraf": "^2.4.2",
     "sql.js": "^0.2.21",
+    "trash": "^3.4.1",
     "untildify": "^2.1.0"
   },
   "devDependencies": {
     "bower": "^1.7.7",
     "electron-packager": "github:maxogden/electron-packager",
-    "electron-prebuilt": "^0.36.8",
+    "electron-prebuilt": "^0.36.9",
     "gulp": "^3.9.1",
     "gulp-mocha": "^2.2.0",
     "mocha": "^2.4.5",
     "yargs": "^3.17.1"
   },
   "engines": {
-    "electron": "0.36.8"
+    "electron": "0.36.9"
   },
   "scripts": {
     "start": "electron src/js/main.js"

diff --git a/src/assets/LICENSE.md b/src/assets/LICENSE.md
@@ -1,4 +1,4 @@
-## License
+## License:
 
 This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
 

diff --git a/src/assets/OBS_LICENSE.md b/src/assets/OBS_LICENSE.md
@@ -0,0 +1,29 @@
+## unfoldingWord | Open Bible Stories
+
+## an unrestricted visual mini-Bible in any language
+
+http://openbiblestories.com
+
+Open Bible Stories, v. 4
+
+Created by Distant Shores Media (http://distantshores.org) and the Door43 world missions community (http://door43.org).
+
+## License:
+
+This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
+
+### You are free to:
+
+**Share** - copy and redistribute the material in any medium or format
+
+**Adapt** - remix, transform, and build upon the material for any purpose, even commercially.
+
+### Under the following conditions:
+
+**Attribution** - You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
+
+**ShareAlike** - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+
+Use of trademarks: unfoldingWord is a trademark of Distant Shores Media and may not be included on any derivative works created from this content. Unaltered content from http://unfoldingword.org must include the unfoldingWord logo when distributed to others. But if you alter the content in any way, you must remove the unfoldingWord logo before distributing your work.
+
+Attribution of artwork: All images used in these stories are © Sweet Publishing (www.sweetpublishing.com) and are made available under a Creative Commons Attribution-Share Alike License (http://creativecommons.org/licenses/by-sa/3.0).
diff --git a/src/config/user-setting.json b/src/config/user-setting.json
@@ -26,6 +26,62 @@
         "enabled": true,
         "visible": true
     },
+    {
+        "name": "datalocation",
+        "mainText": "Backup Location",
+        "value": "~/translationStudio",
+        "group": "general",
+        "enabled": true,
+        "visible": true
+    },
+    {
+        "name": "appversion",
+        "mainText": "App Version",
+        "value": "0.0.0",
+        "group": "about",
+        "enabled": false,
+        "visible": true
+    },
+    {
+        "name": "datapath",
+        "mainText": "Data Path",
+        "value": "/test/path",
+        "group": "about",
+        "enabled": false,
+        "visible": true
+    },
+    {
+        "name": "license",
+        "mainText": "License Agreement",
+        "value": "",
+        "group": "legal",
+        "enabled": true,
+        "visible": true
+    },
+    {
+        "name": "guidelines",
+        "mainText": "Translation Guidelines",
+        "value": "",
+        "group": "legal",
+        "enabled": true,
+        "visible": true
+    },
+    {
+        "name": "statement",
+        "mainText": "Statement of Faith",
+        "value": "",
+        "group": "legal",
+        "enabled": true,
+        "visible": true
+    },
+    {
+        "name": "attribution",
+        "mainText": "Attribution",
+        "value": "",
+        "group": "legal",
+        "enabled": true,
+        "visible": true
+    },
     {
         "name": "dataserver",
         "mainText": "Data Server",
@@ -42,14 +98,6 @@
         "enabled": true,
         "visible": true
     },
-    {
-        "name": "datalocation",
-        "mainText": "Backup Location",
-        "value": "~/translationStudio",
-        "group": "advanced",
-        "enabled": true,
-        "visible": true
-    },
     {
         "name": "logginglevel",
         "mainText": "Logging Level",
@@ -74,21 +122,5 @@
         "group": "advanced",
         "enabled": true,
         "visible": true
-    },
-    {
-        "name": "appversion",
-        "mainText": "App Version",
-        "value": "0.0.0",
-        "group": "about",
-        "enabled": false,
-        "visible": true
-    },
-    {
-        "name": "datapath",
-        "mainText": "Data Path",
-        "value": "/test/path",
-        "group": "about",
-        "enabled": false,
-        "visible": true
     }
 ]
diff --git a/src/elements/ts-data/ts-data.html b/src/elements/ts-data/ts-data.html
diff --git a/src/elements/ts-home/ts-home-sidebar.html b/src/elements/ts-home/ts-home-sidebar.html
@@ -58,15 +58,14 @@
     </style>
 
     <template>
-        <paper-menu-button horizontal-offset="10" vertical-offset="10" vertical-align="bottom">
-            <paper-icon-button class="dropdown-trigger" icon="more-vert" title="options"></paper-icon-button>
+        <paper-menu-button id="menu" horizontal-offset="10" vertical-offset="10" vertical-align="bottom">
+            <paper-icon-button class="dropdown-trigger" icon="more-vert"></paper-icon-button>
             <paper-menu class="dropdown-content">
-                <paper-item on-tap="logout"><iron-icon class="smallicon" icon="perm-identity"></iron-icon>Logout</paper-item>
                 <paper-item class="hide"><iron-icon class="smallicon" icon="maps:local-library"></iron-icon>Update</paper-item>
-                <paper-item class="hide" on-tap="import"><iron-icon class="smallicon" icon="file-download"></iron-icon>Import</paper-item>
-                <paper-item on-tap="restore"><iron-icon class="smallicon" icon="file-download"></iron-icon>Restore</paper-item>
+                <paper-item on-tap="import"><iron-icon class="smallicon" icon="file-download"></iron-icon>Import/Restore</paper-item>
                 <paper-item on-tap="academy"><iron-icon class="smallicon" icon="book"></iron-icon>translationAcademy</paper-item>
                 <paper-item on-tap="feedback"><iron-icon class="smallicon" icon="announcement"></iron-icon>Feedback</paper-item>
+                <paper-item on-tap="logout"><iron-icon class="smallicon" icon="perm-identity"></iron-icon>Logout</paper-item>
                 <paper-item on-tap="settings"><iron-icon class="smallicon" icon="settings"></iron-icon>Settings</paper-item>
             </paper-menu>
         </paper-menu-button>
@@ -89,28 +88,29 @@
         },
 
         settings: function () {
+            this.$.menu.close();
             App.configurator.setValue("backto", this.route);
             this.route = 'settings';
         },
 
         feedback: function() {
+            this.$.menu.close();
             this.fire('iron-signal', {name: 'openfeedback'});
         },
 
         logout: function () {
+            this.$.menu.close();
             this.fire('iron-signal', {name: 'updateuser', data: {}});
             App.keyManager.destroyKeys();
         },
 
-        restore: function() {
-            this.fire('iron-signal', {name: 'openrestore'});
-        },
-
         import: function() {
+            this.$.menu.close();
             this.fire('iron-signal', {name: 'openimport'});
         },
 
         academy: function () {
+            this.$.menu.close();
             App.ipc.send('openacademy');
         },
 

diff --git a/src/elements/ts-home/ts-home.html b/src/elements/ts-home/ts-home.html
@@ -83,12 +83,11 @@
         }
 
         #list {
-            max-height: calc(100vh - 140px);
+            max-height: calc(100vh - 200px);
             display: flex;
             flex-direction: column;
             font-size: 110%;
             width: 620px;
-            box-shadow: 0 2px 3px 2px var(--border-color);
             overflow-y: auto;
         }
 
@@ -161,25 +160,40 @@
             display: flex;
             flex-direction: column;
             width: 400px;
-            height: 350px;
+            height: 400px;
         }
 
         #info p {
             margin: 0;
             font-size: 110%;
         }
 
-        #info .offset {
-            transform: translateX(30px);
+        #infoheader {
+            flex: 0 0 30px;
+        }
+
+        #infodata {
+            flex: auto;
+            display: flex;
+            flex-direction: column;
+        }
+
+        #namebox {
+            flex: 0 0 100px;
+            padding-left: 30px;
+            border: 1px solid var(--border-color);
+            overflow-y: auto;
         }
 
         #infoicons {
             border-bottom: 1px solid var(--border-color);
             border-top: 1px solid var(--border-color);
+            flex: 0 0 60px;
             align-self: stretch;
             display: flex;
             justify-content: space-between;
-            padding: 10px 20px;
+            align-items: center;
+            padding: 0 20px;
         }
 
         #righticons {
@@ -189,8 +203,10 @@
         }
 
         #infobuttons {
+            flex: 0 0 20px;
             display: flex;
             justify-content: center;
+            align-items: center;
         }
 
         #delete {
@@ -270,16 +286,20 @@
         </div>
 
         <paper-dialog id="info" class="popup" modal="true" entry-animation="scale-up-animation" exit-animation="scale-down-animation">
-            <h2><span>[[currentinfo.project.name]]</span> — <span>[[currentinfo.target_language.name]]</span></h2>
-            <div>
+            <div id="infoheader">
+                <h2><span>[[currentinfo.project.name]]</span> — <span>[[currentinfo.target_language.name]]</span></h2>
+            </div>
+            <div id="infodata">
                 <p>{{locale.project}}: <strong><span>[[currentinfo.project.name]]</span> (<span>[[currentinfo.project.id]]</span>)</strong></p>
                 <p>{{locale.target_language}}: <strong><span>[[currentinfo.target_language.name]]</span> (<span>[[currentinfo.target_language.id]]</span>)</strong></p>
                 <p>{{locale.progress}}: <strong><span>[[currentinfo.completion]]</span>%</strong></p>
                 <p>{{locale.translators}}:</p>
                 <template is="dom-if" if="{{currentinfo.translators.length}}">
-                    <template is="dom-repeat" items="{{currentinfo.translators}}" as="user">
-                        <p class="offset"><strong>{{user}}</strong></p>
-                    </template>
+                    <div id="namebox">
+                        <template is="dom-repeat" items="{{currentinfo.translators}}" as="user">
+                            <p><strong>{{user}}</strong></p>
+                        </template>
+                    </div>
                 </template>
             </div>
             <div id="infoicons">
@@ -288,7 +308,7 @@ <h2><span>[[currentinfo.project.name]]</span> — <span>[[currentinfo.target_lan
                 </div>
                 <div id="righticons">
                     <paper-icon-button on-tap="goprint" class="smallicon" icon="print" title="print"></paper-icon-button>
-                    <paper-icon-button on-tap="gopublish" class="smallicon" icon="cloud-done" title="publish"></paper-icon-button>
+                    <paper-icon-button on-tap="gopublish" class="smallicon" icon="cloud-done" title="upload"></paper-icon-button>
                     <paper-icon-button on-tap="gobackup" class="smallicon" icon="file-upload" title="backup"></paper-icon-button>
                 </div>
             </div>

diff --git a/src/elements/ts-main/ts-academy-titlebar.html b/src/elements/ts-main/ts-academy-titlebar.html
@@ -88,25 +88,44 @@
         is: 'ts-academy-titlebar',
 
         minimizeWindow: function() {
-            App.academyWindow.minimize();
+            this.academyWindow.minimize();
         },
 
         resizeWindow: function() {
-            App.academyWindow.isMaximized() ? App.academyWindow.unmaximize() : App.academyWindow.maximize();
+            this.academyWindow.isMaximized() ? this.academyWindow.unmaximize() : this.academyWindow.maximize();
         },
 
         closeWindow: function() {
-            App.academyWindow.close();
+            this.academyWindow.close();
         },
 
+        get academyWindow () {
+            return this._window('academy-window');
+        },
+
+        _window: function (windowName) {
+            var ipc = this.ipcRenderer,
+                send = ipc.sendSync.bind(ipc, windowName);
+
+            return {
+                close: send.bind(ipc, 'close'),
+                minimize: send.bind(ipc, 'minimize'),
+                maximize: send.bind(ipc, 'maximize'),
+                unmaximize: send.bind(ipc, 'unmaximize'),
+                isMaximized: send.bind(ipc, 'isMaximized')
+            };
+        },
+
+        ipcRenderer: require('electron').ipcRenderer,
+
         ready: function () {
             var resize = this.$.resizeicon;
 
-            App.ipc.on('maximize', function () {
+            this.ipcRenderer.on('maximize', function () {
                 resize.icon = 'titlebar:restore';
             });
 
-            App.ipc.on('unmaximize', function() {
+            this.ipcRenderer.on('unmaximize', function() {
                 resize.icon = 'titlebar:maximize';
             });
         }