Styling clean-up of document headers

Author: jeremyh

cubedash/_filters.py

@@ -7,6 +7,7 @@
 import calendar
 import logging
 from datetime import datetime
+from typing import Mapping
 
 import flask
 import rapidjson
@@ -106,6 +107,11 @@ def _dataset_created(dataset: Dataset):
     return utils.dataset_created(dataset)
 
 
+@bp.app_template_filter("all_values_none")
+def _all_values_none(d: Mapping):
+    return all(v is None for v in d.values())
+
+
 @bp.app_template_filter("dataset_day_link")
 def _dataset_day_link(dataset: Dataset, timezone=None):
     t = dataset.center_time

cubedash/templates/dataset.html

@@ -31,10 +31,12 @@
 {% block content %}
     {% from "layout/macros.html" import query_param_list, show_raw_document %}
     <div class="panel highlight">
-        <h1><strong>{{ dataset | printable_dataset }}</strong></h1>
+        <h2 class="followed"><strong>{{ dataset | printable_dataset }}</strong></h2>
+        <div class="header-follow">
+                dataset of product {{ dataset.type.name | product_link }}
+        </div>
         <div class="sub-header">
             <span>
-                {% if dataset_region_code %}Region <strong>{{ dataset_region_code }}</strong>, {% endif %}
                 Indexed by <strong>{{ dataset.indexed_by }}</strong>
                 {{ dataset.indexed_time | timesince }},
                 created {{ dataset | dataset_created | timesince }}
@@ -49,8 +51,14 @@ <h1><strong>{{ dataset | printable_dataset }}</strong></h1>
             </span>
         </div>
         <div class="sub-header">
-            {{ dataset.type.name | product_link }} of {{ dataset | dataset_day_link(grouping_timezone) }}
-            ({{ dataset.type.metadata_type.name }})
+            {% if dataset_region_code %}
+                    Region
+                    <a href="{{ url_for('region_page', region_code=dataset_region_code, product_name=dataset.type.name)}}">
+                        {{- dataset_region_code -}}
+                    </a>
+                {% endif %}
+            for
+            {{ dataset | dataset_day_link(grouping_timezone) }}
         </div>
     </div>
 

cubedash/templates/metadata-type.html

@@ -9,7 +9,12 @@
     {% from "layout/macros.html" import query_param_list, show_raw_document %}
 
     <div class="panel highlight">
-        <h2 class="followed"><span class="metadata-type-name">{{ metadata_type.name }}</span></h2>
+        <h2 class="followed">
+            <span class="metadata-type-name">
+                <i class="fa fa-hdd-o" aria-hidden="true"></i>
+                {{ metadata_type.name }}
+            </span>
+        </h2>
         <div class="header-follow">metadata type of {{ products_using_it | length }} products</div>
 
         <div><em>

cubedash/templates/overview.html

@@ -144,11 +144,19 @@ <h4>
                         metadata:
                     </h4>
 
-                    {{ query_param_list(product.fields,
+                    {% if (product.fields | all_values_none) and (product_summary.fixed_metadata == {}) %}
+                        <em>No common values</em>
+                    {% else %}
+                        {{ query_param_list(product.fields,
                                         show_nulls=false,
                                         descriptions=product.metadata_type.dataset_fields,
                                         fallback_dict=product_summary.fixed_metadata or {}) }}
-
+                        {% if product_summary.fixed_metadata is none %}
+                            <em class="muted" title="Generated summaries are out of date">
+                                Unknown (needs refresh)
+                            </em>
+                        {% endif %}
+                    {% endif %}
 
                     {% if product_summary.derived_products %}
                         <h4>Derived</h4>

cubedash/templates/product-audit.html

@@ -19,11 +19,11 @@
 {% endblock %}
 {% block content %}
     {% from "layout/macros.html" import query_param_list, show_raw_document %}
-    <div class="panel highlight">
-        <h1 class="followed">Product Audit
+    <div class="panel">
+        <h2 class="followed">Product Audit
             {%- if sentry_public_dsn and sentry_public_args.environment %} ({{ sentry_public_args.environment }})
             {%- endif -%}
-        </h1>
+        </h2>
         <div class="header-follow">{{ products_summarised|length }} products with summaries.
             {{ (products_missing | length) or 'None' }} without{% if products_missing %}:{% else %}.{% endif %}
             {% for name in products_missing %}

cubedash/templates/product.html

@@ -18,40 +18,54 @@ <h2 class="followed">{{ product.name }}</h2>
         </div>
         <div>
             <em>{{ product.definition['description'] }}</em>
-
         </div>
         <p>
-
-            <a href="{{ url_for('overview_page', product_name=product.name) }}">
-                {%- if product_summary.time_earliest -%}
-                    {{ product_summary.time_earliest.strftime('%B %Y') }} to
-                    {{ product_summary.time_latest.strftime('%B %Y') }}
-                {%- endif -%}
-            </a>,
-            <a href="{{ url_for('search_page', product_name=product.name) }}">
-                {{ product_summary.dataset_count or '0' }} datasets
-            </a>
+                <i class="fa fa-globe" aria-hidden="true"></i>
+                <a href="{{ url_for('overview_page', product_name=product.name) }}">
+                    {% if product_summary.time_earliest -%}
+                        {{ product_summary.time_earliest.strftime('%B %Y') }} to
+                        {{ product_summary.time_latest.strftime('%B %Y') }}
+                    {%- endif -%}
+                </a><br/>
+                <i class="fa fa-list" aria-hidden="true"></i>
+                <a href="{{ url_for('search_page', product_name=product.name) }}">
+                    {{ product_summary.dataset_count or '0' }} datasets
+                </a>
         </p>
     </div>
     <div class="panel">
 
         <h3>Metadata</h3>
-        {{ query_param_list(
-                    product.fields,
-                    wide=true,
-                    show_nulls=false,
-                    descriptions=product.metadata_type.dataset_fields,
-                    fallback_dict=fixed_metadata)
-                }}
+
+        {% if (product.fields | all_values_none) and (product_summary.fixed_metadata == {}) %}
+            <em>No common values</em>
+        {% else %}
+            {{ query_param_list(product.fields,
+                            show_nulls=false,
+                            wide=true,
+                            descriptions=product.metadata_type.dataset_fields,
+                            fallback_dict=product_summary.fixed_metadata or {}) }}
+            {% if product_summary.fixed_metadata is none %}
+                <em title="Generated summaries are out of date">
+                    <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                    Unknown fixed fields
+                </em>
+            {% endif %}
+        {% endif %}
     </div>
     <div class="panel odd">
         <h3>Searchable fields</h3>
         {% for key, value in product.fields | dictsort if (value is none and key not in fixed_metadata) %}
             <div>
                 {% set field = product.metadata_type.dataset_fields[key] %}
                 {{ key }}
-                {% if field.indexed is true %}<span title="indexed">•</span>{% endif %}
-                <span class="badge">{{ field.type_name }}</span>
+
+                <span class="badge">
+                    {{- field.type_name -}}
+                    {%- if field.indexed is true %}
+                        <span title="indexed"><i class="fa fa-square" aria-hidden="true"></i></span>
+                    {%- endif -%}
+                </span>
                 {% if field.description and ('TODO' not in field.description) %}
                     <span class="muted">{{ field.description }}</span>
                 {% endif %}