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 /ctrack/templates/base.html
parent: 2e21f37eaf031300b4f7ec0626333255f16e7bd0 (diff)
1 files changed, 70 insertions, 60 deletions
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
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 /ctrack/templates/base.html
parent	2e21f37eaf031300b4f7ec0626333255f16e7bd0 (diff)