Removed most of w3 and working on fixing the forms.

author: Matthew Lemon <y@yulqen.org> 2024-08-30 15:17:43 +0100
committer: Matthew Lemon <y@yulqen.org> 2024-08-30 15:17:43 +0100
commit: 2cc69382c15aeed665b32aed01c701840ee80c9c (patch)
tree: 78ec618c8e21e0e4fa447fd3cb7732c584ef998a /core/templates
parent: d6d688eed9b9532ff79eb4c4ac8fb09b6e1ae2c8 (diff)
2 files changed, 95 insertions, 95 deletions
diff --git a/core/templates/core/base.html b/core/templates/core/base.html
index 65c1842..682395f 100644
--- a/core/templates/core/base.html
+++ b/core/templates/core/base.html
@@ -27,28 +27,26 @@
 </head>
 <body>
 {% block navbar %}
-<div class="navbar bg-blue-500">
-  <!-- <a href="/" class="w3-bar-item w3-button w3-dark-gray w3-xxlarge"><i class="fa fa-home"></i></a> -->
-  <a href="#" class="text-3xl pe-3">Home</a>
-  <a href="{% url 'engagements:home' %}" class="text-3xl link pe-3">Engagement Plans</a>
-  <a href="{% url 'engagements:regulatedentities' %}" class="text-3xl link pe-3">Regulated Entities</a>
-  <a href="#" class="text-3xl link pe-3">Reporting</a>
-  <a href="#" class="text-3xl link pe-3">Dashboards</a>
-  <div class="dropdown">
-    <button class="w3-button w3-large">Teams</button>
-    <div class="w3-dropdown-content w3-bar-block w3-card-4">
-      <a href="#" class="w3-bar-item w3-button">Submarines and Propulsion</a>
-      <a href="#" class="w3-bar-item w3-button">Transport</a>
+<nav class="bg-blue-600 p-4">
+  <div class="container mx-auto flex items-center justify-between">
+    <div class="flex items-center space-x-4">
+      <a href="#" class="text-white text-xl font-semibold">Home</a>
+      <a href="{% url 'engagements:home' %}" class="text-white hover:text-blue-200">Engagement Plans</a>
+      <a href="{% url 'engagements:regulatedentities' %}" class="text-white hover:text-blue-200">Regulated Entities</a>
+      <a href="#" class="text-white hover:text-blue-200">Reporting</a>
+      <a href="#" class="text-white hover:text-blue-200">Dashboards</a>
+    </div>
+    <div class="flex items-center space-x-4">
+      {% if request.user.is_authenticated %}
+        <span class="text-white">{{ user }}</span>
+        <a href="{% url 'logout' %}" class="text-white hover:text-blue-200">Log Out</a>
+      {% else %}
+        <a href="{% url 'login' %}" class="text-white hover:text-blue-200">Log In</a>
+      {% endif %}
+      <a href="#" class="text-white hover:text-blue-200">Help</a>
     </div>
   </div>
-    {% if request.user.is_authenticated %}
-    <a class="w3-bar-item w3-right w3-button w3-large" href="#">{{ user }}</a>
-    <a class="w3-bar-item w3-right w3-button w3-large" href="{% url 'logout' %}">Log Out</a>
-    {% else %}
-    <a class="w3-bar-item w3-right w3-button w3-large" href="{% url 'login' %}">Log In</a>
-    {% endif %}
-  <a href="#" class="w3-right w3-bar-item w3-button w3-large">Help</a>
-</div>
+</nav>
 {% endblock navbar %}
 
   <div class="container mx-auto">
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index a2c9307..ae25fbd 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -4,101 +4,103 @@
 {% block title %}DefNucSyR Engagement Database (DED) - Information Management for DefNucSyR{% endblock title %}
 
 {% block content %}
+    <div class="container mx-auto px-4 py-8">
+        <h1 class="text-4xl font-bold mb-8">DED - Information Management for DefNucSyR</h1>
 
-    <div class="bg-blue-500 text-white p-3 my-2">
-        This is a Tailwind styled div.
-    </div>
-
-    <div class="container mx-auto">
-        <h1 class="text-4xl">DED - Information Management for DefNucSyR</h1>
-        <div class="w3-panel w3-leftbar w3-sand w3-xlarge w3-serif w3-display-container">
-        <span onclick="this.parentElement.style.display='none'"
-              class="w3-button w3-display-topright">&times;</span>
-            <h3>Quote of the day</h3>
-            <p>This is a placeholder for some interesting test. Use of lose.</p>
+        <div class="bg-yellow-100 border-l-4 border-yellow-500 p-4 mb-8">
+            <div class="flex justify-between items-center">
+                <h3 class="text-xl font-semibold">Quote of the day</h3>
+                <button class="text-gray-600 hover:text-gray-800"
+                        onclick="this.parentElement.parentElement.style.display='none'">&times;
+                </button>
+            </div>
+            <p class="mt-2">This is a placeholder for some interesting test. Use or lose.</p>
         </div>
 
-        <p>{% lorem %}</p>
+        <p class="mb-8">{% lorem %}</p>
 
-        <div class="container">
-            <header class="text-3xl">
-                <h3>Submarines and Propulsion</h3>
-            </header>
-            <div class="w3-container">
-
-                <h3 class="text-2xl">Assessments & Inspections:</h3>
-                <table class="table table-zebra">
-                    <tr>
-                        <th>Start Date</th>
-                        <th>End Date</th>
-                        <th>Event</th>
-                        <th>Site</th>
-                        <th>Inspectors</th>
+        <div class="mb-12">
+    <div class="bg-white shadow-md rounded-lg overflow-hidden">
+        <header class="bg-blue-100 p-4">
+            <h2 class="text-3xl font-bold">Submarines and Propulsion</h2>
+        </header>
+        <div class="p-4">
+            <h3 class="text-2xl font-semibold mb-4">Assessments & Inspections:</h3>
+            <table class="w-full mb-4">
+                <thead>
+                    <tr class="bg-gray-200">
+                        <th class="p-2 text-left">Start Date</th>
+                        <th class="p-2 text-left">End Date</th>
+                        <th class="p-2 text-left">Event</th>
+                        <th class="p-2 text-left">Site</th>
+                        <th class="p-2 text-left">Inspectors</th>
                     </tr>
