more html...

4 files changed, 49 insertions, 34 deletions

diff --git a/ctrack/caf/templates/caf/caf_list.html b/ctrack/caf/templates/caf/caf_list.html
index e1467a0..ff2394e 100644
--- a/ctrack/caf/templates/caf/caf_list.html
+++ b/ctrack/caf/templates/caf/caf_list.html
@@ -29,6 +29,8 @@
     </svg>
     All CAFs
   </h3>
+  <p>Use the search box to filter the table. The table can be exported in various formats using the buttons below. These
+  downloads will respect the filtering used.</p>
   <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/organisations/templates/organisations/organisation_list.html b/ctrack/organisations/templates/organisations/organisation_list.html
index 1cdb33d..3464308 100644
--- a/ctrack/organisations/templates/organisations/organisation_list.html
+++ b/ctrack/organisations/templates/organisations/organisation_list.html
@@ -28,6 +28,8 @@
       Organisations
     </h3>
     <span><a href="{% url "organisations:create" %}">[Create new...]</a></span></h3>
+    <p>Use the search box to filter the table. The table can be exported in various formats using the buttons below. These
+      downloads will respect the filtering used.</p>
     <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/organisations/templates/organisations/person_list.html b/ctrack/organisations/templates/organisations/person_list.html
index 24faa59..73b8188 100644
--- a/ctrack/organisations/templates/organisations/person_list.html
+++ b/ctrack/organisations/templates/organisations/person_list.html
@@ -19,29 +19,38 @@
   </script>
 
   <div class="col-12 m-2">
-    <h3>People</h3> <span><a href="#">[Create new...]</a></span>
-    <div class="row justify-content-center">
-      <div class="col-md-12 my-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-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>
+    People
+  </h3> <span><a href="#">[Create new...]</a></span>
+  <p>Use the search box to filter the table. The table can be exported in various formats using the buttons below. These
+    downloads will respect the filtering used.</p>
+  <div class="row justify-content-center">
+    <div class="col-md-12 my-2">
+      <table id="datatable" class="table table-bordered" style="width: 100%">
+        <thead>
+        <tr>
+          <th>Person</th>
+          <th>Organisation</th>
+          <th>Phone Number</th>
+          <th>Email</th>
+          <th>Contact History</th>
+        </tr>
+        </thead>
+        {% for p in object_list %}
           <tr>
-            <th>Person</th>
-            <th>Organisation</th>
-            <th>Phone Number</th>
-            <th>Email</th>
-            <th>Contact History</th>
+            <td><a href="{% url "organisations:person-detail" p.pk %}">{{ p.first_name }} {{ p.last_name }}</a></td>
+            <td><a href="{% url "organisations:detail" p.organisation.slug %}">{{ p.organisation.name }}</a></td>
+            <td>{{ p.mobile }}</td>
+            <td><a href="mailto:{{ p.email }}">{{ p.email }}</a></td>
+            <td><a href="#">Contact History</a></td>
           </tr>
-          </thead>
-          {% for p in object_list %}
-            <tr>
-              <td><a href="{% url "organisations:person-detail" p.pk %}">{{ p.first_name }} {{ p.last_name }}</a></td>
-              <td><a href="{% url "organisations:detail" p.organisation.slug %}">{{ p.organisation.name }}</a></td>
-              <td>{{ p.mobile }}</td>
-              <td><a href="mailto:{{ p.email }}">{{ p.email }}</a></td>
-              <td><a href="#">Contact History</a></td>
-            </tr>
-          {% endfor %}
-        </table>
+        {% endfor %}
+      </table>
     </div>
   </div>
 
diff --git a/ctrack/templates/base.html b/ctrack/templates/base.html
index 0b1e04e..d25a08f 100644
--- a/ctrack/templates/base.html
+++ b/ctrack/templates/base.html
@@ -44,24 +44,26 @@
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
-      <li class="nav-item">
-        <a href="{% url 'caf:es_list' %}" class="nav-link">Systems in Scope</a>
-      </li>
-
 
       <li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true"
-           aria-expanded="false">Dropdown</a>
+           aria-expanded="false">Organisations</a>
         <div class="dropdown-menu" aria-labelledby="dropdown01">
-          <a class="dropdown-item" href="#">Action</a>
-          <a class="dropdown-item" href="#">Another action</a>
-          <a class="dropdown-item" href="#">Something else here</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>
         </div>
       </li>
 
-      <li class="nav-item">
-        <a href="{% url 'caf:caf_list' %}" class="nav-link">CAF list</a>
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="dropdown02" data-toggle="dropdown" aria-haspopup="true"
+           aria-expanded="false">CAFs</a>
+        <div class="dropdown-menu" aria-labelledby="dropdown02">
+          <a class="dropdown-item" href="{% url "caf:caf_list" %}">All CAFs</a>
+          <a class="dropdown-item" href="{% url "caf:es_list" %}">All critical systems</a>
+        </div>
       </li>
+
       <li class="nav-item">
         <a class="nav-link" href="{% url 'about' %}">Help</a>
       </li>
@@ -104,9 +106,9 @@
 {% block javascript %}
 
   <!-- Bootstrap JS and its dependencies-->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
-            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
-            crossorigin="anonymous"></script>
+  <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+          integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+          crossorigin="anonymous"></script>
   {#  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"#}
   {#          integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"#}
   {#          crossorigin="anonymous"></script>#}