diff options
4 files changed, 43 insertions, 34 deletions
diff --git a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html index cebd147f4..0548308c0 100644 --- a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html +++ b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html @@ -7,9 +7,9 @@ {% block content %} <div class='dashboard'> <h2>{% trans "Archaeological files" %}</h2> - <div> - <h3>{% trans "Global informations" %}</h3> + <h3>{% trans "Global informations" %}</h3> + <div> <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> {% for type in dashboard.types %} <p><strong>{{type.file_type__label}}{% trans ":"%}</strong> {{type.number}}</p> @@ -39,10 +39,9 @@ </div> </div> - <div> - - <h3>{% trans "Research archaeology" %}</h3> + <h3>{% trans "Research archaeology" %}</h3> + <div> <p><strong>{% trans "Total:" %}</strong> {{dashboard.research.total_number}}</p> <div class='table'> <table> @@ -93,10 +92,9 @@ </div> </div> - <div> - - <h3>{% trans "Rescue archaeology" %}</h3> + <h3>{% trans "Rescue archaeology" %}</h3> + <div> <p><strong>{% trans "Total:" %}</strong> {{dashboard.rescue.total_number}}</p> <div class='table'> diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html index 28f1dd9c6..719ec2ac1 100644 --- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html +++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html @@ -6,10 +6,11 @@ {% endblock %} {% block content %} <div class='dashboard'> + <h2>{% trans "Operations" %}</h2> - <div> - <h3>{% trans "Global informations" %}</h3> + <h3>{% trans "Global informations" %}</h3> + <div> <div class='table'> <table> <caption>{% trans "Total" %}</caption> @@ -102,9 +103,9 @@ </table></div> </div> - <div> - <h3>{% trans "Survey informations" %}</h3> + <h3>{% trans "Survey informations" %}</h3> + <div> <div class='table'> <table> @@ -320,13 +321,10 @@ </tr> {% endfor %} </table></div> - - </div> - <div> - - <h3>{% trans "Excavation informations" %}</h3> + <h3>{% trans "Excavation informations" %}</h3> + <div> <div class='table'> <table> <caption>{% trans "Total" %}</caption> diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 22f6d1402..a957e0794 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -372,28 +372,33 @@ table.confirm tr.spacer td:last-child{ border-radius:8px; } -.dashboard > div{ +.dashboard > div, +.dashboard h3{ width:760px; + margin:0; + margin-left:auto; + margin-right:auto; + border-radius: 8px; + border-radius: 8px; +} + +.dashboard > div{ background: #FFF; - -moz-border-radius:8px; - -webkit-border-radius:8px; - border-radius:8px; - -webkit-box-shadow: 0px 0px 20px #444; - -moz-box-shadow: 0px 0px 20px #444; - margin:20px; text-align:left; padding-bottom:10px; + border:1px solid #CCC; + border-top-left-radius: 0; + border-top-right-radius: 0; } .dashboard h3{ + margin-top:1em; + width:762px; background-color:#922; color:#FFF; - -webkit-border-top-left-radius: 8px; - -webkit-border-top-right-radius: 8px; - -moz-border-radius-topleft: 8px; - -moz-border-radius-topright: 8px; - border-top-left-radius: 8px; - border-top-right-radius: 8px; + padding:0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } .dashboard h4{ @@ -422,6 +427,12 @@ table.confirm tr.spacer td:last-child{ font-size:1.2em; } +.dashboard caption{ + text-align:left; + padding:0.5em 1em; +} + + #window table th, .dashboard table th{ background-color:#922; border:1px solid #EEE; @@ -439,8 +450,8 @@ table.confirm tr.spacer td:last-child{ } .dashboard table th{ - text-align:left; - padding:0.5em 1em; + text-align:center; + padding:0.5em; } #window table th.sub, .dashboard table th.sub, .dashboard table td.sub{ diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html index a573a71c6..8195bcdaf 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html @@ -7,8 +7,9 @@ {% block content %} <div class='dashboard'> {% for lbl, dashboard in items %} + + <h3>{{lbl}}</h3> <div> - <h3>{{lbl}}</h3> <h4>{% trans "Numbers" %}</h4> <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> <div class='table'> @@ -65,8 +66,9 @@ </div> </div> {% endfor%} + + <h3>{% trans "Users" %}</h3> <div> - <h3>{% trans "Users" %}</h3> <div class='table'> <table> <tr><th>{% trans "User type" %}</th><th>{% trans "Number" %}</th></tr> |