Version 1.4.2, corresponding with June 2017 ArcGIS Online release.

Esri · Jul 3, 2017 · c81d677 · c81d677
1 parent 81fcdba
commit c81d677
Show file tree

Hide file tree

Showing 425 changed files with 8,347 additions and 3,826 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,7 @@ root = true
 
 [*]
 charset = utf-8
-end_of_line = cr
+end_of_line = lf
 indent_size = 2
 indent_style = space
 insert_final_newline = true

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -249,8 +249,8 @@
               cwd: 'src/lib/font-awesome/fonts/',
               src: ['**'],
               dest: 'deploy/resources/lib/font-awesome/fonts/'
-            },
-            /*
+            }/*,
+
             {
               expand: true,
               cwd: 'src/lib-app/bootstrap/fonts/',
@@ -262,13 +262,13 @@
               cwd: 'src/lib-app/colorbox/',
               src: ['colorbox.css', 'images/**'],
               dest: 'deploy/resources/lib/colorbox/'
-            },*/
+            },
             {
               expand: true,
               cwd: 'src/lib/zero-clipboard/dist',
               src: ['ZeroClipboard.swf'],
               dest: 'deploy/resources/lib/zero-clipboard/'
-            }
+            }*/
           ]
         },
         jsapioptim: {

diff --git a/README.md b/README.md
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "cascade-storytelling-template-js-dev",
-  "version": "1.3.3",
+  "version": "1.4.2",
   "homepage": "",
   "authors": [
     "Gregory L'Azou <glazou@esri.com>"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Storymaps-Cascade",
-  "version": "1.3.3",
+  "version": "1.4.2",
   "description": "The Story Map Cascade app lets you combine narrative text with maps, images, and multimedia content in an engaging, full-screen scrolling experience",
   "license": "Apache-2.0",
   "repository": {

diff --git a/src/app/main-app.js b/src/app/main-app.js
@@ -23,6 +23,7 @@ require([
   i18nViewer
 ) {
   window.i18n = i18nViewer;
+  var mainViewInstance = new MainView();
 
   if (app.isInBuilder) {
     // TODO: check if that step is still required
@@ -51,12 +52,12 @@ require([
       ) {
         var builderView = new BuilderView(Core, Builder);
 
-        Core.init(MainView, Builder);
+        Core.init(mainViewInstance, Builder);
         Builder.init(Core, builderView);
       });
     });
   }
   else {
-    Core.init(MainView);
+    Core.init(mainViewInstance);
   }
 });
diff --git a/src/app/storymaps/common/Core.js b/src/app/storymaps/common/Core.js
@@ -179,7 +179,7 @@ define([
     if (app.isInBuilder && (has('ie') || has('trident') || has('ff') || has('edge'))) {
       $('#fatalError .error-title').html(i18n.viewer.errors.sorry);
 //      $('#fatalError .error-msg').html(i18n.viewer.errors.builderSupport3.replace('${CHROME}', '<a href="https://www.google.com/chrome/" target="_blank">Chrome</a>').replace('${SAFARI}', '<a href="https://www.apple.com/safari/" target="_blank">Safari</a>'));
-      $('#fatalError .error-msg').html(i18n.viewer.errors.builderSupport4.replace('${CHROME}', '<a href="https://www.google.com/chrome/" target="_blank">Chrome</a>').replace('${SAFARI}', '<a href="https://www.apple.com/safari/" target="_blank">Safari</a>').replace('${ESRI-SUPPORT}', '<a href="https://support.esri.com" target="_blank">Esri Support</a>').replace('${FIREFOX-BUILDER}', '<a href="http://links.esri.com/storymaps/vote-for-cascade-builder-on-firefox" target="_blank">Firefox</a>').replace('${IE-BUILDER}', '<a href="http://links.esri.com/storymaps/vote-for-cascade-builder-on-ie" target="_blank">IE</a>'));
+      $('#fatalError .error-msg').html(i18n.viewer.errors.builderSupport4.replace('${CHROME}', '<a href="https://www.google.com/chrome/" target="_blank">Chrome</a>').replace('${SAFARI}', '<a href="https://www.apple.com/safari/" target="_blank">Safari</a>').replace('${ESRI-SUPPORT}', '<a href="https://support.esri.com" target="_blank">Esri Support</a>').replace('${BROWSER-SUPPORT-VOTE}', '<a href="http://links.esri.com/storymaps/vote-for-cascade-builder-browser-support" target="_blank">vote here</a>'));
       $('#fatalError').show();
       return;
     }
@@ -601,6 +601,8 @@ define([
         app.userCanEdit = CommonHelper.userIsAppOwner();
 
         definePortalConfig();
+        app.portal.signedIn = true;
+        topic.publish('portal-signin');
         resultDeferred.resolve();
       },
       function() {

diff --git a/src/app/storymaps/common/Core.less b/src/app/storymaps/common/Core.less
@@ -49,6 +49,13 @@
     color: #fff;
   }
 
+  &.inverse.darker {
+    background-color: @gray-base;
+    &:hover, &:focus {
+      color: @gray-lighter;
+    }
+  }
+
   &.inverse:active {
     background-color: black;
   }
@@ -90,6 +97,21 @@
     color: @gray-dark;
   }
 
+  &.lightest {
+    color: #fff;
+    &:hover, &:focus {
+      color: @gray-lighter;
+    }
+    &:active {
+      color: @gray-light;
+    }
+  }
+
+  &:focus, &.active:focus {
+    outline-width: thin;
+    outline-color: @link-color;
+  }
+
   &:hover, &:focus {
     color: @gray-darker;
   }
@@ -162,28 +184,45 @@
 .tooltip-danger {
 
   .tooltip-inner {
-    background: fade(@sm-brand-danger, 80%);
+    background: fade(@sm-brand-danger, 95%);
     color: @btn-danger-color;
   }
 
   &.bottom .tooltip-arrow {
-    border-bottom-color: fade(@sm-brand-danger, 80%);
+    border-bottom-color: fade(@sm-brand-danger, 95%);
   }
 
   &.right .tooltip-arrow {
-    border-right-color: fade(@sm-brand-danger, 80%);
+    border-right-color: fade(@sm-brand-danger, 95%);
   }
 
   &.left .tooltip-arrow {
-    border-left-color: fade(@sm-brand-danger, 80%);
+    border-left-color: fade(@sm-brand-danger, 95%);
   }
 
   &.top .tooltip-arrow {
-    border-top-color: fade(@sm-brand-danger, 80%);
+    border-top-color: fade(@sm-brand-danger, 95%);
   }
 
 }
 
+.blue-text {
+  color: @link-color;
+  font-weight: bold;
+}
+
+.white-text {
+  color: white;
+}
+
+// TODO: I worry this is too specific a selector for just a link.
+.theme-contrast-light .section-layout-sequence a {
+  color: @lighter-link;
+  &:hover, &:active {
+    color: @lighter-link-hover;
+  }
+}
+
 #fatalError > table {
   border: 2px solid @link-color;
 }
diff --git a/src/app/storymaps/common/_resources/nls/ar/core.js b/src/app/storymaps/common/_resources/nls/ar/core.js
@@ -1,14 +1,15 @@
 /* eslint quotes: ["error", "double"] */
-/* strings files need to be double quotes */
 define({
   "commonCore": {
     "builderPanel": {
+      "builderNamePrefix": "",
+      "builderNameSuffix": "مُنشئ",
       "buttonSaving": "حفظ",
       "buttonSaved": "تم الحفظ",
       "buttonError": "فشل الحفظ",
       "buttonShare": "مشاركة",
       "buttonSettings": "إعدادات",
-      "buttonHelp": "تعليمات",
+      "buttonHelp": "احصل على التعليمات أو أرسل ملاحظاتك بشأن GeoNet",
       "buttonPreview": "عرض القصة",
       "buttonHealth": "تقرير صحي",
       "manageStories": "إدارة القصص",
@@ -31,7 +32,13 @@ define({
     "share": {
       "btnPrivate": "خاص",
       "btnOrg": "المُنشأة",
-      "btnPublic": "عام"
+      "btnPublic": "عام",
+      "btnEveryone": "الكل"
+    },
+    "portal": {
+      "disconnected": "هذه البوابة الإلكترونية غير متصلة بالإنترنت",
+      "portal": "بوابة إلكترونية",
+      "portalArcGIS": "مدخل لـ ArcGIS"
     }
   }
 });
diff --git a/src/app/storymaps/common/_resources/nls/ar/media.js b/src/app/storymaps/common/_resources/nls/ar/media.js
@@ -1,4 +1,3 @@
-// nls expects double quotes
 /*eslint quotes:[2, 'double'] */
 define({
   "mediaPicker": {
@@ -65,15 +64,15 @@ define({
             "embedProtocolWarning3": "وكبديل، أضف رابطًا في السرد لفتح الصفحة في علامة تبويب مستعرض جديدة. ${linkText}",
             "linkText": "تعلّم المزيد."
           },
-          "placeholder": "${https://}... or ${http://}... or ${<iframe>}",
+          "placeholder": "${https://}... أو ${http://}... أو ${<iframe>}",
           "uploadErrors": {
             "generic": "حدث خطأ ما في ال",
             "imageOnly1": "يجب أن تستخدم صورة في هذا الجزء من القصة.",
             "imageOnly2": "يرجى توفير رابط إلى الصورة (.jpg, .png, .gif) أو اختيار صورة من ${ArcGIS} أو ${Flickr} أو ${Google+} أو ${Unsplash}.",
             "imageAndVideo1": "يجب أن تستخدم صورة أو مقطع فيديو في هذا الجزء من القصة.",
             "imageAndVideo2": "يرجى توفير رابط إلى الصورة (.jpg, .png, .gif) أو مقطع فيديو على ${YouTube} أو ${Vimeo} أو اختيار صورة من ${ArcGIS} أو ${Flickr} أو ${Google+} أو ${Unsplash}.",
-            "badFormat": "تنسيق الرابط إلى ${media-type} الذي تريد تحاول إضافته غير صحيح.",
-            "inaccessible": "${media-type} الذي تحاول إضافتها مفقود أو لا يمكن الوصول إليه.",
+            "badFormat": "تم تنسيق رابط الملف الذي تريد تحاول إضافته بشكل غير صحيح.",
+            "inaccessible": "الملف الذي تحاول إضافته مفقود أو أنه لا يمكن الوصول إليه.",
             "tryAgain": "يرجى التحقق من العنوان وإعادة المحاولة.",
             "mediaTypes": {
               "VIDEO": "فيديو",
@@ -125,6 +124,8 @@ define({
           "searchLocation": {
             "thisStory": "هذه القصة",
             "agol": "ArcGIS Online",
+            "portalArcGIS": "Portal for ArcGIS",
+            "portal": "بوابة إلكترونية",
             "myOrg": "مؤسسة ${username}",
             "myContent": "الخاص"
           },

diff --git a/src/app/storymaps/common/_resources/nls/ar/texteditor.js b/src/app/storymaps/common/_resources/nls/ar/texteditor.js
@@ -7,8 +7,8 @@ define({
     "blockAdd": {
       "text": "النص",
       "media": "الوسائط",
-      "title": "جزء العنوان",
-      "immersive": "جزء شامل"
+      "title": "عنوان",
+      "immersive": "شامل"
     },
     "link": {
       "invite": "الصق أو أكتب الرابط..."

diff --git a/src/app/storymaps/common/_resources/nls/ar/webmap.js b/src/app/storymaps/common/_resources/nls/ar/webmap.js
diff --git a/src/app/storymaps/common/_resources/nls/bs/core.js b/src/app/storymaps/common/_resources/nls/bs/core.js
@@ -1,14 +1,15 @@
 /* eslint quotes: ["error", "double"] */
-/* strings files need to be double quotes */
 define({
   "commonCore": {
     "builderPanel": {
+      "builderNamePrefix": "",
+      "builderNameSuffix": "Sastavljač",
       "buttonSaving": "Spremanje",
       "buttonSaved": "Spremljeno",
       "buttonError": "Spremanje nije uspjelo",
       "buttonShare": "Podijeli",
       "buttonSettings": "Postavke",
-      "buttonHelp": "Pomoć",
+      "buttonHelp": "Potražite pomoć ili objavite povratnu informaciju na GeoNetu",
       "buttonPreview": "Prikaz priče",
       "buttonHealth": "Stanje sustava",
       "manageStories": "Upravljaj mojim pričama",
@@ -31,7 +32,13 @@ define({
     "share": {
       "btnPrivate": "Privatno",
       "btnOrg": "Organizacija",
-      "btnPublic": "Javnost"
+      "btnPublic": "Javnost",
+      "btnEveryone": "Svi"
+    },
+    "portal": {
+      "disconnected": "Ovaj portal nije povezan s internetom",
+      "portal": "Portal",
+      "portalArcGIS": "Portal for ArcGIS"
     }
   }
 });
diff --git a/src/app/storymaps/common/_resources/nls/bs/media.js b/src/app/storymaps/common/_resources/nls/bs/media.js
@@ -1,4 +1,3 @@
-// nls expects double quotes
 /*eslint quotes:[2, 'double'] */
 define({
   "mediaPicker": {
@@ -65,15 +64,15 @@ define({
             "embedProtocolWarning3": "Umjesto toga, dodajte poveznicu u priču za otvaranje stranice u novoj kartici preglednika. ${linkText}",
             "linkText": "Saznajte više."
           },
-          "placeholder": "${https://}... or ${http://}... or ${<iframe>}",
+          "placeholder": "${https://}... ili ${http://}... ili ${<iframe>}",
           "uploadErrors": {
             "generic": "Nešto je pošlo krivo s unesenom adresom. Pokušajte ponovno kasnije.",
             "imageOnly1": "Morate upotrijebiti sliku u ovom dijelu priče.",
             "imageOnly2": "Stavite poveznicu na sliku (.jpg, .png, .gif) ili izaberite sliku s usluge ${ArcGIS}, ${Flickr}, ${Google+} ili ${Unsplash}.",
             "imageAndVideo1": "Morate upotrijebiti sliku ili videozapis u ovom dijelu priče.",
             "imageAndVideo2": "Stavite poveznicu na sliku (.jpg, .png, .gif) ili videozapis na ${YouTube} ili ${Vimeo} ili izaberite sliku s usluge ${ArcGIS}, ${Flickr}, ${Google+} ili ${Unsplash}.",
-            "badFormat": "Poveznica na ${media-type} koju pokušavate dodati nije ispravno formatirana.",
-            "inaccessible": "${media-type} koju pokušavate dodati nedostaje ili nije dostupna.",
+            "badFormat": "Poveznica na datoteku koju pokušavate dodati nije ispravno formatirana.",
+            "inaccessible": "Datoteka koju pokušavate dodati nedostaje ili nije dostupna.",
             "tryAgain": "Provjerite adresu i pokušajte ponovno.",
             "mediaTypes": {
               "VIDEO": "videozapis",
@@ -125,6 +124,8 @@ define({
           "searchLocation": {
             "thisStory": "Ova priča",
             "agol": "ArcGIS Online",
+            "portalArcGIS": "Portal for ArcGIS",
+            "portal": "Portal",
             "myOrg": "Organizacija ${orgname}",
             "myContent": "Moj sadržaj"
           },

diff --git a/src/app/storymaps/common/_resources/nls/bs/texteditor.js b/src/app/storymaps/common/_resources/nls/bs/texteditor.js
@@ -7,8 +7,8 @@ define({
     "blockAdd": {
       "text": "Tekst",
       "media": "Mediji",
-      "title": "Naslov odjeljka",
-      "immersive": "Prožimajući odjeljak"
+      "title": "Naziv",
+      "immersive": "Prožimanje"
     },
     "link": {
       "invite": "Zalijepite ili upišite poveznicu..."

diff --git a/src/app/storymaps/common/_resources/nls/bs/webmap.js b/src/app/storymaps/common/_resources/nls/bs/webmap.js
diff --git a/src/app/storymaps/common/_resources/nls/core.js b/src/app/storymaps/common/_resources/nls/core.js
@@ -1,15 +1,16 @@
 /* eslint quotes: ["error", "double"] */
-/* strings files need to be double quotes */
 define({
   root: ({
     commonCore: {
       builderPanel: {
+        builderNamePrefix: "", //App title is "Cascade Builder", Cascade is not translated. This prefix string is included in case a translation of "Builder" requires words that preceed the untranslated "Cascade"
+        builderNameSuffix: "Builder", //See previous note
         buttonSaving: "Saving",
         buttonSaved: "Saved",
         buttonError: "Save failed",
         buttonShare: "Share",
         buttonSettings: "Settings",
-        buttonHelp: "Help",
+        buttonHelp: "Get Help or Submit Feedback on GeoNet",
         buttonPreview: "View Story",
         buttonHealth: "Health Report",
         manageStories: "Manage My Stories",
@@ -32,7 +33,13 @@ define({
       share: {
         btnPrivate: "Private",
         btnOrg: "Organization",
-        btnPublic: "Public"
+        btnPublic: "Public",
+        btnEveryone: "Everyone"
+      },
+      portal: {
+        disconnected: "This Portal is not connected to the Internet",
+        portal: "Portal",
+        portalArcGIS: "Portal for ArcGIS"
       }
     }
   }),