+                </thead>
+                <tbody>
                     {% for s in subs_regulatory %}
-                        <tr>
-                            <td>{{ s.proposed_start_date|date:'j M y' }}</td>
-                            <td>{{ s.proposed_end_date|date:'j M y' }}</td>
-                            <td><a href="{% url 'engagements:engagement_detail' s.pk %}">{{ s }}</a></td>
-                            <td>{{ s.external_party }}</td>
-                            <td>
-                                {% if s.officers.all %}
-                                    {{ s.officers.all|commalist }}
-                                {% endif %}
-                            </td>
-                        </tr>
+                    <tr class="{% cycle 'bg-white' 'bg-gray-100' %}">
+                        <td class="p-2">{{ s.proposed_start_date|date:'j M y' }}</td>
+                        <td class="p-2">{{ s.proposed_end_date|date:'j M y' }}</td>
+                        <td class="p-2"><a href="{% url 'engagements:engagement_detail' s.pk %}" class="text-blue-600 hover:underline">{{ s }}</a></td>
+                        <td class="p-2">{{ s.external_party }}</td>
+                        <td class="p-2">
+                            {% if s.officers.all %}
+                                {{ s.officers.all|commalist }}
+                            {% endif %}
+                        </td>
+                    </tr>
                     {% endfor %}
-                </table>
-                <div class="w3-cell-row">
-                    <div class="w3-cell w3-left">
-                        <a href="{% url 'engagements:create' 'reg' %}" class="w3-button w3-round w3-blue">Add New</a>
-                    </div>
-                    <div class="w3-cell w3-right">
-                        <small>See <a href="#">Enagements</a> for full list</small>
-                    </div>
-                </div>
-                <hr>
-                <h4>Non-regulatory events:</h4>
-                <table class="table table-zebra">
-                    <tr>
-                        <th>Start Date</th>
-                        <th>End Date</th>
-                        <th>Summary</th>
+                </tbody>
+            </table>
+
+            <div class="flex justify-between items-center mb-8">
+                <a href="{% url 'engagements:create' 'reg' %}" class="bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded">Add New</a>
+                <small>See <a href="#" class="text-blue-600 hover:underline">Engagements</a> for full list</small>
+            </div>
+
+            <div class="border-b border-gray-300 my-8"></div>
+
+            <h4 class="text-xl font-semibold mb-4">Non-regulatory events:</h4>
+            <table class="w-full mb-4">
+                <thead>
+                    <tr class="bg-gray-200">
+                        <th class="p-2 text-left">Start Date</th>
+                        <th class="p-2 text-left">End Date</th>
+                        <th class="p-2 text-left">Summary</th>
                     </tr>
+                </thead>
+                <tbody>
                     {% if not subs %}
-                        <tr>
-                            <td>None</td>
-                            <td>None</td>
-                            <td>None</td>
-                        </tr>
+                    <tr>
+                        <td class="p-2" colspan="3">No events found</td>
+                    </tr>
                     {% else %}
                         {% for s in subs %}
-                            <tr>
-                                <td>{{ s.proposed_start_date|date:'j M y' }}</td>
-                                <td>{{ s.proposed_end_date|date:'j M y' }}</td>
-                                <td><a href="#">{{ s }}</a></td>
-                            </tr>
+                        <tr class="{% cycle 'bg-white' 'bg-gray-100' %}">
+                            <td class="p-2">{{ s.proposed_start_date|date:'j M y' }}</td>
+                            <td class="p-2">{{ s.proposed_end_date|date:'j M y' }}</td>
+                            <td class="p-2"><a href="#" class="text-blue-600 hover:underline">{{ s }}</a></td>
+                        </tr>
                         {% endfor %}
                     {% endif %}
-                </table>
-                <div>
-                    <button class="w3-button w3-round w3-blue">Add New</button>
-                </div>
-
-                <p>{% lorem %}</p>
+                </tbody>
+            </table>
 
+            <div class="mt-4">
+                <button class="bg-blue-500 hover:bg-blue-600 text-white font-bold py-2 px-4 rounded">Add New</button>
             </div>
         </div>
+    </div>
+</div>
+
 
-        <div class="w3-card-2 w3-margin-top">
-            <header class="w3-container w3-light-blue">
-                <h3>Transport</h3>
+        <div class="bg-white shadow-md rounded-lg overflow-hidden">
+            <header class="bg-blue-100 p-4">
+                <h3 class="text-2xl font-bold">Transport</h3>
             </header>
-            <div class="w3-container">
+            <div class="p-4">
                 <p>{% lorem %}</p>
             </div>
         </div>
-
     </div>
-
 {% endblock content %}
author	Matthew Lemon <y@yulqen.org>	2024-08-30 15:17:43 +0100
committer	Matthew Lemon <y@yulqen.org>	2024-08-30 15:17:43 +0100
commit	2cc69382c15aeed665b32aed01c701840ee80c9c (patch)
tree	78ec618c8e21e0e4fa447fd3cb7732c584ef998a /core/templates
parent	d6d688eed9b9532ff79eb4c4ac8fb09b6e1ae2c8 (diff)