diff --git a/scss/_details.scss b/scss/_details.scss index 5e3d9574..739ca637 100644 --- a/scss/_details.scss +++ b/scss/_details.scss @@ -6,6 +6,5 @@ } .app-summary-card .app-summary-card__footer { - text-align: right; margin-bottom: 0; } diff --git a/templates/details_base.html b/templates/details_base.html index 54703685..428754c7 100644 --- a/templates/details_base.html +++ b/templates/details_base.html @@ -33,11 +33,8 @@ {% block content %}
-

{{h1_value}} - - {{entity_type}} - -

+ {{entity_type}} +

{{h1_value}}

@@ -56,49 +53,7 @@

{% block extra_description %} {% endblock extra_description %} {% block metadata_list %} - + {% include "partial/details_metadata.html" with entity=entity entity_type=entity_type %} {% include "partial/esda_info.html" with is_esda=is_esda %} {% endblock metadata_list %} {% if entity.metadata_last_ingested %} diff --git a/templates/partial/details_metadata.html b/templates/partial/details_metadata.html new file mode 100644 index 00000000..7d9d083c --- /dev/null +++ b/templates/partial/details_metadata.html @@ -0,0 +1,95 @@ +{% load humanize %} +{% load lookup %} +{% load waffle_tags %} +
+
+
+ Entity type +
+
+ + {{ entity_type }} + +
+
+ +
+
+ Subject area{{entity.subject_areas|length|pluralize}} +
+
+ {% for subject_area in entity.subject_areas %} + {{ subject_area.display_name }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% if not entity.subject_areas %} + Not provided + {% endif %} +
+
+ + {% if entity.created %} +
+
+ Data first created +
+
+ {{entity.created | date:"jS F Y"}} ({{entity.created|naturaltime}}) +
+
+ {% endif %} + + {% if entity.data_last_modified and entity.platform.urn != PlatformUrns.CADET %} +
+
+ Data last updated +
+
+ {{entity.data_last_modified | date:"jS F Y"}} +
+
+ {% elif entity.last_datajob_run_date %} +
+
+ Data last updated +
+
+ {{entity.last_datajob_run_date|date:"jS F Y"}} +
+
+ {% endif %} + +
+
+ Refresh period +
+
+ {{entity.custom_properties.data_summary.refresh_period | default:'Not provided' }} +
+
+ + {% if entity.custom_properties.security_classification %} +
+
+ Security classification +
+
+ {{entity.custom_properties.security_classification}} +
+
+ {% endif %} + + {% switch 'display-result-tags' %} + {% if entity.tags_to_display %} +
+
+ Tags +
+
+ {% for tag in entity.tags_to_display %} + {{ tag }}{% if not forloop.last %}, {% endif %} + {% endfor %} +
+
+ {% endif %} + {% endswitch %} +
diff --git a/templates/partial/subject_area_list.html b/templates/partial/subject_area_list.html deleted file mode 100644 index bb4b658c..00000000 --- a/templates/partial/subject_area_list.html +++ /dev/null @@ -1,7 +0,0 @@ -Subject area{{subject_areas|length|pluralize}}: -{% for subject_area in subject_areas %} -{{ subject_area.display_name }}{% if not forloop.last %}, {% endif %} -{% endfor %} -{% if not subject_areas %} -Not provided. -{% endif %}