diff options
| author | Matthew Lemon <lemon@matthewlemon.com> | 2020-10-21 16:17:40 +0100 |
|---|---|---|
| committer | Matthew Lemon <lemon@matthewlemon.com> | 2020-10-21 16:27:53 +0100 |
| commit | 4bd6e569fef7c9ebda8f63e5064ac90fcfe1c3e4 (patch) | |
| tree | 79bd61048f73a58919324509a00b6a5379a9ae1c | |
| parent | cbddf7c7fad44f62b1cf057158bcf9e53f8e1bb4 (diff) | |
prettied up the org list page
| -rw-r--r-- | ctrack/organisations/templates/organisations/organisation_list.html | 10 | ||||
| -rw-r--r-- | ctrack/templates/base.html | 10 | ||||
| -rw-r--r-- | ctrack/templates/pages/home.html | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/ctrack/organisations/templates/organisations/organisation_list.html b/ctrack/organisations/templates/organisations/organisation_list.html index dfce156..f49cd54 100644 --- a/ctrack/organisations/templates/organisations/organisation_list.html +++ b/ctrack/organisations/templates/organisations/organisation_list.html @@ -59,14 +59,18 @@ <a href="{% url "organisations:list_by_inspector" org.lead_inspector.pk %}">{{ org.lead_inspector.name }}</a> </td> {% else %} - <td>{{ org.lead_inspector.name }}</td> + <td><span class="text-muted">Not nominated</span></td> + {% endif %} + {% if org.deputy_lead_inspector %} + <td>{{ org.deputy_lead_inspector.name }}</td> + {% else %} + <td><span class="text-muted">Not nominated</span></td> {% endif %} - <td>{{ org.deputy_lead_inspector.name }}</td> <td> {% if org.primary_contacts %} <ul style="list-style-type:none; float:left; padding: 0"> {% for p in org.primary_contacts %} - <li><a href="mailto:{{ p.email }}">{{ p }}</a> ({{ p.mobile }})</li> + <li><a href="mailto:{{ p.email }}">{{ p }}</a><br><span class="font-italic">{{ p.mobile }}</span></li> {% endfor %} </ul> {% else %} diff --git a/ctrack/templates/base.html b/ctrack/templates/base.html index d25a08f..8594fb4 100644 --- a/ctrack/templates/base.html +++ b/ctrack/templates/base.html @@ -49,6 +49,7 @@ <a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Organisations</a> <div class="dropdown-menu" aria-labelledby="dropdown01"> + <a class="dropdown-item" href="{% url "organisations:list_oes" %}">All OES</a> <a class="dropdown-item" href="{% url "organisations:list" %}">All organisations</a> <a class="dropdown-item" href="{% url "organisations:people" %}">All people</a> <a class="dropdown-item" href="#">All essential services</a> @@ -64,6 +65,15 @@ </div> </li> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" + aria-expanded="false">Compliance</a> + <div class="dropdown-menu" aria-labelledby="dropdown01"> + <a class="dropdown-item" href="{% url "compliance:overview" %}">Overview</a> + <a class="dropdown-item" href="#">Inspection/Audit Programme</a> + </div> + </li> + <li class="nav-item"> <a class="nav-link" href="{% url 'about' %}">Help</a> </li> diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html index e1314ac..fbc92de 100644 --- a/ctrack/templates/pages/home.html +++ b/ctrack/templates/pages/home.html @@ -16,7 +16,9 @@ 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> - <p><a href="#">NIS Directive</a> | <a href="#">NCSC NIS Guidance</a> | <a href="#">UK Cyber Strategy</a></p> + <p><a href="#">NIS Directive</a> | <a href="#">NCSC NIS Guidance</a> | <a href="#">UK Cyber Strategy</a> | <a + href="#">CCT + TiME</a></p> <div class="col-12 p-2"> <div class="row row-cols-2"> <div class="col-sm-12 m-1 border rounded p-2"> |