diff --git a/templates/base/base.html b/templates/base/base.html index d370a43b..3ea8a8ca 100644 --- a/templates/base/base.html +++ b/templates/base/base.html @@ -2,61 +2,61 @@ -{% include "base/head.html" %} + {% include "base/head.html" %} - - -Skip to main content + + + Skip to main content -{% include "base/navigation.html" %} + {% include "base/navigation.html" %} -
-
-

- Alpha - {% if env == "dev" %} - {{ env|title }} - {% endif %} - {% if env == "test" %} - {{ env|title }} - {% endif %} - {% if env == "preprod" %} - {{ env|title }} - {% endif %} +

+
+

+ Alpha + {% if env == "dev" %} + {{ env|title }} + {% endif %} + {% if env == "test" %} + {{ env|title }} + {% endif %} + {% if env == "preprod" %} + {{ env|title }} + {% endif %} - - This service is currently in development and feedback is being gathered through user research. - -

-
+ + This service is currently in development and feedback is being gathered through user research. + +

+
- {% block breadcrumbs %} - {% endblock breadcrumbs %} + {% block breadcrumbs %} + {% endblock breadcrumbs %} -
- {% block content %} - {% endblock content %} -
+
+ {% block content %} + {% endblock content %} +
-
-{% include "base/footer.html" %} - - - - -{% block scripts %} -{% endblock scripts %} - +
+ {% include "base/footer.html" %} + + + + + {% block scripts %} + {% endblock scripts %} + diff --git a/templates/base/error/page_not_found.html b/templates/base/error/page_not_found.html index 45d239e9..ab11755b 100644 --- a/templates/base/error/page_not_found.html +++ b/templates/base/error/page_not_found.html @@ -1,18 +1,18 @@
-
-

Page not found

-

- If you typed the web address, check it is correct. -

-

- If you pasted the web address, check you copied the entire address. -

-

- If the web address is correct or you selected a link or button, contact the Tax Credits Helpline if you need to speak to someone about your tax credits. -

-
+
+

Page not found

+

+ If you typed the web address, check it is correct. +

+

+ If you pasted the web address, check you copied the entire address. +

+

+ If the web address is correct or you selected a link or button, contact the Tax Credits Helpline if you need to speak to someone about your tax credits. +

+
diff --git a/templates/base/navigation.html b/templates/base/navigation.html index d694be7b..557f50a2 100644 --- a/templates/base/navigation.html +++ b/templates/base/navigation.html @@ -3,15 +3,15 @@ {% endblock content %} diff --git a/templates/details_table.html b/templates/details_table.html index 9c2099de..ff580710 100644 --- a/templates/details_table.html +++ b/templates/details_table.html @@ -4,105 +4,105 @@ {% load humanize %} {% block breadcrumbs %} -
-
    -
  1. - Search -
    2. - {% if parent_entity %} -
  2. - {{parent_entity.name}} -
    3. - {% endif %} -
  3. - {{table.name}} -
    4. -
-
+
+
    +
  1. + Search +
    2. + {% if parent_entity %} +
  2. + {{parent_entity.name}} +
    3. + {% endif %} +
  3. + {{table.name}} +
    4. +
+
{% endblock breadcrumbs %} {% block content %} -
+
- Table -

{{table.name}}

+ Table +

{{table.name}}

-
-
+
+
-
-

- Description -

-
- {{table.description|markdown:3}} -
-
    -
  • - Last updated date: - {% if table.last_updated %} - {{table.last_updated | date:"jS F Y"}} ({{table.last_updated|naturaltime}}) - {% endif %} -
    • -
  • - Retention period: - {% if table.retention_period_in_days is None %} - Permanent - {% else %} - {{table.retention_period_in_days|intcomma}} days - {% endif %} -
    • -
  • - Refresh period: -
    • -
  • - Domain: - {{table.domain}} -
    • -
  • - Tags: - {{table.tags | join:', '}} -
    • -
+
+

+ Description +

+
+ {{table.description|markdown:3}}
+
    +
  • + Last updated date: + {% if table.last_updated %} + {{table.last_updated | date:"jS F Y"}} ({{table.last_updated|naturaltime}}) + {% endif %} +
    • +
  • + Retention period: + {% if table.retention_period_in_days is None %} + Permanent + {% else %} + {{table.retention_period_in_days|intcomma}} days + {% endif %} +
    • +
  • + Refresh period: +
    • +
  • + Domain: + {{table.domain}} +
    • +
  • + Tags: + {{table.tags | join:', '}} +
    • +
