Skip to content

Commit

Permalink
policy templates cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@open-risk
open-risk committed Sep 25, 2024
1 parent 4e8adcd commit c6937a0
Show file tree
Hide file tree
Showing 17 changed files with 304 additions and 199 deletions.
130 changes: 70 additions & 60 deletions policy/static/policy/css/policy.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.helpblock {
height: 100px;
height: 80px;
background-color: #dbdbdb;
color: black;
padding: 10px;
Expand All @@ -16,6 +16,7 @@

.feed {
color: black;
paddind: 10px;
}

#interface_buttons {
Expand Down Expand Up @@ -65,7 +66,7 @@
background-color: #369;
color: white;
border: 5px solid white;
width: 220px;
/*width: 220px;*/
vertical-align: middle;
/*height: 80px;*/
padding: 10px;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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%;
Expand All @@ -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;
Expand All @@ -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;
}
Expand All @@ -315,9 +319,6 @@ table.display thead th {
padding: 7px;
}

#category_list tr {
background-color: #A1AD72;
}

.work_area {
margin-top: 80px;
Expand Down Expand Up @@ -357,7 +358,7 @@ table.display thead th {
}

#dataseries {
text-align: left;
text-align: center;
border-radius: 10px;
margin: 0 auto;
padding: 10px;
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
35 changes: 24 additions & 11 deletions policy/templates/policy/dataflow_categories.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,33 @@
{% endblock %}

{% block title %}
{{ title }} Policy Overview
{{ title }} Policy Dataflow Overview
{% endblock %}

{% block content %}

{% include "policy/time_breadcrumb.html" %}

<div class="card card-primary card-outline">
<div class="card-body">
<div class="helpblock" id="page_content_front">
<p class="helpblocktext">
SEARCH by keyword to narrow the selection. SELECT from the list of stored DataFlows (click on a country) to further explore the datasets.<br/> CLICK on the
<b>Red Links</b> to focus on recent significant changes per country</p>
<div class="card-info">
<div class="card-header">
<h4><i class="fa fa-info-circle"></i> About </h4>
</div>
<div class="card-body">
<div class="helpblock" id="page_content_front">
<p class="helpblocktext">
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 <b>Red Links</b> to focus on recent significant changes per country</p>
</div>
</div>
</div>
</div>

<div class="card card-primary card-outline">
<div class="card-info">
<div class="card-header">
<h4><i class="fa fa-thermometer-quarter"></i> Status Update </h4>
</div>
<div class="card-body">
{% include "policy/time_breadcrumb.html" %}
</div>
</div>
</div>
Expand All @@ -31,7 +45,7 @@
<div class="pad table-responsive">
<div class="card-info">
<div class="card-header">
<h4><i class="fa fa-info-circle"></i> Policy Overview</h4>
<h4><i class="fa fa-eye"></i> Policy Overview</h4>
</div>
<div class="card-body">
<table class="display responsive no-wrap" id="category_list">
Expand All @@ -53,13 +67,13 @@ <h4><i class="fa fa-info-circle"></i> Policy Overview</h4>
href="{% url 'policy:DataFlow_country_aggregate' DataFlow.identifier %}">{{ DataFlow.name }}</a>
</td>

<td>
<td style="text-align:center;">
<a title="Click through to explore all datasets for this country"
style="color:blue"
href="{% url 'policy:DataFlow_filter' DataFlow.identifier 'all' 'all' %}">{{ DataFlow.dashboard_n }}</a>
</td>

<td>
<td style="text-align:center;">
<a title="Click through to explore datasets that showed significant change recently"
style="color:red"
href="{% url 'policy:DataFlow_filter' DataFlow.identifier region 'active' %}">{{ DataFlow.live_n }}</a>
Expand Down Expand Up @@ -100,7 +114,6 @@ <h4><i class="fa fa-info-circle"></i> Policy Overview</h4>
// 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']);
Expand Down
1 change: 0 additions & 1 deletion policy/templates/policy/dataflow_country.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ <h4><i class="fa fa-info-circle"></i> Country Regions Overview</h4>

<script>
var content_data = {{ content_data | safe }};
var root_view = "{{ root_view }}";
var freshness = {{ freshness | safe }};
$("#red_no").html(freshness['red']);
$("#orange_no").html(freshness['orange']);
Expand Down
Loading

0 comments on commit c6937a0

Please sign in to comment.