bootstrap layout

3d267cee · Nico Vermaas · b3f57ddc · 3d267cee · 3d267cee · 3d267cee
Commit 3d267cee authored 4 years ago by Nico Vermaas
--- a/atdb/atdb/static/taskdatabase/ldvlogo_small.png
+++ b/atdb/atdb/static/taskdatabase/ldvlogo_small.png
--- a/atdb/taskdatabase/static/taskdatabase/ldvlogo_small.png
+++ b/atdb/taskdatabase/static/taskdatabase/ldvlogo_small.png
--- a/atdb/taskdatabase/templates/tables2/base.html
+++ b/atdb/taskdatabase/templates/tables2/base.html
@@ -32,16 +32,20 @@
 <body>
    <nav class="navbar navbar-expand-lg navbar-light bg-light">
        <div class="container-fluid">
+            <ul class="nav navbar-nav">
            <!-- Header -->
-            <div class="navbar-header">
+                <li><a class="navbar-brand" href="{% url 'index' %}">
-                <a class="navbar-brand mb-0 h1">
+                     <img src="{% static 'taskdatabase/ldvlogo_small.png' %}"  height="30" alt="">
+                    ATDB-LDV</a>
-                    <img src="{% static 'taskdatabase/ldvlogo.png' %}"  height="90" alt="">
+                </li>
-                </a>
+                <li><a class="nav-link" href="{% url 'index' %}">Tasks</a></li>
-            </div>
+                <li><a class="nav-link" href="{% url 'tables2' %}">Alternative</a></li>
+                <li><a class="nav-link" href="https://git.astron.nl/astron-sdc/atdb-ldv/-/raw/master/atdb/docs/ATDB-LDV%20Workflow%20Diagram.png">State Diagram</a></li>
+            </ul>
        </div>
        {% include 'taskdatabase/search.html' %}
    </nav>
    <!-- to add blocks of code -->

--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
@@ -31,18 +31,20 @@
 </head>
 <body onload="readFromLocalStorage('search_box')">
    <nav class="navbar navbar-expand-lg navbar-light bg-light">
        <div class="container-fluid">
+            <ul class="nav navbar-nav">
            <!-- Header -->
-            <div class="navbar-header">
+                <li><a class="navbar-brand" href="{% url 'index' %}">
-                <a class="navbar-brand mb-0 h1">
+                     <img src="{% static 'taskdatabase/ldvlogo_small.png' %}"  height="30" alt="">
+                    ATDB-LDV</a>
-                    <img src="{% static 'taskdatabase/ldvlogo.png' %}"  height="90" alt="">
+                </li>
+                <li><a class="nav-link" href="{% url 'index' %}">Tasks</a></li>
-                </a>
+                <li><a class="nav-link" href="{% url 'tables2' %}">Alternative</a></li>
-            </div>
+                <li><a class="nav-link" href="https://git.astron.nl/astron-sdc/atdb-ldv/-/raw/master/atdb/docs/ATDB-LDV%20Workflow%20Diagram.png">State Diagram</a></li>
+            </ul>
        </div>
        {% include 'taskdatabase/search.html' %}

--- a/atdb/taskdatabase/templates/taskdatabase/filter_buttons.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter_buttons.html
+<div class="card">
+ <div class="card-body">
   <table>
+     <tr><td>Click to Filter</td></tr>
      <tr>
- <h5>Click to Filter<h5>
       <td>
        <a href="{% url 'task-set-filter' 'all' %}" class="btn btn-success btn-sm" role="button">ALL</a>
        <a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-primary btn-sm" role="button">defined</a>
@@ -19,3 +22,5 @@
       </td>
     </tr>
   </table>
+ </div>
+</div>
\ No newline at end of file
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -21,7 +21,7 @@
                    <thead>
                    <tr>
                        <th width="5%">ID</th>
-                        <th>Priority</th>
+                        <th width="9%">Priority</th>
                        <th>Hold</th>
                        <th>Status</th>
                        <th>Project</th>