8 files changed, 24 insertions, 22 deletions
diff --git a/servo/templates/accounts/login.html b/servo/templates/accounts/login.html
index 80ba716..ea71bcc 100755
--- a/servo/templates/accounts/login.html
+++ b/servo/templates/accounts/login.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block content %}
-<img src="{{ STATIC_URL }}images/logo_servoapp.png" class="servo-logo" alt=""/>
+<img src="{{ STATIC_URL }}images/logo_servoapp.png" class="servo-logo" alt="Servo Logo"/>
 <form action="{% url "accounts-login" %}" method="post" accept-charset="utf-8">
   {% csrf_token %}
   <div class="input-prepend">
diff --git a/servo/templates/accounts/logout.html b/servo/templates/accounts/logout.html
index 1b64d45..3bb9f34 100755
--- a/servo/templates/accounts/logout.html
+++ b/servo/templates/accounts/logout.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block header %}
-{% trans "Logging out?" %}
+{% trans "Confirmation" %}
 {% endblock header %}
 
 {% block body %}
diff --git a/servo/templates/checkin/error.html b/servo/templates/checkin/error.html
index d21e91f..ee0ecc9 100644
--- a/servo/templates/checkin/error.html
+++ b/servo/templates/checkin/error.html
@@ -6,10 +6,11 @@
 {% block main %}
 <div class="container-narrow">
   <div class="jumbotron">
-    <img src="{{ STATIC_URL }}/images/sadmac.png"/>
-    <p class="lead">{% trans "It appears that an error has occurred." %}</p>
+    <img src="{{ STATIC_URL }}/images/sadmac.png" alt="{% trans "An error occurred" %}" title="{% trans "An error occurred" %}"/>
+    <p class="lead">{% trans "An error occurred." %}</p>
     <p>{{ message }}</p>
-    <a class="btn btn-large btn-success" href="{% url 'checkin-index' %}"><i class="icon-refresh icon-white"></i> {% trans "Try again" %}</a>
+    <a class="btn btn-large btn-success" href="{{ url }}"><i class="glyphicon glyphicon-repeat"></i> {% trans "Try again" %}</a>
+    <a class="btn btn-large btn-default" href="{% url 'accounts-login' %}"><i class="icon-refresh icon-white"></i> {% trans "Return to login page" %}</a>
   </div>
 </div>
 {% endblock main %}
diff --git a/servo/templates/checkin/index.html b/servo/templates/checkin/index.html
index c197d31..545825d 100644
--- a/servo/templates/checkin/index.html
+++ b/servo/templates/checkin/index.html
@@ -50,8 +50,7 @@
             </li>
           {% endif %}
           </ul>
-          </div><!--/.nav-collapse -->
-        </div>
+        </div><!--/.nav-collapse -->
       </div>
     </div>
     <div class="main container">
diff --git a/servo/templates/default.html b/servo/templates/default.html
index 139d083..363f3c8 100755
--- a/servo/templates/default.html
+++ b/servo/templates/default.html
@@ -1,21 +1,21 @@
 {% load servo_tags %}
 {% load humanize %}
-{% load cache %}
+{% load static %}
 {% load i18n %}
 <!DOCTYPE html>
 <html>
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="icon" type="image/png" href="{{ STATIC_URL }}images/favicon.png">
-  <link rel="apple-touch-icon" type="image/png" href="{{ STATIC_URL }}images/apple-touch-icon.png">
-  <link href="{{ STATIC_URL }}js/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}js/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}css/bootstrap-datetimepicker.min.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}css/bootstrap-sortable.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}css/glyphicons.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}css/halflings.css" rel="stylesheet">
-  <link href="{{ STATIC_URL }}css/servo.css" rel="stylesheet">
+  <link rel="icon" type="image/png" href="{% static "images/favicon.png" %}">
+  <link rel="apple-touch-icon" type="image/png" href="{% static "images/apple-touch-icon.png" %}">
+  <link href="{% static "js/bootstrap/css/bootstrap.min.css" %}" rel="stylesheet">
+  <link href="{% static "js/bootstrap/css/bootstrap-responsive.min.css" %}" rel="stylesheet">
+  <link href="{% static "css/bootstrap-datetimepicker.min.css" %}" rel="stylesheet">
+  <link href="{% static "css/bootstrap-sortable.css" %}" rel="stylesheet">
+  <link href="{% static "css/glyphicons.css" %}" rel="stylesheet">
+  <link href="{% static "css/halflings.css" %}" rel="stylesheet">
+  <link href="{% static "css/servo.css" %}" rel="stylesheet">
   <title>{{ title }} | Servo</title>
 </head>
 <body>
diff --git a/servo/templates/default_print.html b/servo/templates/default_print.html
index ed3f4de..6abee01 100755
--- a/servo/templates/default_print.html
+++ b/servo/templates/default_print.html
@@ -1,17 +1,19 @@
+{% load static %}
 <!DOCTYPE html>
 <html>
 <head>
   <title>{{ title }}</title>
   <meta charset="utf-8">
-  <link rel="icon" type="image/png" href="{{ STATIC_URL }}images/favicon.png">
-  <link href="{{ STATIC_URL }}js/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="icon" type="image/png" href="{% static "images/favicon.png" %}">
+  <link rel="stylesheet" href="{% static "js/bootstrap/css/bootstrap.min.css" %}">
 </head>
 <body>
   <div class="container">
     {% block content %}
     {% endblock content %}
   </div>
-  <script src="{{ STATIC_URL }}js/jquery.min.js"></script>
+  <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
   {% if request.user.autoprint %}
   <script type="text/javascript">
     $(function() {
diff --git a/servo/templates/orders/edit.html b/servo/templates/orders/edit.html
index c340585..92fc3f2 100755
--- a/servo/templates/orders/edit.html
+++ b/servo/templates/orders/edit.html
@@ -1,6 +1,6 @@
 {% extends "default.html" %}
-{% load staticfiles %}
 {% load servo_tags %}
+{% load static %}
 {% load i18n %}
 
 {% block toolbar %}
diff --git a/servo/templates/orders/notes.html b/servo/templates/orders/notes.html
index 0e59e81..e7975e6 100755
--- a/servo/templates/orders/notes.html
+++ b/servo/templates/orders/notes.html
@@ -51,7 +51,7 @@
     </ul>
   </div>
   <div class="media-body">
-    <h5 class="media-heading">{{ node.get_sender_name }} {{ node.created_at|relative_date }}
+    <h5 class="media-heading">{{ node.get_sender_name }} <span class="muted">{{ node.created_at|relative_date }}</span>
     {% if node.escalation.is_submitted %}
       <small class="muted"><i class="icon-globe"></i> {{ node.escalation.escalation_id }}</small>
     {% endif %}