Merge pull request #599 from eb1/master

Fix #598
adapt-it · Sep 17, 2024 · 2a72d5e · 2a72d5e
2 parents 96496ed + 1bce122
commit 2a72d5e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 87 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="60" defaultlocale="en" id="org.adaptit.adaptitmobile" ios-CFBundleVersion="1" version="1.17.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0">
+<widget android-versionCode="61" defaultlocale="en" id="org.adaptit.adaptitmobile" ios-CFBundleVersion="1" version="1.17.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0">
     <name short="Adapt It Mobile" xml:lang="en">Adapt It Mobile</name>
     <description xml:lang="en">
         An open source application for translating between related languages.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adapt-it-mobile",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "Adapt It Mobile",
   "repository": {
     "type": "git",

diff --git a/www/js/Application.js b/www/js/Application.js
@@ -78,8 +78,8 @@ define(function (require) {
             searchIndex: 0,
             currentProject: null,
             localURLs: [],
-            version: "1.17.1", // appended with Android / iOS build info
-            AndroidBuild: "60", // (was milestone release #)
+            version: "1.17.2", // appended with Android / iOS build info
+            AndroidBuild: "61", // (was milestone release #)
             iOSBuild: "1", // iOS uploaded build number for this release (increments from 1 for each release) 
             importingURL: "", // for other apps in Android-land sending us files to import
 
@@ -405,6 +405,15 @@ define(function (require) {
                     window.Application.main.show(new ProjectViews.EditProjectView({model: proj[0]}));
                 }
             },
+            editProjectPage: function (id, page) {
+                // edit the selected project
+                var proj = this.ProjectList.where({projectid: id});
+                var projView = new ProjectViews.EditProjectView({model: proj[0]});
+                if (proj !== null) {
+                    window.Application.main.show(projView);
+                    projView.ShowView(parseInt(page, 10));
+                }
+            },
             // Copy project view
             copyProject: function () {
                 var proj = new projModel.Project();

diff --git a/www/js/router.js b/www/js/router.js
@@ -17,6 +17,7 @@ define(function (require) {
             "copy":        "copyProject",       // #copy
             "project":      "newProject",       // #project
             "project/:id":  "editProject",      // #project/projectID
+            "project/:id/:page":  "editProjectPage",    // #project/projectID/page number (detail view for edit project)
             "search/:id":   "lookupChapter",    // #search/projectID
             "kb/:id":       "editKB",           // #kb/projectID (KB editor)
             "tu":           "newTU",            // #tu (create a new TU)

diff --git a/www/js/views/ProjectViews.js b/www/js/views/ProjectViews.js
@@ -1123,17 +1123,7 @@ define(function (require) {
                 'change': 'render'
             },
             events: {
-                "click #EditorUIPrefs": "OnEditorUIPrefs",
-                "click #CurrentProject": "OnCurrentProject",
                 "click #KBEditor": "OnKBEditor",
-                "click #SourceLanguage": "OnEditSourceLanguage",
-                "click #TargetLanguage": "OnEditTargetLanguage",
-                "click #sourceFont": "OnEditSourceFont",
-                "click #targetFont": "OnEditTargetFont",
-                "click #navFont": "OnEditNavFont",
-                "click #Punctuation": "OnEditPunctuation",
-                "click #Cases": "OnEditCases",
-                "click #Filtering": "OnEditFiltering",
                 "focus #LanguageName": "onFocusLanguageName",
                 "keydown #LanguageName": "onKeydownLanguageName",
                 "focus #LanguageVariant": "onFocusLanguageVariant",
@@ -1151,17 +1141,10 @@ define(function (require) {
                 "click #Cancel": "OnCancel",
                 "click #OK": "OnOK"
             },
-            OnEditorUIPrefs: function () {
-                step = 9;
-                this.ShowView(step);
-            },
-            OnCurrentProject: function () {
-                step = 10;
-                this.ShowView(step);
-            },
             OnKBEditor: function () {
                 // KB editor is on a separate screen; tell the application to display it
-                window.Application.editKB(window.Application.currentProject.get("projectid"));
+                // URL is: kb/:projectid
+                window.Application.router.navigate("kb/" + window.Application.currentProject.get("projectid"), {trigger: true});
             },
             onFocusLanguageName: function (event) {
                 window.Application.scrollIntoViewCenter(event.currentTarget);
@@ -1252,63 +1235,27 @@ define(function (require) {
             OnClickCustomFilters: function (event) {
                 currentView.onClickCustomFilters(event);
             },
-            OnEditSourceLanguage: function () {
-                step = 1;
-                this.ShowView(step);
-            },
-            OnEditTargetLanguage: function () {
-                step = 2;
-                this.ShowView(step);
-            },
-            OnEditSourceFont: function () {
-                step = 3;
-                this.ShowView(step);
-            },
-            OnEditTargetFont: function () {
-                step = 4;
-                this.ShowView(step);
-            },
-            OnEditNavFont: function () {
-                step = 5;
-                this.ShowView(step);
-            },
-            OnEditPunctuation: function () {
-                step = 6;
-                this.ShowView(step);
-            },
-            OnEditCases: function () {
-                step = 7;
-                this.ShowView(step);
-            },
-            OnEditFiltering: function () {
-                step = 8;
-                this.ShowView(step);
-            },
             OnCancel: function () {
-                // just display the project settings list (don't save)
-                $("#WizStepTitle").hide();
-                $("#StepInstructions").addClass("hide");
-                $("#tbBottom").addClass("hide");
-                $('#ProjectItems').removeClass("hide");
-                $("#StepTitle").html(i18n.t('view.lblProjectSettings'));
-                $(".container").attr("style", "height: calc(100% - 70px);");
-                $("#editor").removeClass("scroller-bottom-tb");
-                $("#editor").addClass("scroller-notb");
-                this.removeRegion("container");
+                // just go back (don't save)
+                if (window.history.length > 1) {
+                    // there actually is a history -- go back
+                    window.history.back();
+                } else {
+                    // no history (import link from outside app) -- just go home
+                    window.location.replace("");
+                }
             },
             OnOK: function () {
                 // save the info from the current step
                 this.UpdateProject(step);
-                // show / hide the appropriate UI elements
-                $("#WizStepTitle").hide();
-                $("#StepInstructions").addClass("hide");
-                $("#tbBottom").addClass("hide");
-                $('#ProjectItems').removeClass("hide");
-                $("#StepTitle").html(i18n.t('view.lblProjectSettings'));
-                $(".container").attr("style", "height: calc(100% - 70px);");
-                $("#editor").removeClass("scroller-bottom-tb");
-                $("#editor").addClass("scroller-notb");
-                this.removeRegion("container");
+                // go back
+                if (window.history.length > 1) {
+                    // there actually is a history -- go back
+                    window.history.back();
+                } else {
+                    // no history (import link from outside app) -- just go home
+                    window.location.replace("");
+                }
             },
 
             UpdateProject: function (step) {
@@ -1465,6 +1412,8 @@ define(function (require) {
                 this.addRegions({
                     container: "#StepContainer"
                 });
+                // set the current step #
+                step = number;
                 // hide the project list items
                 $("#WizStepTitle").show();
                 $("#StepInstructions").removeClass("hide");

diff --git a/www/tpl/EditProject.html b/www/tpl/EditProject.html
@@ -3,7 +3,7 @@
 }}
 <div class="topcoat-navigation-bar main_title bg-lightblue">
     <div class="topcoat-navigation-bar__item">
-        <a class="topcoat-icon-button--quiet back-button" href="#">
+        <a id="back" class="topcoat-icon-button--quiet back-button">
             <span class="topcoat-icon topcoat-icon--back"></span>
         </a>
     </div>
@@ -24,12 +24,12 @@ <h1 class="topcoat-navigation-bar__title bg-lightblue" id="StepTitle">{{t 'view.
 <div class="topcoat-list__header" id="lblAllTrans">{{t 'view.lblGeneralSettings'}}</div>
 <ul class="chapter-list topcoat-list__container">
 <li class="topcoat-list__item">
-    <a id="EditorUIPrefs">
+    <a id="EditorUIPrefs" href="#project/{{this.projectid}}/9">
     <header><h3>{{t 'view.ttlEditorUI'}}</h3></header>
     <span class="chevron"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="CurrentProject">
+    <a id="CurrentProject" href="#project/{{this.projectid}}/10">
     <header><h3>{{t 'view.ttlManageProjects'}}</h3></header>
     <span class="chevron"></span></a>
 </li>
@@ -42,49 +42,49 @@ <h1 class="topcoat-navigation-bar__title bg-lightblue" id="StepTitle">{{t 'view.
 <div class="topcoat-list__header" id="lblAllTrans">{{t 'view.ttlCurrentProjectSettings'}}</div>
 <ul class="chapter-list topcoat-list__container">
 <li class="topcoat-list__item">
-    <a id="SourceLanguage">
+    <a id="SourceLanguage" href="#project/{{this.projectid}}/1">
     <header><h3>{{t 'view.lblSourceLanguageName'}}: {{SourceLanguageName}}</h3></header>
     <div class="control-row">{{t 'view.lblCode'}}: {{SourceLanguageCode}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="TargetLanguage">
+    <a id="TargetLanguage" href="#project/{{this.projectid}}/2">
     <header><h3>{{t 'view.lblTargetLanguageName'}}: {{TargetLanguageName}}</h3></header>
     <div class="control-row">{{t 'view.lblCode'}}: {{TargetLanguageCode}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>    
 <li class="topcoat-list__item">
-    <a id="sourceFont">
+    <a id="sourceFont" href="#project/{{this.projectid}}/3">
     <header><h3>{{t 'view.lblSourceFont'}}</h3></header>
     <div style="color: {{SourceColor}}; font-size: {{SourceFontSize}}px; font-family: '{{SourceFont}}';">{{SourceFont}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="targetFont">
+    <a id="targetFont" href="#project/{{this.projectid}}/4">
     <header><h3>{{t 'view.lblTargetFont'}}</h3></header>
     <div style="color: {{TargetColor}}; font-size: {{TargetFontSize}}px; font-family: '{{TargetFont}}';">{{TargetFont}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="navFont">
+    <a id="navFont" href="#project/{{this.projectid}}/5">
     <header><h3>{{t 'view.lblNavFont'}}</h3></header>
     <div style="color: {{NavigationColor}}; font-size: {{NavigationFontSize}}px; font-family:'{{NavigationFont}}';">{{NavigationFont}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="Punctuation">
+    <a id="Punctuation" href="#project/{{this.projectid}}/6">
     <header><h3>{{t 'view.ttlPunctuation'}}</h3></header>
     <div>{{#ifCond CopyPunctuation '==' 'true'}}{{ t 'view.lblCopyPunctuation'}}{{else}}{{ t 'view.lblNoPunctuationCopy'}}{{/ifCond}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="Cases">
+    <a id="Cases" href="#project/{{this.projectid}}/7">
     <header><h3>{{t 'view.ttlCases'}}</h3></header>
     <div>{{#ifCond AutoCapitalization '==' 'true'}}{{ t 'view.lblAutoCapitalize'}}{{else}}{{ t 'view.lblNoAutoCapitalization'}}{{/ifCond}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>
 </li>
 <li class="topcoat-list__item">
-    <a id="Filtering">
+    <a id="Filtering" href="#project/{{this.projectid}}/8">
     <header><h3>{{t 'view.ttlFilter'}}</h3></header>
     <div>{{#ifCond CustomFilters '==' 'true'}}{{ t 'view.lblCustomFilters'}}{{else}}{{ t 'view.lblFilteringDefault'}}{{/ifCond}}</div>
     <span class="chevron" style="top:1.25rem;"></span></a>

diff --git a/www/tpl/TargetUnitList.html b/www/tpl/TargetUnitList.html
@@ -3,7 +3,7 @@
 }}
 <div class="topcoat-navigation-bar main_title bg-lightblue">
     <div class="topcoat-navigation-bar__item">
-        <a class="topcoat-icon-button--quiet back-button" aria-label="{{ t 'view.dscBack'}}" href="index.html"><span class="topcoat-icon topcoat-icon--back"></span></a>
+        <a class="topcoat-icon-button--quiet back-button" aria-label="{{ t 'view.dscBack'}}"><span class="topcoat-icon topcoat-icon--back"></span></a>
     </div>
     <div class="topcoat-navigation-bar__item half"><h2>{{t 'view.lblKB'}}</h2></div>
     <div class="topcoat-navigation-bar__item right">