stuff for layer name changes

riatelab · Jun 22, 2017 · 1fcb5a0 · 1fcb5a0
1 parent 9180159
commit 1fcb5a0
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changes
 =======
 
-0.3.4 (2017-06-xx)
+0.3.4 (2017-06-22)
 ------------------
 
 - Fix the "auto-align" feature behavior for the new text annotation.

diff --git a/...app/static/css/style.fb440288f7d7.min.css → ...app/static/css/style.6c4b488b2f00.min.css b/...app/static/css/style.fb440288f7d7.min.css → ...app/static/css/style.6c4b488b2f00.min.css
diff --git a/magrit_app/static/js/app.fb440288f7d7.js → magrit_app/static/js/app.6c4b488b2f00.js b/magrit_app/static/js/app.fb440288f7d7.js → magrit_app/static/js/app.6c4b488b2f00.js
@@ -1092,7 +1092,7 @@ function parseQuery(search) {
     lng: lang,
     fallbackLng: _app.existing_lang[0],
     backend: {
-      loadPath: 'static/locales/{{lng}}/translation.fb440288f7d7.json'
+      loadPath: 'static/locales/{{lng}}/translation.6c4b488b2f00.json'
     }
   }, function (err, tr) {
     if (err) {
@@ -11716,10 +11716,12 @@ function createStyleBox(layer_name) {
   var popup = d3.select(container).select('.modal-content').style('width', '300px').select('.modal-body');
 
   var new_layer_name = layer_name;
-  var new_name_section = make_change_layer_name_section(popup, layer_name);
-  new_name_section.on('change', function () {
-    new_layer_name = this.value;
-  });
+  if (layer_name !== 'World') {
+    var new_name_section = make_change_layer_name_section(popup, layer_name);
+    new_name_section.on('change', function () {
+      new_layer_name = this.value;
+    });
+  }
 
   if (type === 'Point') {
     var current_pt_size = current_layers[layer_name].pointRadius;

diff --git a/magrit_app/static/js/layers_style_popup.js b/magrit_app/static/js/layers_style_popup.js
@@ -1067,10 +1067,13 @@ function createStyleBox(layer_name) {
     .select('.modal-body');
 
   let new_layer_name = layer_name;
-  const new_name_section = make_change_layer_name_section(popup, layer_name);
-  new_name_section.on('change', function() {
-    new_layer_name = this.value;
-  });
+  if (layer_name !== 'World') {
+    const new_name_section = make_change_layer_name_section(popup, layer_name);
+    new_name_section.on('change', function() {
+      new_layer_name = this.value;
+    });
+  }
+
 
   if (type === 'Point') {
     var current_pt_size = current_layers[layer_name].pointRadius;

diff --git a/.../locales/en/translation.fb440288f7d7.json → .../locales/en/translation.6c4b488b2f00.json b/.../locales/en/translation.fb440288f7d7.json → .../locales/en/translation.6c4b488b2f00.json
diff --git a/.../locales/es/translation.fb440288f7d7.json → .../locales/es/translation.6c4b488b2f00.json b/.../locales/es/translation.fb440288f7d7.json → .../locales/es/translation.6c4b488b2f00.json
diff --git a/.../locales/fr/translation.fb440288f7d7.json → .../locales/fr/translation.6c4b488b2f00.json b/.../locales/fr/translation.fb440288f7d7.json → .../locales/fr/translation.6c4b488b2f00.json
diff --git a/magrit_app/templates/modules.html b/magrit_app/templates/modules.html
@@ -7,7 +7,7 @@
     <title> {{ app_name }} </title>
     <link rel="icon" type="image/png" href="static/img/favicon.png" />
     <link href="static/css/scoped-bootstrap.min.css" rel="stylesheet" type="text/css">
-	<link href="static/css/style.fb440288f7d7.min.css" rel="stylesheet"  type="text/css">
+	<link href="static/css/style.6c4b488b2f00.min.css" rel="stylesheet"  type="text/css">
     <link href="static/css/vanilla-dataTables.min.css" rel="stylesheet" type="text/css">
     <link href="static/css/alertify.min.css" rel="stylesheet" type="text/css">
     <link href="static/css/semantic.min.css" rel="stylesheet" type="text/css">
@@ -51,6 +51,6 @@
         </div>
       </noscript>
     <script  src="static/js/lib/bootstrap-native3.mod.min.js"></script>
-	<script  src="static/js/app.fb440288f7d7.js"></script>
+	<script  src="static/js/app.6c4b488b2f00.js"></script>
 </body>
 </html>