From 36f0e7c82a4babc539291b56f2852dd47488e3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Sat, 1 Aug 2015 20:52:58 +0300
Subject: [PATCH] Transport column (http, https, email) in log

---
 static/js/checks.js                    |  8 ++++----
 static/js/log.js                       |  3 +++
 templates/front/log.html               | 27 +++++++++++++++++++-------
 templates/front/my_checks_desktop.html |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 static/js/log.js

diff --git a/static/js/checks.js b/static/js/checks.js
index 9d5b9036..d212e9dc 100644
--- a/static/js/checks.js
+++ b/static/js/checks.js
@@ -8,10 +8,10 @@ $(function () {
         var w = total;
 
         var result = "";
-        if (w) result += w + (w == 1 ? " week " : " weeks ");
-        if (d) result += d + (d == 1 ? " day " : " days ");
-        if (h) result += h + (h == 1 ? " hour " : " hours ");
-        if (m) result += m + (m == 1 ? " minute " : " minutes ");
+        if (w) result += w + (w === 1 ? " week " : " weeks ");
+        if (d) result += d + (d === 1 ? " day " : " days ");
+        if (h) result += h + (h === 1 ? " hour " : " hours ");
+        if (m) result += m + (m === 1 ? " minute " : " minutes ");
 
         return result;
     }
diff --git a/static/js/log.js b/static/js/log.js
new file mode 100644
index 00000000..a7e89678
--- /dev/null
+++ b/static/js/log.js
@@ -0,0 +1,3 @@
+$(function () {
+    $('[data-toggle="tooltip"]').tooltip();
+});
\ No newline at end of file
diff --git a/templates/front/log.html b/templates/front/log.html
index 84ba0b33..b620b679 100644
--- a/templates/front/log.html
+++ b/templates/front/log.html
@@ -7,29 +7,35 @@
 {% block content %}
 <div class="row">
     <div class="col-sm-12">
-    <h1>Log for {{ check.name|default:check.code }}</h1>
+    <h1>Log for “{{ check.name|default:check.code }}”</h1>
     {% if pings %}
     <div class="table-responsive">
     <table class="table table-striped log-table">
         <tr>
+            <th>Transport</th>
             <th>Time</th>
             <th>Remote IP</th>
-            <th>Method</th>
             <th>User Agent</th>
         </tr>
         {% for ping in pings %}
         <tr>
+            <td>
+                {% if ping.scheme == "email" %}
+                    Email
+                {% elif ping.scheme == "http" %}
+                    HTTP
+                {% elif ping.scheme == "https" %}
+                    HTTPS
+                {% endif %}
+            </td>
             <td>
                 <span
                     data-toggle="tooltip"
-                    title="{{ ping.created }}">
-                    {{ ping.created }}
+                    title="{{ ping.created }} GMT">
+                        {{ ping.created|naturaltime }}
                 </span>
             </td>
             <td class="remote-addr">{{ ping.remote_addr }}</td>
-            <td class="method">
-                <span class="label label-default">{{ ping.method }}</span>
-            </td>
             <td class="ua">{{ ping.ua }}</td>
         </tr>
         {% endfor %}
@@ -42,3 +48,10 @@
 </div>
 {% endblock %}
 
+{% block scripts %}
+{% compress js %}
+<script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
+<script src="{% static 'js/bootstrap.min.js' %}"></script>
+<script src="{% static 'js/log.js' %}"></script>
+{% endcompress %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html
index b970143e..a34c75bd 100644
--- a/templates/front/my_checks_desktop.html
+++ b/templates/front/my_checks_desktop.html
@@ -53,7 +53,7 @@
         {% if check.last_ping %}
             <span
                 data-toggle="tooltip"
-                title="{{ check.last_ping }}">
+                title="{{ check.last_ping }} GMT">
                 {{ check.last_ping|naturaltime }}
             </span>
         {% else %}