presentation changes - looking better

author: Matthew Lemon <lemon@matthewlemon.com> 2020-10-08 09:08:05 +0100
committer: Matthew Lemon <lemon@matthewlemon.com> 2020-10-08 09:08:59 +0100
commit: c2dbd21b73d8ea8830cf2c80eac83fd5c681b16a (patch)
tree: 4f1226aa5de98d2be439e71131398bacac927ef8
parent: 2e21f37eaf031300b4f7ec0626333255f16e7bd0 (diff)
4 files changed, 130 insertions, 124 deletions
diff --git a/ctrack/caf/templates/caf/applicablesystem_list.html b/ctrack/caf/templates/caf/applicablesystem_list.html
index a87d7e9..b34fa33 100644
--- a/ctrack/caf/templates/caf/applicablesystem_list.html
+++ b/ctrack/caf/templates/caf/applicablesystem_list.html
@@ -5,12 +5,10 @@
 {% block title %}Systems in Scope{% endblock %}
 {% block content %}
 
-
-<div class="container">
+<div class="col-md-12">
     <div class="row">
         <div class="col-sm-12">
             <h3>Systems in Scope</h3>
-
             <table id="datatable" class="display compact cell-border" style="width:100%">
                 <thead>
                     <tr>
diff --git a/ctrack/caf/templates/caf/caf_list.html b/ctrack/caf/templates/caf/caf_list.html
index 493fb29..b7433c7 100644
--- a/ctrack/caf/templates/caf/caf_list.html
+++ b/ctrack/caf/templates/caf/caf_list.html
@@ -5,41 +5,36 @@
 {% block title %} CAF - All CAF Summary {% endblock %}
 {% block content %}
 
-  <div class="container mt-3">
-    <div class="row">
-      <div class="col-md-12 pl-0 my-2">
-        <h4>CAF List</h4>
-        <div class="row">
-          <div class="col-md-12 bg-light my-2 py-2">
-            <table id="datatable" class="display compact cell-border" style="width:100%">
-              <thead>
-              <tr>
-                <th>Organisation</th>
-                <th>Link</th>
-                <th>Sub Mode</th>
-                <th>Applicable Systems</th>
-              </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.version }}</a></td>
-                  <td>{{ caf.sub_mode }}</td>
-                  <td>
-                    <ul>
-                      {% for applicable_system in caf.applicable_systems.all %}
-                        <li><a href="{% url "caf:ass_detail" applicable_system.pk %}">{{ applicable_system.name }}</a>
-                        </li>
-                      {% endfor %}
-                    </ul>
-                  </td>
-                </tr>
-              {% endfor %}
-            </table>
-          </div>
-        </div>
-      </div>
+  <div class="col-md-12">
+  <h4>CAF List</h4>
+  <div class="row">
+    <div class="col-md-12 bg-light my-2 py-2">
+      <table id="datatable" class="display compact cell-border" style="width:100%">
+        <thead>
+        <tr>
+          <th>Organisation</th>
+          <th>Link</th>
+          <th>Sub Mode</th>
+          <th>Applicable Systems</th>
+        </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.version }}</a></td>
+            <td>{{ caf.sub_mode }}</td>
+            <td>
+              <ul>
+                {% for applicable_system in caf.applicable_systems.all %}
+                  <li><a href="{% url "caf:ass_detail" applicable_system.pk %}">{{ applicable_system.name }}</a>
+                  </li>
+                {% endfor %}
+              </ul>
+            </td>
+          </tr>
+        {% endfor %}
+      </table>
     </div>
   </div>
 
diff --git a/ctrack/templates/base.html b/ctrack/templates/base.html
index c1333a4..c700faf 100644
--- a/ctrack/templates/base.html
+++ b/ctrack/templates/base.html
@@ -1,4 +1,5 @@
-{% load static i18n %}<!DOCTYPE html>
+{% load static i18n %}
+<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="utf-8">
@@ -16,14 +17,12 @@
   <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
 
   {% block css %}
-
     <!-- Latest compiled and minified Bootstrap CSS -->
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
-
     <!-- Your stuff: Third-party CSS libraries go here -->
