Merge remote-tracking branch 'gregor/SJRK-297' into stories-floe-dev

* gregor/SJRK-297: SJRK-297: removed extraneous `else` in handlebars markup SJRK-297: Fix the race condition resulted from having multiple distributeOptions blocks on the same option value. SJRK-297: `sojustrepairit` theme Edit link now based on authoring flag SJRK-297: removing edit page links since story gathering is complete
fluid-project · Nov 18, 2019 · 81cdcdb · 81cdcdb
2 parents ceba010 + 66ab083
commit 81cdcdb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/ui/storyTellingServerUI.js b/src/ui/storyTellingServerUI.js
@@ -40,13 +40,14 @@ sjrk.storyTelling.loadStoryFromParameter = function (clientConfig, options) {
         $.get("/stories/" + storyId, function (data) {
             var retrievedStory = JSON.parse(data);
 
-            options = options || {};
+            options = options || {
+                pageSetup: {
+                    authoringEnabled: clientConfig.authoringEnabled
+                }
+            };
             options.distributeOptions = [{
                 "target": "{that story}.options.model",
                 "record": retrievedStory
-            },{
-                "target": "{that}.options.pageSetup.authoringEnabled",
-                "record": clientConfig.authoringEnabled
             }];
 
             // TODO: Move this string to another file and localize it
@@ -86,13 +87,14 @@ sjrk.storyTelling.loadBrowse = function (clientConfig, options) {
     $.get("/stories", function (data) {
         var browseResponse = JSON.parse(data);
 
-        options = options || {};
+        options = options || {
+            pageSetup: {
+                authoringEnabled: clientConfig.authoringEnabled
+            }
+        };
         options.distributeOptions = [{
             "target": "{that storyBrowser}.options.model",
             "record": browseResponse
-        },{
-            "target": "{that}.options.pageSetup.authoringEnabled",
-            "record": clientConfig.authoringEnabled
         }];
 
         var storyBrowseComponent = sjrk.storyTelling[clientConfig.theme].page.storyBrowse(options);

diff --git a/themes/sojustrepairit/css/sojustrepairit.css b/themes/sojustrepairit/css/sojustrepairit.css
@@ -84,10 +84,13 @@ h3:empty {
     align-items: center;
     position: relative;
     flex-wrap: wrap;
-    top: 1.75rem;
     justify-content: flex-end;
 }
 
+.sjrk-st-top-menu.authoring-enabled {
+    top: 1.75rem;
+}
+
 .sjrk-st-top-menu nav {
     display: inline-block;
 }

diff --git a/themes/sojustrepairit/templates/sojustrepairit-masthead.handlebars b/themes/sojustrepairit/templates/sojustrepairit-masthead.handlebars
@@ -1,11 +1,13 @@
 <div class="sjrk-st-page-header">
     <a href="https://sojustrepairit.org" class="sjrk-st-page-header-main-title" aria-label="{{localizedMessages.mastheadTitle}}"></a>
 </div>
-<div class="sjrk-st-top-menu">
+<div class="sjrk-st-top-menu{{#if dynamicValues.authoringEnabled}} authoring-enabled{{/if}}">
     <nav>
         <ul>
             <li><a href="storyBrowse.html">{{localizedMessages.link_browse_text}}</a></li>
         </ul>
     </nav>
-    <a class="sjrk-st-edit-link" href="{{localizedMessages.editor_url}}">{{localizedMessages.link_edit_text}}</a>
+    {{#if dynamicValues.authoringEnabled}}
+        <a class="sjrk-st-edit-link" href="{{localizedMessages.editor_url}}">{{localizedMessages.link_edit_text}}</a>
+    {{/if}}
 </div>