feat(ui): update simple loading partial

Now you can pass text to simpleloading partial specifying what to display. By default it still says "Loading...". Signed-off-by: Aleksuei Riabtsev <aleksuei.riabtsev@ec.gc.ca>
RAMP-PCAR · Jul 6, 2015 · c1f643c · c1f643c
1 parent 976c57a
commit c1f643c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/site/includes/loadingsimple.hbs b/site/includes/loadingsimple.hbs
@@ -1,5 +1,11 @@
 <div class="loading-simple">
-    <span>{{t "map.loadingTitle"}}</span>
+    <span>
+        {{#if text}}
+            {{t text }}
+        {{else}}
+            {{t "map.loadingTitle"}}
+        {{/if}}
+    </span>
     <ul role="presentation">
         <li></li>
         <li></li>

diff --git a/site/includes/mapexport.hbs b/site/includes/mapexport.hbs
@@ -23,7 +23,7 @@
                         </section>
                     </div>
                 </div>
-                {{>loadingsimple}}
+                {{>loadingsimple text="map.generatingTitle" }}
             </div>
             <div class="map-export-controls">
                 <header>

diff --git a/src/locales/en-CA/translation.json b/src/locales/en-CA/translation.json
@@ -401,10 +401,10 @@
         },
         "s13": {
             "h1": "Usage",
-            "h2": "Limitations",           
+            "h2": "Limitations",
             "header": "Map Export",
             "img1": "The Toolbar Button",
-            "img2": "Download Image Button",            
+            "img2": "Download Image Button",
             "p1": "Map Export is used to convert the contents of the map into an image that can be downloaded by the user.",
             "p2": "Click the Map Export button in the toolbar to initiate the image generation.  The Map Export window will open. A \"Loading\" message will display, and the image preview will appear once it is generated.  Click the Download Image button to save the image.  Click the X to close the Map Export window.",
             "p3": "Currently Map Export will only capture layers that are hosted on a public internet service. Layers hosted privately (e.g. on an intranet) or added from file-based sources will not appear in the resultant image file. Images are currently only available in PNG format."
@@ -547,6 +547,7 @@
         "title": "Help"
     },
     "map": {
+        "generatingTitle": "Generating",
         "loadingTitle": "Loading",
         "scale": "Scale"
     },

diff --git a/src/locales/fr-CA/translation.json b/src/locales/fr-CA/translation.json
@@ -547,6 +547,7 @@
         "title": "Aide"
     },
     "map": {
+        "generatingTitle": "[fr] Generating",
         "loadingTitle": "Chargement",
         "scale": "Échelle"
     },