Merge pull request #60 from BetterWorks/markupFixes

fix some markup and be more explicit about date time format

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");
-});
+});

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">

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 %}

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 %}
+{% endblock %}

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 %}
+{% endblock %}

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 %}
+{% endblock %}

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 %}
+{% endblock %}

templates/integrations/add_victorops.html

@@ -90,10 +90,6 @@
         </div>
     </form>
 </div>
-
-
-
-</div>
 </div>
 
 

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 %}
+{% endblock %}

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 %}
+{% endif %}

templates/integrations/pushover_title.html

@@ -2,4 +2,4 @@
     {{ check.name_then_code }} is DOWN
 {% else %}
     {{ check.name_then_code }} is now UP
-{% endif %}
+{% endif %}

templates/integrations/slack_message.json

@@ -42,4 +42,3 @@
         ]
     }]
 }
-

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 %}
+{% endif %}