From d210853a13aa3468f78dbfc3212f3930771498bf Mon Sep 17 00:00:00 2001
From: Matthew Lemon <lemon@matthewlemon.com>
Date: Tue, 20 Oct 2020 10:40:00 +0100
Subject: smashing the HTML on the home page

---
 ctrack/caf/templates/caf/caf_list.html             |  66 ++++++------
 .../organisations/org_create_formset.html          |  11 +-
 .../templates/organisations/organisation_list.html |  10 +-
 ctrack/templates/pages/home.html                   | 111 ++++++++++++++++-----
 4 files changed, 140 insertions(+), 58 deletions(-)

(limited to 'ctrack')

diff --git a/ctrack/caf/templates/caf/caf_list.html b/ctrack/caf/templates/caf/caf_list.html
index ef0088f..e1467a0 100644
--- a/ctrack/caf/templates/caf/caf_list.html
+++ b/ctrack/caf/templates/caf/caf_list.html
@@ -19,35 +19,45 @@
   </script>
 
   <div class="col-12 m-2">
-    <h3>All CAFs</h3>
-    <div class="row justify-content-center">
-      <div class="col-md-12 my-2 py-2">
-        <table id="datatable" class="table table-bordered" style="width:100%">
-          <thead>
+  <h3>
+    <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-card-checklist" fill="currentColor"
+         xmlns="http://www.w3.org/2000/svg">
+      <path fill-rule="evenodd"
+            d="M14.5 3h-13a.5.5 0 0 0-.5.5v9a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-9a.5.5 0 0 0-.5-.5zm-13-1A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h13a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13z"/>
+      <path fill-rule="evenodd"
+            d="M7 5.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 0 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0z"/>
+    </svg>
+    All CAFs
+  </h3>
+  <div class="row justify-content-center">
+    <div class="col-md-12 my-2 py-2">
+      <table id="datatable" class="table table-bordered" style="width:100%">
+        <thead>
+        <tr>
+          <th>Organisation</th>
+          <th>CAF</th>
+          <th>Sub Mode</th>
+          <th>Applicable Systems</th>
+        </tr>
+        </thead>
+        {% for caf in object_list %}
           <tr>
-            <th>Organisation</th>
-            <th>CAF</th>
-            <th>Sub Mode</th>
-            <th>Applicable Systems</th>
+            <td><a href="{% url "organisations:detail" slug=caf.organisation.slug %}">{{ caf.organisation }}</a>
+            </td>
+            <td><a href="{% url 'caf:detail' pk=caf.pk %}">{{ caf }}</a></td>
+            <td>{{ caf.sub_mode }}</td>
+            <td>
+              <ul class="list-group">
+                {% for applicable_system in caf.applicable_systems.all %}
+                  <li class="list-group-item"><a
+                          href="{% url "caf:ass_detail" applicable_system.pk %}">{{ applicable_system.name }}</a>
+                  </li>
+                {% endfor %}
+              </ul>
+            </td>
           </tr>
-          </thead>
-          {% for caf in object_list %}
-            <tr>
-              <td><a href="{% url "organisations:detail" slug=caf.organisation.slug %}">{{ caf.organisation }}</a>
-              </td>
-              <td><a href="{% url 'caf:detail' pk=caf.pk %}">{{ caf }}</a></td>
-              <td>{{ caf.sub_mode }}</td>
-              <td>
-                <ul class="list-group">
-                  {% for applicable_system in caf.applicable_systems.all %}
-                    <li class="list-group-item"><a href="{% url "caf:ass_detail" applicable_system.pk %}">{{ applicable_system.name }}</a>
-                    </li>
-                  {% endfor %}
-                </ul>
-              </td>
-            </tr>
-          {% endfor %}
-        </table>
-      </div>
+        {% endfor %}
+      </table>
     </div>
+  </div>
 {% endblock %}
diff --git a/ctrack/organisations/templates/organisations/org_create_formset.html b/ctrack/organisations/templates/organisations/org_create_formset.html
index d78abb1..22de19e 100644
--- a/ctrack/organisations/templates/organisations/org_create_formset.html
+++ b/ctrack/organisations/templates/organisations/org_create_formset.html
@@ -9,7 +9,14 @@
 {% block content %}
 
   <div class="container mt-3">
