prepare for 0.6.4

CHANGES.rst

@@ -1,14 +1,16 @@
 Changes
 =======
 
-0.6.4 (2017-12-xx)
+0.6.4 (2017-12-22)
 ------------------
 
 - Slightly change how field type is determined.
 
 - Try to improve the 'active'/'pushed' effect on buttons located on the bottom-right of the map.
 
-- Try to be lighter on the use of memory (by reducing the TTL of redis entries and by not saving (for later reuse) intermediate results anymore when calculating potentials).
+- Try to be lighter on the use of memory (by reducing the TTL of redis entries and by not saving (for later reuse) intermediate results anymore when computing potentials).
+
+- Explicitly set locale and language parameters on docker image and make a better sanitizing of layer names.
 
 
 0.6.3 (2017-12-14)

magrit_app/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.6.3'
+__version__ = '0.6.4'

magrit_app/static/css/style.css

@@ -303,15 +303,15 @@ p.params_section2 > span {
   font-size: 1.1em;
   font-weight: bold;
   text-align: center;
-  margin: 0;
+  margin: 0 3px 0 0;
   color: #ccc;
   background-color: #555;
   background: -webkit-linear-gradient(#888,#555);
   background: linear-gradient(#888,#555);
   border: 0 none;
   border-radius: 3px;
   text-shadow: 0 -1px 0 #000;
-  box-shadow: 1px 0 0 #666, 4px 0 0 #444,5px 0 0 rgba(0,0,0,0.6);
+  box-shadow: 1px 0 0 #666,4px 0 0 #444,5px 0 0 rgba(0,0,0,0.6);
   cursor: pointer;
   -webkit-transition: all 150ms ease;
   transition: all 150ms ease;
@@ -327,13 +327,14 @@ p.params_section2 > span {
 {
   color: #fff;
   text-shadow: 0 -1px 0 #444,0 0 5px #ffd,0 0 8px #fff;
-  box-shadow: inset 1px 1px 9px 9px #444;
-  -webkit-transform: translateX(-5px);
-  transform: translateX(-5px);
+  box-shadow: none;
+  -webkit-transform: translateX(5px);
+  transform: translateX(2px);
   -webkit-animation: none;
   animation: none;
-  background: white !important;
-  width: 35px;
+  background: linear-gradient(#555,#444);
+  width: 32px;
+  margin: 0;
 }
 
 .const_buttons {

magrit_app/static/js/app.f74a67abcad0.js → magrit_app/static/js/app.d543c084f9da.js

@@ -1131,7 +1131,7 @@ function parseQuery(search) {
     lng: lang,
     fallbackLng: _app.existing_lang[0],
     backend: {
-      loadPath: 'static/locales/{{lng}}/translation.f74a67abcad0.json'
+      loadPath: 'static/locales/{{lng}}/translation.d543c084f9da.json'
     }
   }, function (err, tr) {
     if (err) {
@@ -1199,10 +1199,11 @@ function displayInfoOnMove() {
     map.selectAll('.layer').selectAll('rect').on('mouseover', null);
     info_features.classed('active', false);
     info_features.style('display', 'none').html('');
-    document.getElementById('info_button').classed('active', false);
+    d3.select('#info_button').classed('active', false);
     svg_map.style.cursor = '';
   } else {
     map.select('.brush').remove();
+    d3.select('#brush_zoom_button').classed('active', false);
     var layers = svg_map.querySelectorAll('.layer'),
         nb_layer = layers.length;
     var top_visible_layer = null;
@@ -1238,7 +1239,7 @@ function displayInfoOnMove() {
 
     info_features.classed('active', true);
     svg_map.style.cursor = 'help';
-    document.getElementById('info_button').classed('active', true);
+    d3.select('#info_button').classed('active', true);
   }
 }
 
@@ -1594,7 +1595,7 @@ function handle_bg_color(color) {
 }
 
 function handle_click_hand(behavior) {
-  var hb = d3.select('.hand_button');
+  var hb = d3.select('#hand_button');
   // eslint-disable-next-line no-param-reassign
   var b = (typeof behavior === 'undefined' ? 'undefined' : _typeof(behavior)) === 'object' ? !hb.classed('locked') ? 'lock' : 'unlock' : behavior && typeof behavior === 'string' ? behavior : false;
   if (b === 'lock') {
@@ -2190,8 +2191,8 @@ function canvas_mod_size(shape) {
     w = +shape[0];
     map.attr('width', w).call(zoom_without_redraw);
     map_div.style('width', w + 'px');
-    if (w + 360 + 30 < window.innerWidth) {
-      document.querySelector('.light-menu').style.right = '-30px';
+    if (w + 360 + 33 < window.innerWidth) {
+      document.querySelector('.light-menu').style.right = '-33px';
     } else {
       document.querySelector('.light-menu').style.right = '0px';
     }
@@ -21134,6 +21135,9 @@ var handleZoomRect = function handleZoomRect() {
     d3.select('#brush_zoom_button').classed('active', false);
     b.remove();
   } else {
+    if (d3.select('#info_button').classed('active')) {
+      displayInfoOnMove();
+    }
     d3.select('#brush_zoom_button').classed('active', true);
     makeZoomRect();
   }

magrit_app/static/js/main.js

@@ -1475,10 +1475,11 @@ function displayInfoOnMove() {
     map.selectAll('.layer').selectAll('rect').on('mouseover', null);
     info_features.classed('active', false);
     info_features.style('display', 'none').html('');
-    document.getElementById('info_button').classed('active', false);
+    d3.select('#info_button').classed('active', false);
     svg_map.style.cursor = '';
   } else {
     map.select('.brush').remove();
+    d3.select('#brush_zoom_button').classed('active', false);
     const layers = svg_map.querySelectorAll('.layer'),
       nb_layer = layers.length;
     let top_visible_layer = null;
@@ -1516,7 +1517,7 @@ function displayInfoOnMove() {
 
     info_features.classed('active', true);
     svg_map.style.cursor = 'help';
-    document.getElementById('info_button').classed('active', true);
+    d3.select('#info_button').classed('active', true);
   }
 }
 
@@ -1893,7 +1894,7 @@ function handle_bg_color(color) {
 }
 
 function handle_click_hand(behavior) {
-  const hb = d3.select('.hand_button');
+  const hb = d3.select('#hand_button');
   // eslint-disable-next-line no-param-reassign
   const b = typeof behavior === 'object' ? (!hb.classed('locked') ? 'lock' : 'unlock') : (behavior && typeof behavior === 'string' ? behavior : false);
   if (b === 'lock') {
@@ -2550,8 +2551,8 @@ function canvas_mod_size(shape) {
     map.attr('width', w)
       .call(zoom_without_redraw);
     map_div.style('width', `${w}px`);
-    if (w + 360 + 30 < window.innerWidth) {
-      document.querySelector('.light-menu').style.right = '-30px';
+    if (w + 360 + 33 < window.innerWidth) {
+      document.querySelector('.light-menu').style.right = '-33px';
     } else {
       document.querySelector('.light-menu').style.right = '0px';
     }

magrit_app/static/js/zoom_rect.js

@@ -13,6 +13,9 @@ const handleZoomRect = function () {
     d3.select('#brush_zoom_button').classed('active', false);
     b.remove();
   } else {
+    if (d3.select('#info_button').classed('active')) {
+      displayInfoOnMove();
+    }
     d3.select('#brush_zoom_button').classed('active', true);
     makeZoomRect();
   }

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.f74a67abcad0.min.css" rel="stylesheet"  type="text/css">
+	<link href="static/css/style.d543c084f9da.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.f74a67abcad0.js"></script>
+	<script  src="static/js/app.d543c084f9da.js"></script>
 </body>
 </html>