From 1ae1a5c814b92265830c508d821dbd14e339fff5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Sun, 26 May 2019 13:05:20 +0200
Subject: Statistics: improve layout

---
 ishtar_common/static/js/ishtar.js                  |  2 +-
 .../templates/blocks/DataTables-stats.html         | 30 ++++++++++++----------
 version.py                                         |  4 +--
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 249d06907..ef0be5bab 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -1565,7 +1565,7 @@ var render_stats = function(stats_values, name){
         stats_help.show();
         var stats_xaxis_tickoptions;
         if (modality_1 == "year"){
-            stats_xaxis_tickoptions = {formatString: "%d"};
+            stats_xaxis_tickoptions = {formatString: "%d", angle: -30};
         } else {
             stats_xaxis_tickoptions = {angle: -30};
         }
diff --git a/ishtar_common/templates/blocks/DataTables-stats.html b/ishtar_common/templates/blocks/DataTables-stats.html
index 091f472b9..a1fcc8743 100644
--- a/ishtar_common/templates/blocks/DataTables-stats.html
+++ b/ishtar_common/templates/blocks/DataTables-stats.html
@@ -3,13 +3,7 @@
 </style>
 <div>
     <div id="stats-form-{{name}}">
-        <label for="stats_renderer-{{name}}">{% trans "Type" %}</label>
-        <select id="stats_renderer-{{name}}" name="stats_renderer">
-            <option value="line" selected='selected'>{% trans "Line" %}</option>
-            <option value="bar">{% trans "Bar" %}</option>
-            <option value="pie">{% trans "Pie" %}</option>
-            <option value="table">{% trans "Table" %}</option>
-        </select>
+        <p class="text-center">
         <label for="stats_modality_1-{{name}}">{% trans "Modality 1" %}</label>
         <select id="stats_modality_1-{{name}}" name="stats_modality_1">
             {% for modality, modality_lbl in current_model.STATISTIC_MODALITIES_OPTIONS.items %}
@@ -23,12 +17,22 @@
             <option value="{{modality}}">{{modality_lbl}}</option>
             {% endfor %}
         </select>
-        <label for="stats_sum-{{name}}">{% trans "Sum" %}</label>
-        <select id="stats_sum-{{name}}" name="stats_sum">
-            {% for sum_var, sum_var_lbl in current_model.STATISTIC_SUM_VARIABLE.items %}
-            <option value="{{sum_var}}"{% if forloop.first %} selected='selected'{% endif %}>{{sum_var_lbl}}</option>
-            {% endfor %}
-        </select>
+        </p>
+        <p class="text-center">
+            <label for="stats_renderer-{{name}}">{% trans "Type" %}</label>
+            <select id="stats_renderer-{{name}}" name="stats_renderer">
+                <option value="bar" selected='selected'>{% trans "Bar" %}</option>
+                <option value="line">{% trans "Line" %}</option>
+                <option value="pie">{% trans "Pie" %}</option>
+                <option value="table">{% trans "Table" %}</option>
+            </select>
+            <label for="stats_sum-{{name}}">{% trans "Sum" %}</label>
+            <select id="stats_sum-{{name}}" name="stats_sum">
+                {% for sum_var, sum_var_lbl in current_model.STATISTIC_SUM_VARIABLE.items %}
+                <option value="{{sum_var}}"{% if forloop.first %} selected='selected'{% endif %}>{{sum_var_lbl}}</option>
+                {% endfor %}
+            </select>
+        </p>
     </div>
     <hr/>
     <div id="charts-{{name}}">
diff --git a/version.py b/version.py
index df909f3a1..dcab8451d 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 2.1.dev.44
-VERSION = (2, 1, 'dev', 44)
+# 3.0.dev.1
+VERSION = (3, 0, 'dev', 1)
 
 
 def get_version():
-- 
cgit v1.2.3