-    <h4>Create a new organisation</h4>
+    <h4>
+      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-people-fill" fill="currentColor"
+           xmlns="http://www.w3.org/2000/svg">
+        <path fill-rule="evenodd"
+              d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5.784 6A2.238 2.238 0 0 1 5 13c0-1.355.68-2.75 1.936-3.72A6.325 6.325 0 0 0 5 9c-4 0-5 3-5 4s1 1 1 1h4.216zM4.5 8a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5z"/>
+      </svg>
+      Create a new organisation
+    </h4>
     <div class="row">
       <div class="col-md-8 pt-2 pl-0 my-2 border bg-light">
         <form method="post" action="">
@@ -138,7 +145,7 @@
           {% endfor %}
           <div class="my-3 col-md-12">
             <input class="btn btn-primary" type="submit" value="Submit">
-            <a href="{% url "organisations:list"  %}" class="btn btn-danger">Cancel</a>
+            <a href="{% url "organisations:list" %}" class="btn btn-danger">Cancel</a>
           </div>
         </table>
         </form>
diff --git a/ctrack/organisations/templates/organisations/organisation_list.html b/ctrack/organisations/templates/organisations/organisation_list.html
index 661a0d4..1cdb33d 100644
--- a/ctrack/organisations/templates/organisations/organisation_list.html
+++ b/ctrack/organisations/templates/organisations/organisation_list.html
@@ -19,7 +19,15 @@
   </script>
 
   <div class="col-12 m-2">
-    <h3>Organisations</h3> <span><a href="{% url "organisations:create" %}">[Create new...]</a></span></h3>
+    <h3>
+      <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-people-fill" fill="currentColor"
+           xmlns="http://www.w3.org/2000/svg">
+        <path fill-rule="evenodd"
+              d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5.784 6A2.238 2.238 0 0 1 5 13c0-1.355.68-2.75 1.936-3.72A6.325 6.325 0 0 0 5 9c-4 0-5 3-5 4s1 1 1 1h4.216zM4.5 8a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5z"/>
+      </svg>
+      Organisations
+    </h3>
+    <span><a href="{% url "organisations:create" %}">[Create new...]</a></span></h3>
     <div class="row justify-content-center">
       <div class="col-md-12 my-2 py-2">
         <table id="datatable" class="table table-bordered" style="width: 100%">
diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html
index 25d0cf3..3c563db 100644
--- a/ctrack/templates/pages/home.html
+++ b/ctrack/templates/pages/home.html
@@ -6,39 +6,96 @@
   <div class="jumbotron">
     <div class="container">
       <h1 class="display-3">ctrack</h1>
