2 files changed, 52 insertions, 34 deletions
diff --git a/jimbrella/templates/admin/admin_logs.html b/jimbrella/templates/admin/admin_logs.html
new file mode 100644
index 0000000..8d31e88
--- /dev/null
+++ b/jimbrella/templates/admin/admin_logs.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>JI Umbrella</title>
+        <link rel="stylesheet" href="/static/jimbrella.css" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+    </head>
+    <body>
+        <h1>JI Umbrella Logs</h1>
+        <div id="container">
+            {% include "admin/tabs.html" %}
+            <div class="data-table-container">
+                <table class="data">
+                    <thead>
+                        <tr>
+                            <td>Date</td>
+                            <td>Admin</td>
+                            <td>Umbrella #</td>
+                            <td>Status</td>
+                            <td>Tenant</td>
+                            <td>ID</td>
+                            <td>Phone</td>
+                            <td>Lent at</td>
+                            <td>Note</td>
+                        </tr>
+                    <tbody>
+                        {% for log in logs %}
+                        <tr>
+                            <td rowspan=2>{{ log.date }}</td>
+                            <td rowspan=2>{{ log.actor }}</td>
+                            <td rowspan=2>{{ log.id }}</td>
+                            <td class="red">{{ log.status_a }}</td>
+                            <td class="red">{{ log.tenant_name_a }}</td>
+                            <td class="red">{{ log.tenant_id_a }}</td>
+                            <td class="red">{{ log.tenant_phone_a }}</td>
+                            <td class="red">{{ log.lent_at_a }}</td>
+                            <td rowspan=2>{{ log.note }}</td>
+                        </tr>
+                        <tr>
+                            <td class="green">{{ log.status_b }}</td>
+                            <td class="green">{{ log.tenant_name_b }}</td>
+                            <td class="green">{{ log.tenant_id_b }}</td>
+                            <td class="green">{{ log.tenant_phone_b }}</td>
+                            <td class="green">{{ log.lent_at_b }}</td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/jimbrella/templates/admin/logs.html b/jimbrella/templates/admin/logs.html
deleted file mode 100644
index f4f57c0..0000000
--- a/jimbrella/templates/admin/logs.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>JI Umbrella</title>
-        <link rel="stylesheet" href="/static/jimbrella.css" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-    </head>
-    <body>
-        <h1>JI Umbrella Logs</h1>
-        <div id="container">
-            {% include "admin/tabs.html" %}
-            <div class="data-table-container">
-                <table class="data">
-                    <thead>
-                        <tr>
-                            <th>Date</th>
-                            <th>Event</th>
-                            <th>Note</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for log in logs|reverse %}
-                        <tr class="{{ log.event|lower }}">
-                            <td>{{ log.date_str }}</td>
-                            <td>{{ log.description }}</td>
-                            <td>{{ log.note }}</td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </body>
-</html>