+
{% include "partial/contact_info.html" with data_owner=table.owner data_owner_email=table.owner_email %}
-
+
-
+
- {% if table.column_details %} + {% if table.column_details %} - - - - - - - - - - - {% for column in table.column_details %} + + + + + + + + + + + {% for column in table.column_details %} - {% endfor %} - -
Schema
Column nameDescriptionTypeIs Nullable
Schema
Column nameDescriptionTypeIs Nullable
{{column.name}} {{column.description|default:''}} {{column.type|title}} {{column.nullable|yesno|upper}}
- {% else %} -

Schema

-

The schema for this table is not available.

- {% endif %} + {% endfor %} + + + {% else %} +

Schema

+

The schema for this table is not available.

+ {% endif %}
-
+
{% endblock content %} diff --git a/templates/glossary.html b/templates/glossary.html index f862b801..fdb410ee 100644 --- a/templates/glossary.html +++ b/templates/glossary.html @@ -3,58 +3,58 @@ {% load static %} {% block content %} -
-
-

Glossary

-
-
-
- - +
+
+

Glossary

+
+
+
+ + +
+
-
-
-
- +
+ {% for parent_term in results %} +
+

{{ parent_term.name }}

+

{{ parent_term.description }}

+
- {% for member in parent_term.members %} -
-

{{ member.name }}

-

{{ member.description|markdown:3 }}

-
+ {% for member in parent_term.members %} +
+

{{ member.name }}

+

{{ member.description|markdown:3 }}

+
+ {%endfor%} +
+
{%endfor%} -
- {%endfor%}
-
{% endblock content %} {% block scripts %} - + {% endblock scripts %} \ No newline at end of file diff --git a/templates/partial/contact_info.html b/templates/partial/contact_info.html index d988af21..1451059d 100644 --- a/templates/partial/contact_info.html +++ b/templates/partial/contact_info.html @@ -1,20 +1,20 @@
-

IAO or Data Owner

-

+

IAO or Data Owner

+

{{data_owner}}
{{data_owner_email|urlize}} -

+

-

Contact for access requests

-

- {{data_owner_email|urlize}} -

-
+

Contact for access requests

+

+ {{data_owner_email|urlize}} +

+
-

Access requirements

-

- Processing the data might require - permission from IAO or Data owner. -

+

Access requirements

+

+ Processing the data might require + permission from IAO or Data owner. +

\ No newline at end of file diff --git a/templates/partial/filter.html b/templates/partial/filter.html index f69e3fa8..92753f73 100644 --- a/templates/partial/filter.html +++ b/templates/partial/filter.html @@ -1,60 +1,60 @@ {% load future %} {% load clear_filter %}
-
-
-
-

Filter

-
-
-
+
+
+
+

Filter

+
+
-
- {% include "partial/selected_filters.html" %} -
- +
+
+ {% include "partial/selected_filters.html" %} +
+ +
+
+ Domain
-
- Domain -
- - {{form.domain}} -
-
- - {{form.subdomain}} -
-
+ + {{form.domain}}
-
-
- Entity Types -
- {% for entity_type in form.entity_types %} -
- {{ entity_type.tag}} - -
- {% endfor %} +
+ + {{form.subdomain}} +
+
+
+
+
+ Entity Types +
+ {% for entity_type in form.entity_types %} +
+ {{ entity_type.tag}} +
-
+ {% endfor %}
-
-
- Where To Access -
- {% for access_option in form.where_to_access %} -
- {{ access_option.tag}} - -
- {% endfor %} +
+
+
+
+ Where To Access +
+ {% for access_option in form.where_to_access %} +
+ {{ access_option.tag}} +
-
+ {% endfor %}
+
+
diff --git a/templates/partial/pagination.html b/templates/partial/pagination.html index 85251911..ba448088 100644 --- a/templates/partial/pagination.html +++ b/templates/partial/pagination.html @@ -1,36 +1,36 @@ {% load future %} + diff --git a/templates/partial/search_result.html b/templates/partial/search_result.html index 3012bc1b..6e0593b9 100644 --- a/templates/partial/search_result.html +++ b/templates/partial/search_result.html @@ -1,92 +1,92 @@ {% load markdown %} {% load humanize %}
-{% for result in highlighted_results %} -
-
-

+ {% for result in highlighted_results %} +
+
+

