Prepare for 0.3.7

riatelab · Jul 17, 2017 · 2f153ea · 2f153ea
1 parent 89e30af
commit 2f153ea
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 551 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,7 +6,9 @@ Changes
 
 - Fix error on jointure.
 
-- Fix location of red square when moving proportionnal symbols
+- Fix location of red square when moving proportionnal symbols.
+
+- Fix legend size on links and discontinuities when zooming.
 
 
 0.3.6 (2017-06-30)

diff --git a/magrit_app/__init__.py b/magrit_app/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.3.6'
+__version__ = '0.3.7'
diff --git a/...app/static/css/style.474b5ea2bfbc.min.css → ...app/static/css/style.85465fb4e4b8.min.css b/...app/static/css/style.474b5ea2bfbc.min.css → ...app/static/css/style.85465fb4e4b8.min.css
diff --git a/magrit_app/static/js/app.474b5ea2bfbc.js → magrit_app/static/js/app.85465fb4e4b8.js b/magrit_app/static/js/app.474b5ea2bfbc.js → magrit_app/static/js/app.85465fb4e4b8.js
diff --git a/.../locales/en/translation.474b5ea2bfbc.json → .../locales/en/translation.85465fb4e4b8.json b/.../locales/en/translation.474b5ea2bfbc.json → .../locales/en/translation.85465fb4e4b8.json
@@ -283,8 +283,7 @@
             "flow": "Link/Flow map",
             "discont": "Discontinuities map",
             "typo": "Categorical map",
-            "typosymbol": "Pictogram map",
-            "two_stocks": "Waffle/Treemap map"
+            "typosymbol": "Pictogram map"
         },
         "projection_box":{
             "choice_projection": "Choose a projection",
@@ -560,9 +559,7 @@
             "generate_labels": "Generate labels for this layer ...",
             "field_label": "Select a field",
             "layer_shadow": "Add a shadow",
-            "let_draggable": "Allow moving symbols",
-            "ref_colors": "Colors:",
-            "ref_size": "Symbol size"
+            "let_draggable": "Allow moving symbols"
         },
         "lm_buttons":{
             "zoom+": "Zoom in",
@@ -671,15 +668,6 @@
                 "on_value": "on value ...",
                 "symbol_type": "Symbol type",
                 "field2": "Field 2 (symbol color)"
-              },
-            "twostocks": {
-              "fields": "Fields",
-              "symbol_choice": "Symbol type",
-              "waffle_size_circle": "Circle radius",
-              "waffle_size_square": "Square size",
-              "waffle_width_rows": "Width rows",
-              "waffle_ratio": "Ratio",
-              "waffle_ratio_units": " units per cell"
             }
         }
     },

diff --git a/.../locales/es/translation.474b5ea2bfbc.json → .../locales/es/translation.85465fb4e4b8.json b/.../locales/es/translation.474b5ea2bfbc.json → .../locales/es/translation.85465fb4e4b8.json
diff --git a/.../locales/fr/translation.474b5ea2bfbc.json → .../locales/fr/translation.85465fb4e4b8.json b/.../locales/fr/translation.474b5ea2bfbc.json → .../locales/fr/translation.85465fb4e4b8.json
@@ -284,8 +284,7 @@
             "flow": "Carte des liens",
             "discont": "Carte des discontinuités",
             "typo": "Carte qualitative",
-            "typosymbol": "Carte qualitative avec utilisation de pictogrammes",
-            "two_stocks": "Carte de stocks (2 ou plus)"
+            "typosymbol": "Carte qualitative avec utilisation de pictogrammes"
         },
         "projection_box":{
             "choice_projection": "Choix d'une projection",
@@ -560,9 +559,7 @@
             "generate_labels": "Génération de labels pour cette couche...",
             "field_label": "Sélection du champ à utiliser",
             "layer_shadow": "Ajouter une ombre à la couche",
-            "let_draggable": "Autoriser le déplacement des symboles",
-            "ref_colors": "Couleurs:",
-            "ref_size": "Taille du symbole"
+            "let_draggable": "Autoriser le déplacement des symboles"
         },
         "lm_buttons":{
             "zoom+": "Zoom positif",
@@ -672,15 +669,6 @@
                 "on_value": "sur la valeur ... ",
                 "symbol_type": "Type de symbole ",
                 "field2": "Champ à utiliser<br>(couleur du symbole)"
-            },
-            "twostocks": {
-              "fields": "Champs",
-              "symbol_choice": "Type de symbole",
-              "waffle_size_circle": "Rayon du symbole",
-              "waffle_size_square": "Taille du symbole",
-              "waffle_width_rows": "Largeur (nombre de symboles)",
-              "waffle_ratio": "Ratio",
-              "waffle_ratio_units": " unités par carreau"
             }
         }
     },

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.474b5ea2bfbc.min.css" rel="stylesheet"  type="text/css">
+	<link href="static/css/style.85465fb4e4b8.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,7 +51,7 @@
         </div>
       </noscript>
     <script  src="static/js/lib/bootstrap-native3.mod.min.js"></script>
-	<script  src="static/js/app.f345d9870254.js"></script>
+	<script  src="static/js/app.85465fb4e4b8.js"></script>
 	<script  src="static/js/app.474b5ea2bfbc.js"></script>
 </body>
 </html>