-
+    {#    <link href="jumbotron.css" rel="stylesheet">#}
     <!-- This file stores project-specific CSS -->
 
     <link href="{% static 'css/project.css' %}" rel="stylesheet">
@@ -32,68 +31,83 @@
     <link rel="stylesheet" type="text/css"
           href="https://cdn.datatables.net/v/dt/dt-1.10.20/af-2.3.4/b-1.6.1/b-print-1.6.1/cr-1.5.2/r-2.2.3/datatables.min.css"/>
 
+    <style>
+      .bd-placeholder-img {
+        font-size: 1.125rem;
+        text-anchor: middle;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+      }
+
+      body {
+        padding-top: 70px;
+      }
+
+      @media (min-width: 768px) {
+        .bd-placeholder-img-lg {
+          font-size: 3.5rem;
+        }
+      }
+    </style>
   {% endblock %}
-
 </head>
-
 <body>
 
-<div class="mb-1">
-  <nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
-    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
-            data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
-            aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-    {#        <a id="_title" class="navbar-brand" href="{% url 'core:home' %}">ctrack</a>#}
-    <a href="{% url 'core:home' %}"><img src="{% static "images/ctrack_pc_green.png" %}" alt="" height="38" width="55"></a>
-
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav mr-auto">
+<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+  <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
+          data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
+          aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  {#        <a id="_title" class="navbar-brand" href="{% url 'core:home' %}">ctrack</a>#}
+  <a href="{% url 'core:home' %}"><img src="{% static "images/ctrack_pc_green.png" %}" alt="" height="38"
+                                       width="55"></a>
+
+  <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>
+        <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>
+        </div>
+      </li>
+
+      <li class="nav-item">
+        <a href="{% url 'caf:caf_list' %}" class="nav-link">CAF list</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="{% url 'about' %}">Help</a>
+      </li>
+      {% if request.user.is_authenticated %}
         <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>
-          <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>
-          </div>
+          {# URL provided by django-allauth/account/urls.py #}
+          <a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a>
         </li>
-
         <li class="nav-item">
-          <a href="{% url 'caf:caf_list' %}" class="nav-link">CAF list</a>
+          {# URL provided by django-allauth/account/urls.py #}
+          <a class="nav-link" href="{% url 'account_logout' %}">{% trans "Sign Out" %}</a>
         </li>
+      {% else %}
         <li class="nav-item">
-          <a class="nav-link" href="{% url 'about' %}">Help</a>
+          {# URL provided by django-allauth/account/urls.py #}
+          <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% trans "Sign In" %}</a>
         </li>
-        {% if request.user.is_authenticated %}
-          <li class="nav-item">
-            {# URL provided by django-allauth/account/urls.py #}
-            <a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a>
-          </li>
-          <li class="nav-item">
-            {# URL provided by django-allauth/account/urls.py #}
-            <a class="nav-link" href="{% url 'account_logout' %}">{% trans "Sign Out" %}</a>
-          </li>
-        {% else %}
-          <li class="nav-item">
-            {# URL provided by django-allauth/account/urls.py #}
-            <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% trans "Sign In" %}</a>
-          </li>
-        {% endif %}
-      </ul>
-    </div>
-  </nav>
-
-</div>
-
-<div class="container">
+      {% endif %}
+    </ul>
+  </div>
+</nav>
 
+<main role="main" class="container">
   {% if messages %}
     {% for message in messages %}
       <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">{{ message }}
@@ -102,13 +116,9 @@
       </div>
     {% endfor %}
   {% endif %}
-
   {% block content %}
-    <p>Use this document as a way to quick start any new project.</p>
   {% endblock content %}
-
-</div> <!-- /container -->
-
+</main>
 {% block modal %}{% endblock modal %}
 
 <!-- Le javascript
diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html
index baa6d9e..25d0cf3 100644
--- a/ctrack/templates/pages/home.html
+++ b/ctrack/templates/pages/home.html
@@ -1,41 +1,44 @@
 {% extends "base.html" %}
 
-{% block content  %}
-
-<main role="main">
+{% block content %}
 
   <!-- Main jumbotron for a primary marketing message or call to action -->
   <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>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>
     </div>
   </div>
 
-  <div class="container">
-    <!-- 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>
+  <!-- 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>
 
-    <hr>
-
-  </div> <!-- /container -->
+  <hr>
 
-</main>
+  </main>
 {% endblock content %}
author	Matthew Lemon <lemon@matthewlemon.com>	2020-10-08 09:08:05 +0100
committer	Matthew Lemon <lemon@matthewlemon.com>	2020-10-08 09:08:59 +0100
commit	c2dbd21b73d8ea8830cf2c80eac83fd5c681b16a (patch)
tree	4f1226aa5de98d2be439e71131398bacac927ef8
parent	2e21f37eaf031300b4f7ec0626333255f16e7bd0 (diff)