From c6937a0c2c6b3d818c3b0cf8bf943135c9f7cdc1 Mon Sep 17 00:00:00 2001 From: Open Risk Date: Wed, 25 Sep 2024 14:41:26 +0200 Subject: [PATCH] policy templates cleanup --- policy/static/policy/css/policy.css | 130 ++++++++++-------- .../templates/policy/dataflow_categories.html | 35 +++-- policy/templates/policy/dataflow_country.html | 1 - .../policy/dataflow_country_aggregate.html | 31 +++-- policy/templates/policy/dataflow_detail.html | 1 - policy/templates/policy/dataflow_filter.html | 33 +++-- policy/templates/policy/dataseries_list.html | 1 - .../templates/policy/dataseries_metrics.html | 36 +++-- policy/templates/policy/dataseries_plot.html | 34 +++-- policy/templates/policy/dataseries_table.html | 20 ++- policy/templates/policy/df_breadcrumb.html | 38 ++--- policy/templates/policy/ds_breadcrumb.html | 67 +++++---- policy/templates/policy/policy_overview.html | 27 ++-- policy/templates/policy/starter_links.html | 4 +- policy/templates/policy/time_breadcrumb.html | 42 +++--- start/templates/start/tabular.html | 1 - templates/admin/topbar.html | 2 +- 17 files changed, 304 insertions(+), 199 deletions(-) diff --git a/policy/static/policy/css/policy.css b/policy/static/policy/css/policy.css index 5424ea9..f9bc54e 100644 --- a/policy/static/policy/css/policy.css +++ b/policy/static/policy/css/policy.css @@ -3,7 +3,7 @@ } .helpblock { - height: 100px; + height: 80px; background-color: #dbdbdb; color: black; padding: 10px; @@ -16,6 +16,7 @@ .feed { color: black; + paddind: 10px; } #interface_buttons { @@ -65,7 +66,7 @@ background-color: #369; color: white; border: 5px solid white; - width: 220px; + /*width: 220px;*/ vertical-align: middle; /*height: 80px;*/ padding: 10px; @@ -125,16 +126,7 @@ img[src*=".svg"] { */ } -#series_list { - width: 90%; - text-align: left; - border: none; - border-collapse: separate; - border-spacing: 2px; - overflow: auto; - float: left; - font-size: 12px; -} + li .list-unstyled { list-style-type: none; @@ -219,6 +211,16 @@ li .list-unstyled { font-size: 10px; } +.table_header { + padding: 5px; +} + +table.display thead th { + border-bottom: none; + background-color: #b0afa7; + color: black; +} + table.db_stats { table-layout: fixed; background-color: #fffefe; @@ -253,27 +255,18 @@ table.db_stats td:nth-of-type(2) { padding: 3px; } -#first_row { - margin-top: 20px; - margin-left: 230px -} - -#second_row { - margin-top: 20px; - margin-left: 230px -} #series_list .even { - background-color: rgb(219, 219, 219) !important; + background-color: rgb(255, 255, 255) !important; } #series_list .odd { - background-color: rgb(230, 230, 230) !important; + background-color: rgb(199, 199, 199) !important; } -#series_list th { - background-color: #f4c63d; -} +/*#series_list th {*/ +/* background-color: #f4c63d;*/ +/*}*/ #series_ids { width: 100%; @@ -287,6 +280,17 @@ table.db_stats td:nth-of-type(2) { padding: 3px; } +#series_list { + width: 100%; + text-align: left; + border: none; + border-collapse: separate; + border-spacing: 2px; + overflow: auto; + float: left; + font-size: 12px; +} + #category_list { width: 100%; text-align: left; @@ -297,12 +301,12 @@ table.db_stats td:nth-of-type(2) { float: left; } -table.display thead th { - border-bottom: none; - background-color: #f4c63d; - color: black; +#category_list tr { + background-color: #A1AD72; } + + .dark-mode .card { color: #000; } @@ -315,9 +319,6 @@ table.display thead th { padding: 7px; } -#category_list tr { - background-color: #A1AD72; -} .work_area { margin-top: 80px; @@ -357,7 +358,7 @@ table.display thead th { } #dataseries { - text-align: left; + text-align: center; border-radius: 10px; margin: 0 auto; padding: 10px; @@ -368,11 +369,11 @@ table.display thead th { } #dataseries .even { - background-color: rgb(219, 219, 219) + background-color: rgb(255, 255, 255) } #dataseries .odd { - background-color: rgb(230, 230, 230) + background-color: rgb(203, 203, 203) } #dataseries .even td.sorting_1 { @@ -462,99 +463,108 @@ table.display thead th { opacity: 0.2; } -#red_feed { +.gray_no { display: inline-block; padding: 4px; height: 27px; - background-color: red; + color: black; + background-color: gray; border-radius: 5px; margin-left: 2px; margin-bottom: 5px; } -#red_no { +.red_no { display: inline-block; padding: 4px; height: 27px; background-color: red; + color: black; border-radius: 5px; margin-left: 2px; margin-bottom: 5px; } -#orange_feed { +.gray_feed { display: inline-block; padding: 4px; height: 27px; - background-color: orange; + background-color: gray; + color: black!important; border-radius: 5px; - margin-left: 5px; + margin-left: 2px; margin-bottom: 5px; } -#orange_no { +.red_feed { display: inline-block; padding: 4px; height: 27px; - background-color: orange; + background-color: red; + color: black!important; border-radius: 5px; margin-left: 2px; margin-bottom: 5px; } -#yellow_feed { +.orange_feed { display: inline-block; padding: 4px; height: 27px; - background-color: yellow; + background-color: orange; + color: black!important; border-radius: 5px; margin-left: 5px; margin-bottom: 5px; } -#yellow_no { +.orange_no { display: inline-block; padding: 4px; height: 27px; - background-color: yellow; + background-color: orange; + color: black; border-radius: 5px; margin-left: 2px; margin-bottom: 5px; } -.action_button { +.yellow_feed { display: inline-block; padding: 4px; height: 27px; - background-color: rgb(219, 219, 219); + background-color: yellow; + color: black!important; border-radius: 5px; margin-left: 5px; margin-bottom: 5px; - min-width: 100px; - text-align: center; } -#gray_no { +.yellow_no { display: inline-block; padding: 4px; height: 27px; - background-color: rgb(219, 219, 219); + background-color: yellow; + color: black; border-radius: 5px; margin-left: 2px; margin-bottom: 5px; } -.gray_no { +.action_button { display: inline-block; - height: 27px; padding: 4px; - background-color: white; + height: 27px; + background-color: rgb(219, 219, 219); border-radius: 5px; - margin-left: 2px; - margin-bottom: 4px; - border: 1px solid rgb(219, 219, 219); + margin-left: 5px; + margin-bottom: 5px; + min-width: 100px; + text-align: center; } + + .feed_list { margin-top: 230px; margin-left: -10px; diff --git a/policy/templates/policy/dataflow_categories.html b/policy/templates/policy/dataflow_categories.html index ff5e8a7..abde4e0 100644 --- a/policy/templates/policy/dataflow_categories.html +++ b/policy/templates/policy/dataflow_categories.html @@ -9,19 +9,33 @@ {% endblock %} {% block title %} - {{ title }} Policy Overview + {{ title }} Policy Dataflow Overview {% endblock %} {% block content %} - {% include "policy/time_breadcrumb.html" %}
-
-
-

- SEARCH by keyword to narrow the selection. SELECT from the list of stored DataFlows (click on a country) to further explore the datasets.
CLICK on the - Red Links to focus on recent significant changes per country

+
+
+

About

+
+
+
+

+ Overview of all Policy Dataflows. SEARCH by keyword to narrow the selection. SELECT from the list of stored DataFlows (click on a country) to further explore the datasets. CLICK on Red Links to focus on recent significant changes per country

+
+
+
+
+ +
+
+
+

Status Update

+
+
+ {% include "policy/time_breadcrumb.html" %}
@@ -31,7 +45,7 @@
-

Policy Overview

+

Policy Overview

@@ -53,13 +67,13 @@

Policy Overview

href="{% url 'policy:DataFlow_country_aggregate' DataFlow.identifier %}">{{ DataFlow.name }} - - @@ -51,7 +63,7 @@

Dataseries Table

var dates = {{ object.dates | safe }}; var metrics = {{ object.metrics | safe }}; var geometry_1D = {{ object.geometry_1D | safe }}; - var root_view = "{{ root_view }}"; + diff --git a/policy/templates/policy/df_breadcrumb.html b/policy/templates/policy/df_breadcrumb.html index afdfa85..2a8a6b6 100644 --- a/policy/templates/policy/df_breadcrumb.html +++ b/policy/templates/policy/df_breadcrumb.html @@ -1,16 +1,22 @@ -
-
- All Data Source:TODO Country: {{ dataflow.name }} - Total DataSets:{{ dataflow.available_n }} - Tracked DataSets:{{ dataflow.dashboard_n }} Active DataSets:{{ dataflow.live_n }} -
-
+ + All Data + +Source: + +TODO + +Country: + + {{ dataflow.name }} + +Total DataSets: +{{ dataflow.available_n }} + +Tracked DataSets: + +{{ dataflow.dashboard_n }} + +Active DataSets: + +{{ dataflow.live_n }} + diff --git a/policy/templates/policy/ds_breadcrumb.html b/policy/templates/policy/ds_breadcrumb.html index 3ac70fb..34a72d2 100644 --- a/policy/templates/policy/ds_breadcrumb.html +++ b/policy/templates/policy/ds_breadcrumb.html @@ -1,30 +1,37 @@ -
-
- -All Data Source: TODO Country: {{ object.df_name }} - {% if object.region %} - Region: - {{ object.region }} - {% else %} - Region: - All - {% endif %} -
- Last Update: {{ object.last_change_date }} - - - - - -
-
\ No newline at end of file + + All Data + +Source: + +TODOCountry: + + + {{ object.df_name }} + +{% if object.region %} + Region: + + + {{ object.region }} + +{% else %} + Region: + + + All + +{% endif %} +Last Update: + +{{ object.last_change_date }} + + + + + + + + + + + diff --git a/policy/templates/policy/policy_overview.html b/policy/templates/policy/policy_overview.html index fa0d14d..405cd1a 100644 --- a/policy/templates/policy/policy_overview.html +++ b/policy/templates/policy/policy_overview.html @@ -3,21 +3,28 @@ {% load custom_tags %} {% load humanize %} -{% block title %} - {{ title }} Latest Policy Data News and Stats -{% endblock %} - {% block extrastyle %} {{ block.super }} {% endblock %} +{% block title %} + {{ title }} The Latest Policy Data News and Stats +{% endblock %} + {% block content %}
-
-
-

This page lists latest datasets tracked and processed by the Policy Data Explorer

+
+
+

About

+
+
+
+

The Policy Overview page lists statistics for the policy datasets tracked + and processed by the Policy Data Explorer. It also provides links to the most common + functionalities supported.

+
@@ -25,11 +32,10 @@
-

Dataseries Table

+

Statistics Dashboard

-

Current Statistics

{% include "policy/tbl_statistics.html" %}
@@ -39,7 +45,7 @@

Current Statistics

-

Getting Started

+

Getting Started

{% include "policy/starter_links.html" %} @@ -49,7 +55,6 @@

Getting Started

+ {{ DataFlow.dashboard_n }} + {{ DataFlow.live_n }} @@ -100,7 +114,6 @@

Policy Overview

// var content_data = {{ content_data | safe }}; var freshness = {{ freshness | safe }}; var statistics = {{ statistics | safe }}; - var root_view = "{{ root_view }}"; $("#red_no").html(freshness['red']); $("#orange_no").html(freshness['orange']); $("#yellow_no").html(freshness['yellow']); diff --git a/policy/templates/policy/dataflow_country.html b/policy/templates/policy/dataflow_country.html index 45e81f7..c75c22b 100644 --- a/policy/templates/policy/dataflow_country.html +++ b/policy/templates/policy/dataflow_country.html @@ -95,7 +95,6 @@

Country Regions Overview

diff --git a/policy/templates/policy/dataseries_table.html b/policy/templates/policy/dataseries_table.html index 8f36d1a..338f839 100644 --- a/policy/templates/policy/dataseries_table.html +++ b/policy/templates/policy/dataseries_table.html @@ -17,12 +17,11 @@ {% block content %} - {% include "policy/ds_breadcrumb.html" %}
-

Policy Data: Tabular View

+

Policy Data: Tabular View

@@ -32,13 +31,26 @@

Policy Data: Tabular View

+
+
+
+

Overview

+
+
+ {% include "policy/ds_breadcrumb.html" %} +
+
+
+ +

Dataseries Table

-
+
+