From 4e99b215f017cf06578f86963279f491edbd5279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 29 Mar 2017 20:47:29 +0200
Subject: [PATCH] log panel style

---
 passerelle/base/models.py                          |  5 ++++
 passerelle/static/css/style.css                    | 28 ++++++++++++++++++++++
 .../passerelle/includes/resource-logs-table.html   | 12 ++++------
 .../templates/passerelle/manage/service_view.html  | 10 ++++----
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/passerelle/base/models.py b/passerelle/base/models.py
index 0e91e4a..c0c9508 100644
--- a/passerelle/base/models.py
+++ b/passerelle/base/models.py
@@ -8,6 +8,7 @@ from django.core.exceptions import ValidationError, ObjectDoesNotExist, Permissi
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.db.models import Q
+from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _
 from django.core.files.base import ContentFile
 
@@ -322,6 +323,10 @@ class ResourceLog(models.Model):
             ('view_resourcelog', 'Can view resource logs'),
         )
 
+    @property
+    def level(self):
+        return slugify(logging.getLevelName(self.levelno))
+
     def __unicode__(self):
         return '%s %s %s %s' % (self.timestamp, self.levelno, self.appname, self.slug)
 
diff --git a/passerelle/static/css/style.css b/passerelle/static/css/style.css
index e8963cb..6b05fa5 100644
--- a/passerelle/static/css/style.css
+++ b/passerelle/static/css/style.css
@@ -1,5 +1,6 @@
 div#queries,
 div#security,
+div#logs,
 div#endpoints {
 	margin-bottom: 2em;
 	border: 1px solid #bcbcbc;
@@ -7,6 +8,7 @@ div#endpoints {
 
 div#queries h3,
 div#security h3,
+div#logs h3,
 div#endpoints h3 {
 	background: #FCFCFC;
 	border-bottom: 1px solid #bcbcbc;
@@ -17,12 +19,14 @@ div#endpoints h3 {
 
 div#queries > div,
 div#security > div,
+div#logs > div,
 div#endpoints > div {
 	padding: 1rem;
 }
 
 div#queries ul,
 div#security ul,
+div#logs ul,
 div#endpoints ul {
 	padding-left: 2em;
 	line-height: 140%;
@@ -37,6 +41,30 @@ div#endpoints h4 {
 	border-bottom: 1px solid #bcbcbc;
 }
 
+div#logs table th,
+div#logs table td.timestamp {
+	white-space: nowrap;
+}
+
+div#logs table td.message {
+	text-align: left;
+}
+
+div#logs table tr.level-debug {
+	color: #666;
+}
+
+div#logs table tr.level-warning,
+div#logs table tr.level-error,
+div#logs table tr.level-critical {
+	color: #c33;
+}
+
+div#logs table tr.level-error,
+div#logs table tr.level-critical {
+	font-weight: bold;
+}
+
 select#id_msg_class { max-width: 30em; }
 
 li.webservices a { background-image: url(icons/icon-webservices.png); }
diff --git a/passerelle/templates/passerelle/includes/resource-logs-table.html b/passerelle/templates/passerelle/includes/resource-logs-table.html
index 5cd9d78..9d42df6 100644
--- a/passerelle/templates/passerelle/includes/resource-logs-table.html
+++ b/passerelle/templates/passerelle/includes/resource-logs-table.html
@@ -5,20 +5,16 @@
 {% if logrecords %}
 <table class="main">
     <thead>
-        <th>{% trans 'Id' %}</th>
         <th>{% trans 'Timestamp' %}</th>
-        <th>{% trans 'Level' %}</th>
         <th>{% trans 'Ip Source' %}</th>
         <th>{% trans 'Message' %}</th>
     </thead>
     <tbody>
     {% for record in logrecords %}
-    <tr>
-        <td>{{ record.id }}</td>
-        <td>{{ record.timestamp|localtime }}</td>
-        <td>{{ record.levelno }}</td>
-        <td>{{ record.ipsource }}</td>
-        <td>{{ record.message}}</td>
+    <tr class="level-{{record.level}}">
+        <td class="timestamp">{{ record.timestamp|localtime }}</td>
+        <td>{{ record.ipsource|default:"-" }}</td>
+        <td class="message">{{ record.message}}</td>
     </tr>
     {% endfor %}
     </tbody>
diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html
index 9d2abb7..356ce54 100644
--- a/passerelle/templates/passerelle/manage/service_view.html
+++ b/passerelle/templates/passerelle/manage/service_view.html
@@ -50,10 +50,12 @@
 
 {% if perms.base.view_resourcelog %}
 <div id="logs">
-    <h3>{% trans "Logs" %}</h3>
-    {% block logs %}
-        {% resource_logs_table resource=object %}
-    {% endblock %}
+  <h3>{% trans "Logs" %}</h3>
+  <div>
+  {% block logs %}
+    {% resource_logs_table resource=object %}
+  {% endblock %}
+  </div>
 </div>
 {% endif %}
 
-- 
2.11.0