UI: better layer layout for simple tables. Rewrite of all dashboard (refs #1616)

3 files changed, 26 insertions, 15 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/documents.html
index f1592cc42..8c584425a 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/documents.html
@@ -1,6 +1,8 @@
 {% load i18n %}
-<table class='simple'>
-  <caption>{{caption}}</caption>
+<h4>{{h4}}</h4>
+<div class='clean-table'>
+<div class='clean-table-wrap'>
+<table>
   <tr>
     <th>{% trans "Title" %}</th>
     <th>{% trans "Type" %}</th>
@@ -18,4 +20,4 @@
   </tr>
   {% endfor %}
 </table>
-
+</div></div>
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html
index d6686b553..e378bdf49 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html
@@ -1,6 +1,8 @@
 {% load i18n %}
-
-<table class='simple'>
+<h4>{{caption}}</h4>
+<div class='clean-table'>
+<div class='clean-table-wrap'>
+<table>
   <caption>{{caption}}</caption>
   <tr>{% for col in col_names %}
     <th>{% trans col %}</th>{% endfor %}
@@ -9,3 +11,4 @@
     <td>{{value}}</td>{%endfor%}
   </tr>{% endfor %}
 </table>
+</div></div>
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
index 7247a5cda..fd92578a2 100644
--- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
+++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
@@ -1,4 +1,4 @@
-{% load i18n date_formating %}
+{% load i18n date_formating humanize %}
 {% load url from future %}
 <div class='dashboard' id="{{unique_id}}-tab">
   <div>
@@ -13,7 +13,7 @@
     </form>
     </div>
     {% endif %}
-    <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p>
+    <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number|intcomma}}</p>
     <div class='table'>
     <div id="chart_{{unique_id}}" style="height:400px; width:700px;"></div>
     <p class='info-box'><i class="fa fa-info-circle" aria-hidden="true"></i> {% trans 'Draw rectangle on the graph to zoom. Double-click to reinitialize.' %}</p>
@@ -25,8 +25,9 @@
       </div>
     </div>
     </div>
-    <div class='table'>
-    <table class='resume'>
+    <div class='clean-table'>
+    <div class='clean-table-wrap'>
+    <table>
     {% for idx, lbl, values in dashboard.values %}
       <tr class='idx {% if forloop.counter0|divisibleby:"2" %}even{%else%}odd{%endif%}'>
       <th>{{lbl}}</th>
@@ -35,6 +36,7 @@
     {% endfor%}
     </table>
     </div>
+    </div>
     {% if dashboard.periods %}
     <h4>{% trans "By years" %}</h4>
     <ul>
@@ -55,25 +57,29 @@
       <li><strong>{% trans "Mode:" %}</strong> {{dashboard.operation_mode}}</li>
     </ul>
     {% endif %}
+    <div class='clean-table'>
     <h4>{% trans "Created last" %}</h4>
-    <div class='table'>
-    <table class='resume'>
+    <table>
       <tr><th>{{lbl}}</th><th>{% trans "Created" %}</th><th></th></tr>
       {% for item in dashboard.lasts %}<tr>
         <td class='ref'>{{item}}</td>
         <td>{{item.history_date}}</td>
-        <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>{%trans "Show"%}</a>{%endif%}</td>
+        <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>
+            <i class="fa fa-info-circle" aria-hidden="true"></i>
+        </a>{%endif%}</td>
       </tr>{% endfor %}
     </table>
     </div>
+    <div class='clean-table'>
     <h4>{% trans "Recent changes" %}</h4>
-    <div class='table'>
-    <table class='resume'>
+    <table>
       <tr><th>{{lbl}}</th><th>{% trans "Modified" %}</th><th></th></tr>
       {% for item in dashboard.recents %}<tr>
         <td class='ref'>{{item}}</td>
         <td>{{item.history_date}}</td>
-        <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>{%trans "Show"%}</a>{%endif%}</td>
+        <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>
+        <i class="fa fa-info-circle" aria-hidden="true"></i>
+        </a>{%endif%}</td>
       </tr>{% endfor %}
     </table>
     </div>