From d4d0906965030c1f9b01d274de772c4f52d12644 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 29 Jan 2018 15:32:36 +0100
Subject: Dashboard: fix display for operation and files

---
 .../ishtar/dashboards/dashboard_file.html          | 44 +++++++++++++---------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'archaeological_files/templates')

diff --git a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html
index a1462698c..127c9f2f8 100644
--- a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html
+++ b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html
@@ -9,15 +9,23 @@
 
   <h3>{% trans "Global informations" %}</h3>
   <div>
-    <p><label>{% trans "Total:" %}</label> <span class='value numeric'>{{dashboard.total_number|intcomma}}</span></p>
-    {% for type in dashboard.types %}
-    <p><label>{{type.file_type__label}}{% trans ":"%}</label> <span class='value numeric'>{{type.number|intcomma}}</span></p>
+    <table class="table table-striped">
+        <tr>
+          <th>{% trans "Total" %}</th>
+          <td>{{dashboard.total_number|intcomma}}</td>
+        </tr>
+        {% for type in dashboard.types %}
+        <tr>
+          <th>{{type.file_type__label}}</th>
+          <td>{{type.number|intcomma}}</td>
+        </tr>
     {% endfor %}
+    </table>
 
     <div class='clean-table'>
       <h4>{% trans "by year"%}</h4>
       <div class='clean-table-wrap'>
-        <table>
+        <table class="table table-striped">
           <tr>
           {% for year in dashboard.by_year %}<th>{% if year.date.year %}{{year.date.year}}{% else %}{% trans "no year" %}{% endif %}</th>{% endfor %}
           </tr>
@@ -30,7 +38,7 @@
 
     <div class='clean-table'>
     <h4>{% trans "by month"%}</h4>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for month in dashboard.by_month %}<th>{{month.date|date:"N Y"|capfirst}}</th>{% endfor %}
       </tr>
@@ -47,7 +55,7 @@
     <p><label>{% trans "Total:" %}</label><span class='value numeric'>{{dashboard.research.total_number|intcomma}}</span></p>
     <div class='clean-table'>
     <h4>{% trans "by year"%}</h4>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for year in dashboard.research.by_year %}<th>{{year.date.year}}</th>{% endfor %}
       </tr>
@@ -59,7 +67,7 @@
 
     <div class='clean-table'>
     <h4>{% trans "by month"%}</h4>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for month in dashboard.research.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %}
       </tr>
@@ -71,7 +79,7 @@
 
     <div class='clean-table'>
     <h4>{% trans "by department"%}</h4>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for dpt in dashboard.research.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %}
       </tr>
@@ -84,7 +92,7 @@
     <div class='clean-table'>
     <h4>{% trans "main towns"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for town in dashboard.research.towns %}<th>{{town.town__name}}</th>{% endfor %}
       </tr>
@@ -104,7 +112,7 @@
     <div class='clean-table'>
     <h4>{% trans "by saisine type"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for saisine in dashboard.rescue.saisine %}<th>{{saisine.saisine_type__label}}</th>{% endfor %}
       </tr>
@@ -118,7 +126,7 @@
     <div class='clean-table'>
     <h4>{% trans "by administrative act"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for act in dashboard.rescue.administrative_act %}<th>{{act.act_type__label}}</th>{% endfor %}
       </tr>
@@ -132,7 +140,7 @@
     <div class='clean-table'>
     <h4>{% trans "by year"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for year in dashboard.rescue.by_year %}<th>{{year.date.year}}</th>{% endfor %}
       </tr>
@@ -146,7 +154,7 @@
     <div class='clean-table'>
     <h4>{% trans "by month"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for month in dashboard.rescue.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %}
       </tr>
@@ -163,7 +171,7 @@
     <div class='clean-table'>
     <h4>{% trans "archaeological files linked to at least one operation (%)"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for year in dashboard.rescue.operational_by_year %}<th>{{year.date.year}}</th>{% endfor %}
       </tr>
@@ -177,7 +185,7 @@
     <div class='clean-table'>
     <h4>{% trans "by department"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for dpt in dashboard.rescue.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %}
       </tr>
@@ -191,7 +199,7 @@
     <div class='clean-table'>
     <h4>{% trans "surface by department (ha)"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for dpt in dashboard.rescue.surface_by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %}
       </tr>
@@ -205,7 +213,7 @@
     <div class='clean-table'>
     <h4>{% trans "main towns by number"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for town in dashboard.rescue.towns %}<th>{{town.town__name}}</th>{% endfor %}
       </tr>
@@ -219,7 +227,7 @@
     <div class='clean-table'>
     <h4>{% trans "main towns by surface (ha)"%}</h4>
       <div class='clean-table-wrap'>
-    <table>
+    <table class="table table-striped">
       <tr>
       {% for town in dashboard.rescue.surface_by_town %}<th>{{town.town__name}}</th>{% endfor %}
       </tr>
-- 
cgit v1.2.3