-      <p>This is a template for a simple marketing or informational website. It includes a large callout called a
-        jumbotron and three supporting pieces of content. Use it as a starting point to create something more
-        unique.</p>
-      <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more &raquo;</a></p>
+      <p><strong>DfT's Cyber Compliance Team's information management system</strong>, used to track all core
+        components of the NIS regime.</p>
+      <p>ctrack is a proof-of-concept web application developed in-house by the Cyber Compliance
+        Team at the UK Department for Transport that aims to demonstrate the improvements in workflow possible by
+        storing data associated with OES and its associated CAF data in a relational database. It focuses on the
+        absolute basics of managing any business data: Create, Read, Update, Delete (CRUD) functionality and
+        demonstrates how collection and analysis of ongoing assessment data - using the CAF as the foundation (the
+        framework, not the spreadsheet) - can be exponentially improved using the simplest of form-based web
+        application.</p>
+      <hr>
+      <div class="col-12 p-2">
+        <div class="row row-cols-2">
+          <div class="col-md-6 m-1 border rounded p-2">
+            <h3>
+              <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-people-fill" fill="currentColor"
+                   xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd"
+                      d="M7 14s-1 0-1-1 1-4 5-4 5 3 5 4-1 1-1 1H7zm4-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5.784 6A2.238 2.238 0 0 1 5 13c0-1.355.68-2.75 1.936-3.72A6.325 6.325 0 0 0 5 9c-4 0-5 3-5 4s1 1 1 1h4.216zM4.5 8a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5z"/>
+              </svg>
+              OES/Organisations
+            </h3>
+            <p>There are currently <span class="lead font-weight-bold">53</span> <a
+                    href="{% url "organisations:list" %}">organisations</a> on ctrack, comprising <span
+                    class="lead font-weight-bold">124</span> <a href="{% url "organisations:people" %}">people</a>.</p>
+
+            <ul class="list-group">
+              <li class="list-group-item list-group-item-warning"><a href="{% url "organisations:list" %}">List of all
+                organisations</a></li>
+              <li class="list-group-item list-group-item-warning"><a href="{% url "organisations:people" %}">List of all
+                people</a></li>
+            </ul>
+            <p>You can filter these lists to view things by <strong>lead inspector</strong>, <strong>sub-mode</strong>
+              and other things.</p>
+          </div>
+          <div class="col-md-5 m-1 border rounded p-2">
+            <h3>
+              <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-card-checklist" fill="currentColor"
+                   xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd"
+                      d="M14.5 3h-13a.5.5 0 0 0-.5.5v9a.5.5 0 0 0 .5.5h13a.5.5 0 0 0 .5-.5v-9a.5.5 0 0 0-.5-.5zm-13-1A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h13a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2h-13z"/>
+                <path fill-rule="evenodd"
+                      d="M7 5.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 1 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0zM7 9.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5zm-1.496-.854a.5.5 0 0 1 0 .708l-1.5 1.5a.5.5 0 0 1-.708 0l-.5-.5a.5.5 0 0 1 .708-.708l.146.147 1.146-1.147a.5.5 0 0 1 .708 0z"/>
+              </svg>
+              CAFs
+            </h3>
+            <p>There are <span class="lead font-weight-bold">93</span> <a href="{% url "caf:caf_list" %}">CAFs</a> on
+              ctrack.</p>
+            <ul class="list-group">
+              <li class="list-group-item list-group-item-warning"><a href="{% url "caf:caf_list" %}">List of all
+                CAFs</a></li>
+            </ul>
+            <p>Of these - <span class="lead font-weight-bold">12</span> have been validated.</p>
+          </div>
+        </div>
+        <div class="row mt-2">
+          <p><a class="btn btn-primary btn-lg" href="#" role="button">Get help using ctrack &raquo;</a></p>
+        </div>
+      </div>
     </div>
   </div>
 
   <!-- Example row of columns -->
-  <div class="row">
-    <div class="col-md-4">
-      <h2>Heading</h2>
-      <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
-        condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec
-        sed odio dui. </p>
-      <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
-    </div>
-    <div class="col-md-4">
-      <h2>Heading</h2>
-      <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
-        condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec
-        sed odio dui. </p>
-      <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
-    </div>
-    <div class="col-md-4">
-      <h2>Heading</h2>
-      <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta
-        felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum
-        massa justo sit amet risus.</p>
-      <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
-    </div>
-  </div>
+  {#  <div class="row">#}
+  {#    <div class="col-md-4">#}
+  {#      <h1>OES/Organisations</h1>#}
+  {#      <p>There are currently <span class="lead font-weight-bold">53</span> <a#}
+  {#              href="{% url "organisations:list" %}">organisations</a> on ctrack, comprising <span#}
+  {#              class="lead font-weight-bold">124</span> <a href="{% url "organisations:people" %}">people</a>.</p>#}
+  {#      <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>#}
+  {#    </div>#}
+  {#    <div class="col-md-4">#}
+  {#      <h1>CAFs</h1>#}
+  {#      <p>There are <span class="lead font-weight-bold">93</span> <a href="{% url "caf:caf_list" %}">CAFs</a> on ctrack.#}
+  {#      </p>#}
+  {#      <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>#}
+  {#    </div>#}
+  {#    <div class="col-md-4">#}
+  {#      <h2>Heading</h2>#}
+  {#      <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta#}
+  {#        felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum#}
+  {#        massa justo sit amet risus.</p>#}
+  {#      <p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>#}
+  {#    </div>#}
+  {#  </div>#}
 
   <hr>
+  <div class="container">
+    <div class="row mt-2"><p>ctrack source code is open source and available on <a
+            href="https://github.com/yulqen/ctrack">Github</a></p></div>
+  </div>
 
   </main>
 {% endblock content %}
-- 
cgit v1.2.3