Merge branch 'main' of https://github.com/open-innovations/leeds-2023

open-innovations · Jan 23, 2024 · ab54d8c · ab54d8c
2 parents fd35a2d + 2e67f5b
commit ab54d8c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 7 deletions.
diff --git a/docs/_components/notice/manual_overrides.njk b/docs/_components/notice/manual_overrides.njk
@@ -0,0 +1,11 @@
+<aside class="notice manual-override">
+  <img class="icon" src="/assets/images/icons/adjust-setting.svg" inline/>
+  <p>
+    This page contains data which differs from the data sources referenced on the page.
+    This is might be as a result of
+    incomplete or outdated source data,
+    changes to data processing, or
+    other manual adjustment to account for data not already captured in LEEDS 2023 operational systems that feed this site. 
+    Where practicable, the source data or processing will be amended to more accurately reflect the manually overriden figures.
+  </p>
+</aside>
diff --git a/docs/_components/notice/pending_validation.njk b/docs/_components/notice/pending_validation.njk
@@ -1,4 +1,4 @@
-<aside class='validation-notice unvalidated'>
+<aside class='notice validation-notice unvalidated'>
   <img class="icon" src="/assets/images/icons/warning.svg" inline/>
   <p>
   The LEEDS 2023 team is in the process of validating the figures presented on this page for evaluation purposes.

diff --git a/docs/_components/notice/validated.njk b/docs/_components/notice/validated.njk
@@ -1,4 +1,4 @@
-<aside class='validation-notice validated'>
+<aside class='notice validation-notice validated'>
   <img class="icon" src="/assets/images/icons/info.svg" inline/>
   <p>
   The LEEDS 2023 team has validated these figures in preparation for the evaluation

diff --git a/docs/_includes/css/validation.css b/docs/_includes/css/validation.css
@@ -1,6 +1,5 @@
-.validation-notice {
-  background: var(--l23-yellow);
-  border: 0.5em solid black;
+.notice {
+  border: 0.2em solid black;
   padding: 1em;
   display: flex;
   gap: 1em;
@@ -12,11 +11,20 @@
     width: 2em;
     flex-shrink: 0;
   }
+}
+
+.validation-notice {
+  background: var(--l23-yellow);
+  /* border-width: 0.5em; */
   &.validated {
     background-color: var(--l23-cyan);
   }
 }
 
+.manual-override {
+  background: var(--l23-magenta);
+}
+
 .validation-message {
   background-color: var(--l23-yellow);
   display: flex;
@@ -26,4 +34,4 @@
   & :is(svg, img) {
     height: 1em;
   }
-}
+}
diff --git a/docs/_includes/layouts/metric.njk b/docs/_includes/layouts/metric.njk
@@ -22,6 +22,8 @@ up:
 
 {{ content | safe }}
 
+{% if data_overrides %}{{ comp.notice.manual_overrides() | safe }}{% endif %}
+
 {% if limitations %}
 <h2>Known Limitations and Issues</h2>
 <ul>

diff --git a/docs/_includes/partials/header.njk b/docs/_includes/partials/header.njk
@@ -6,7 +6,7 @@
       <p class='header-title'>{{ header_title or metas.site }}</p>
     </a>
     {{ comp.nav({ url: url }) | safe }}
-    {% if work_in_progress %}{{ comp.work_in_progress() | safe }}{% endif %}
+    {# {% if work_in_progress %}{{ comp.work_in_progress() | safe }}{% endif %} #}
   </header>
   {% endcomp %}
 </div>

diff --git a/docs/assets/images/icons/adjust-setting.svg b/docs/assets/images/icons/adjust-setting.svg