From 7f52d8c98ec6a8848f6626b0a513511a710cd2fc Mon Sep 17 00:00:00 2001
From: Di Wu <dw323@cornell.edu>
Date: Mon, 23 May 2016 16:57:35 -0700
Subject: [PATCH 1/2] fix some markup and be more explicit about date time
 format

---
 static/js/log.js                       | 2 +-
 templates/front/my_checks.html         | 5 ++---
 templates/front/my_checks_desktop.html | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/static/js/log.js b/static/js/log.js
index af8e63d1..d070812a 100644
--- a/static/js/log.js
+++ b/static/js/log.js
@@ -19,4 +19,4 @@ $(function () {
     // The table is initially hidden to avoid flickering as we convert dates.
     // Once it's ready, set it to visible:
     $("#log").css("visibility", "visible");
-});
\ No newline at end of file
+});
diff --git a/templates/front/my_checks.html b/templates/front/my_checks.html
index bc15b4a2..b8ab2263 100644
--- a/templates/front/my_checks.html
+++ b/templates/front/my_checks.html
@@ -43,13 +43,12 @@
     </div>
 </div>
 <div class="row">
-    <div class="col-sm-12"></div>
+    <div class="col-sm-12">
         <form method="post" action="{% url 'hc-add-check' %}" class="text-center">
             {% csrf_token %}
             <input type="submit" class="btn btn-primary btn-lg" value="Add Check">
         </form>
     </div>
-
 </div>
 
 <div id="update-name-modal" class="modal">
@@ -177,7 +176,7 @@
             {% csrf_token %}
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</span></button>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
                     <h4 class="remove-check-title">Remove Check <span class="remove-check-name"></span></h4>
                 </div>
                 <div class="modal-body">
diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html
index 1c5047c2..827c7a18 100644
--- a/templates/front/my_checks_desktop.html
+++ b/templates/front/my_checks_desktop.html
@@ -77,7 +77,7 @@
         {% if check.last_ping %}
             <span
                 data-toggle="tooltip"
-                title="{{ check.last_ping }} GMT">
+                title="{{ check.last_ping|date:'N j, Y, P e' }}">
                 {{ check.last_ping|naturaltime }}
             </span>
         {% else %}

From 5f276b99e355bd7f40de77ca3ca15ba9a95c61b9 Mon Sep 17 00:00:00 2001
From: Di Wu <dw323@cornell.edu>
Date: Mon, 23 May 2016 17:03:06 -0700
Subject: [PATCH 2/2] div fixes

---
 templates/integrations/add_email.html             | 6 +-----
 templates/integrations/add_hipchat.html           | 6 +-----
 templates/integrations/add_pd.html                | 6 +-----
 templates/integrations/add_slack.html             | 6 +-----
 templates/integrations/add_victorops.html         | 4 ----
 templates/integrations/add_webhook.html           | 6 +-----
 templates/integrations/pd_description.html        | 2 +-
 templates/integrations/pushover_title.html        | 2 +-
 templates/integrations/slack_message.json         | 1 -
 templates/integrations/victorops_description.html | 2 +-
 10 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/templates/integrations/add_email.html b/templates/integrations/add_email.html
index 62bb8f37..51102931 100644
--- a/templates/integrations/add_email.html
+++ b/templates/integrations/add_email.html
@@ -40,10 +40,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 
@@ -54,4 +50,4 @@
 <script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 {% endcompress %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/integrations/add_hipchat.html b/templates/integrations/add_hipchat.html
index f45834bf..43014a31 100644
--- a/templates/integrations/add_hipchat.html
+++ b/templates/integrations/add_hipchat.html
@@ -77,10 +77,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 
@@ -91,4 +87,4 @@
 <script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 {% endcompress %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/integrations/add_pd.html b/templates/integrations/add_pd.html
index 9acd4719..e49bfc92 100644
--- a/templates/integrations/add_pd.html
+++ b/templates/integrations/add_pd.html
@@ -77,10 +77,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 
@@ -91,4 +87,4 @@
 <script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 {% endcompress %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/integrations/add_slack.html b/templates/integrations/add_slack.html
index 5af1c0de..eb44eb26 100644
--- a/templates/integrations/add_slack.html
+++ b/templates/integrations/add_slack.html
@@ -67,10 +67,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 
@@ -81,4 +77,4 @@
 <script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 {% endcompress %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/integrations/add_victorops.html b/templates/integrations/add_victorops.html
index 47a45e6b..20521976 100644
--- a/templates/integrations/add_victorops.html
+++ b/templates/integrations/add_victorops.html
@@ -90,10 +90,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 
diff --git a/templates/integrations/add_webhook.html b/templates/integrations/add_webhook.html
index 9521a76d..06d16d3d 100644
--- a/templates/integrations/add_webhook.html
+++ b/templates/integrations/add_webhook.html
@@ -88,10 +88,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 
@@ -102,4 +98,4 @@
 <script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 {% endcompress %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/integrations/pd_description.html b/templates/integrations/pd_description.html
index 7326efa7..71d8da5d 100644
--- a/templates/integrations/pd_description.html
+++ b/templates/integrations/pd_description.html
@@ -2,4 +2,4 @@
     {{ check.name_then_code }} is DOWN
 {% else %}
     {{ check.name_then_code }} received a ping and is now UP
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/templates/integrations/pushover_title.html b/templates/integrations/pushover_title.html
index 42a26764..3fcdc774 100644
--- a/templates/integrations/pushover_title.html
+++ b/templates/integrations/pushover_title.html
@@ -2,4 +2,4 @@
     {{ check.name_then_code }} is DOWN
 {% else %}
     {{ check.name_then_code }} is now UP
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/templates/integrations/slack_message.json b/templates/integrations/slack_message.json
index 3e67aa6e..8a9e7bfe 100644
--- a/templates/integrations/slack_message.json
+++ b/templates/integrations/slack_message.json
@@ -42,4 +42,3 @@
         ]
     }]
 }
-
diff --git a/templates/integrations/victorops_description.html b/templates/integrations/victorops_description.html
index 1e54dd9a..71aadad5 100644
--- a/templates/integrations/victorops_description.html
+++ b/templates/integrations/victorops_description.html
@@ -4,4 +4,4 @@
     Last ping was {{ check.last_ping|naturaltime }}.
 {% else %}
     {{ check.name_then_code }} received a ping and is now UP
-{% endif %}
\ No newline at end of file
+{% endif %}