{% with result_type=result.result_type.name|lower %} - {{result.fully_qualified_name}} + {{result.fully_qualified_name}} {% endwith %} {% if result.result_type.name == "DATA_PRODUCT" %} - - Data product - + + Data product + {% elif result.result_type.name == "TABLE" %} - - Table - + + Table + {% elif result.result_type.name == "DATABASE" %} - - Database - + + Database + {% elif result.result_type.name == "CHART" %} - - Chart - + + Chart + {% endif %} -

- {% if result.description %} -
- {% if result.description|length > 200 %} - {{ result.description|slice:":200"|add:"..."|markdown:3 }} - {% else %} - {{ result.description|markdown:3 }} - {% endif %} -
- {% endif %} -
-
-
Registered by:
-
- {{result.metadata.maintainer_display_name}} -
-
-
-
Database name:
-
- TBC -
-
-
-
First created:
-
- {% if result.metadata.creation_date %} - {{result.metadata.creation_date | date:"jS F Y"}} ({{result.metadata.creation_date|naturaltime}}) +

+ {% if result.description %} +
+ {% if result.description|length > 200 %} + {{ result.description|slice:":200"|add:"..."|markdown:3 }} + {% else %} + {{ result.description|markdown:3 }} {% endif %} - -
-
-
Refresh period:
-
- TBC -
-
-
-
Retention period:
-
- {{result.metadata.retention_period_in_days}} -
-
-
-
Domain name
-
- {{result.metadata.domain_name}} -
-
-
-
Tags
-
- {{ result.tags |join:", " }} -
-
-
-
Matched fields
-
- {{ result.matches|lookup:readable_match_reasons|join:", " }} -
+
+ {% endif %} +
+
+
Registered by:
+
+ {{result.metadata.maintainer_display_name}} +
+
+
+
Database name:
+
+ TBC +
+
+
+
First created:
+
+ {% if result.metadata.creation_date %} + {{result.metadata.creation_date | date:"jS F Y"}} ({{result.metadata.creation_date|naturaltime}}) + {% endif %} +
+
+
+
Refresh period:
+
+ TBC +
+
+
+
Retention period:
+
+ {{result.metadata.retention_period_in_days}} +
+
+
+
Domain name
+
+ {{result.metadata.domain_name}} +
+
+
+
Tags
+
+ {{ result.tags |join:", " }} +
+
+
+
Matched fields
+
+ {{ result.matches|lookup:readable_match_reasons|join:", " }} +
+
-
-
-{%endfor%} +
+ {%endfor%}
diff --git a/templates/partial/selected_filters.html b/templates/partial/selected_filters.html index 59fb38f1..a6221a4c 100644 --- a/templates/partial/selected_filters.html +++ b/templates/partial/selected_filters.html @@ -2,32 +2,32 @@ {% load clear_filter %}
-
-

Selected filters

-
-
-

- {% if label_clear_href|get_keys|length > 0 %} - - Clear filter - - {% endif %} -

-
+
+

Selected filters

+
+
+

+ {% if label_clear_href|get_keys|length > 0 %} + + Clear filter + + {% endif %} +

+
{% if label_clear_href|get_keys|length > 0 %} {% for key in label_clear_href|get_keys %} {% if label_clear_href|get_item:key|length > 0 %}

{{key|title}}

{% endif %} {% endfor %} diff --git a/templates/partial/sort.html b/templates/partial/sort.html index c0b007de..015a2ef7 100644 --- a/templates/partial/sort.html +++ b/templates/partial/sort.html @@ -1,10 +1,10 @@
- - Sort results - -
- {% for radio in form.sort %} + + Sort results + +
+ {% for radio in form.sort %}
{{radio.tag}} @@ -12,4 +12,4 @@ {% endfor %}
-
+
diff --git a/templates/search.html b/templates/search.html index 358209be..29ea2c1c 100644 --- a/templates/search.html +++ b/templates/search.html @@ -4,7 +4,7 @@ {% load humanize %} {% block content %} -
+
-
-
- {% include "partial/filter.html" %} -
-

{{total_results|intcomma}} Results

+
+
+ {% include "partial/filter.html" %} +
+

{{total_results|intcomma}} Results

{% include "partial/sort.html" %} {% include "partial/search_result.html" %} {% include "partial/pagination.html" %}
-
+
{% endblock content %} {% block scripts %} - + {% endblock scripts %} \ No newline at end of file