Dashboard: layout improvement

4 files changed, 56 insertions, 10 deletions

diff --git a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html
index 163f89bb8..a1462698c 100644
--- a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html
+++ b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html
@@ -4,8 +4,8 @@
 {{form.media}}
 {% endblock %}
 {% block content %}
-<div class='dashboard'>
-  <h2>{% trans "Archaeological files" %}</h2>
+<h2>{% trans "Archaeological files" %}</h2>
+<div class='dashboard' id='dashboard-files'>
 
   <h3>{% trans "Global informations" %}</h3>
   <div>
@@ -232,4 +232,12 @@
 
   </div>
 </div>
+<script>
+  $( function() {
+    $( "#dashboard-files" ).accordion({
+      collapsible: true,
+      heightStyle: "content"
+    });
+  } );
+</script>
 {% endblock %}
diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
index a661d304d..eca69b87f 100644
--- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
+++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
@@ -4,10 +4,10 @@
 {{form.media}}
 {% endblock %}
 {% block content %}
-<div class='dashboard'>
 
-  <h2>{% trans "Operations" %}</h2>
+<h2>{% trans "Operations" %}</h2>
 
+<div class='dashboard' id='dashboard-operations'>
   <h3>{% trans "Global informations" %}</h3>
   <div>
     <div class='clean-table'>
@@ -708,4 +708,12 @@
 
   </div>
 </div>
+<script>
+  $( function() {
+    $( "#dashboard-operations" ).accordion({
+      collapsible: true,
+      heightStyle: "content"
+    });
+  } );
+</script>
 {% endblock %}
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index bff3ef473..aab5063e4 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -886,14 +886,47 @@ a.photo{
     padding:0;
 }
 
+.dashboard{
+    margin-top: 1em;
+}
+
+.dashboard.ui-accordion .ui-accordion-header{
+    margin-left: auto;
+    margin-right: auto;
+    padding-top: 0.8em;
+    padding-bottom: 0.8em;
+}
+
+.dashboard.ui-accordion .ui-accordion-content{
+    padding: 1.3em;
+}
+
+.dashboard .ui-icon,
+.dashboard .ui-state-hover .ui-icon,
+.dashboard .ui-state-default .ui-icon,
+.dashboard .ui-state-active .ui-icon {
+    background-image: none;
+    color: white;
+    text-indent: 0;
+}
+
+.dashboard .ui-state-active .ui-icon:before {
+    content: "\f0d7";
+    font-family: 'FontAwesome';
+}
+
+.dashboard .ui-icon:before {
+    content: "\f0da";
+    font-family: 'FontAwesome';
+}
+
 .dashboard > div,
 .dashboard h3{
     width:760px;
     margin:0;
     margin-left:auto;
     margin-right:auto;
-    border-radius: 8px;
-    border-radius: 8px;
+    border-radius: 4px;
 }
 
 .dashboard > div{
@@ -907,12 +940,9 @@ a.photo{
 
 .dashboard h3{
     margin-top:1em;
-    width:762px;
     background-color:#922;
     color:#FFF;
     padding:10px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
 }
 
 .dashboard p{
diff --git a/version.py b/version.py
index 6b7df7378..f53e09026 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 98, 1)
+VERSION = (0, 98, 1, 0)
 
 
 def get_version():