5 files changed, 12 insertions, 14 deletions
diff --git a/servo/templates/accounts/login.html b/servo/templates/accounts/login.html
index e77c753..80daf06 100755
--- a/servo/templates/accounts/login.html
+++ b/servo/templates/accounts/login.html
@@ -13,7 +13,7 @@
     <span class="add-on"><i class="icon-lock"></i></span>
     {{ form.password }}
   </div>
-  <br/>
+  <br/><hr/>
   <div class="pull-right">
   {% if show_checkin %}
     <a class="btn btn" href="{% url 'checkin-index' %}">{% trans "Check-in" %}</a>
diff --git a/servo/templates/checkin/newindex.html b/servo/templates/checkin/newindex.html
index f1fc035..55a52fa 100644
--- a/servo/templates/checkin/newindex.html
+++ b/servo/templates/checkin/newindex.html
@@ -6,7 +6,7 @@
 {% block main %}
 
 <div class="page-header">
-  <h2>{% trans "Device" %}</h2>
+  <h2>{% trans "Device Info" %}</h2>
 </div>
 
 {% comment %}
@@ -66,15 +66,15 @@
       {% include "checkin/device_form.html" %}
     </div>
     <div class="page-header">
-      <h2>{% trans "Customer" %}</h2>
+      <h2>{% trans "Customer Info" %}</h2>
     </div>
     <div id="customer">
       {% include "checkin/customer_form.html" %}
     </div>
     <div class="page-header">
-      <h2>{% trans "Problem description" %}</h2>
+      <h2>{% trans "Problem Description" %}</h2>
     </div>
-  {% if request.user.is_authenticated %}
+  {% if request.user.is_authenticated and tags %}
     <div class="row">
       <div class="col-md-12">
         <div class="form-group">
diff --git a/servo/templates/default.html b/servo/templates/default.html
index 15de430..d770655 100755
--- a/servo/templates/default.html
+++ b/servo/templates/default.html
@@ -64,19 +64,13 @@
                 </a>
               {% with request.user as user %}
                 <ul class="dropdown-menu">
-                  <li><a href="#"><i class="icon-user"></i> {{ request.user.get_name }}</a></li>
+                  <li><a href="{% url 'accounts-list_orders' %}"><i class="icon-user"></i> {{ user.get_name }}</a></li>
                   <li class="divider"></li>
-                  <li><a href="{% url 'accounts-list_orders' %}"><i class="icon-home"></i> {% trans "Homepage" %}</a></li>
-                  <li><a href="{% url 'accounts-settings' %}"><i class="icon-wrench"></i> {% trans "Profile" %}</a></li>
-                {% if request.user.is_staff %}
+                {% if user.is_staff %}
                   <li><a href="{% url 'admin-settings' %}"><i class="icon-cog"></i> {% trans "System Settings" %}</a></li>
                 {% endif %}
                 <li class="divider"></li>
-              {% if show_checkin %}
                 <li><a href="{% url 'checkin-index' %}"><i class="icon-check"></i> {% trans "Go to check-in" %}</a></li>
-              {% else %}
-                <li class="disabled"><a href="#"><i class="icon-check"></i> {% trans "Go to check-in" %}</a></li>
-              {% endif %}
                 <li><a href="{% url 'accounts-logout' %}" data-modal="#modal"><i class="icon-off"></i> {% trans "Log out" %}...</a></li>
                 </ul>
               {% endwith %}
diff --git a/servo/templates/orders/close.html b/servo/templates/orders/close.html
index b80f862..a53db5e 100755
--- a/servo/templates/orders/close.html
+++ b/servo/templates/orders/close.html
@@ -12,6 +12,7 @@
 {% block footer %}
 <form action="{{ action }}" method="post" accept-charset="utf-8">
     {% csrf_token %}
+    <button class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
     <button class="btn btn-primary" type="submit">{% trans "Close" %}</button>
 </form>
 {% endblock footer %}
diff --git a/servo/templates/orders/toolbar.html b/servo/templates/orders/toolbar.html
index 286d93e..56fe851 100755
--- a/servo/templates/orders/toolbar.html
+++ b/servo/templates/orders/toolbar.html
@@ -26,6 +26,9 @@
   {% if order.invoice_set.count %}
     <li><a href="{% url 'orders-print_order' order.pk 'receipt' %}" class="window">{% trans "Receipt" %}</a></li>
     <li><a href="{% url 'orders-print_order' order.pk 'dispatch' %}" class="window">{% trans "Dispatch" context "noun" %}</a></li>
+  {% else %}
+    <li class="disabled"><a href="#" title="{% trans 'Cannot print a receipt without an invoice' %}">{% trans "Receipt" %}</a></li>
+    <li class="disabled"><a href="#" title="{% trans 'Cannot print a dispatch without an invoice' %}">{% trans "Dispatch" context "noun" %}</a></li>
   {% endif %}
   </ul>
 </div>
@@ -61,7 +64,7 @@
 {% if order.can_dispatch %}
   <a class="btn" href="{% url 'orders-dispatch' order.pk %}">{% trans "Dispatch" %}</a>
 {% else %}
-  <a class="btn disabled" href="#">{% trans "Dispatch" %}</a>
+  <a class="btn disabled" href="#" title="{%trans 'No parts or services for dispatch' %}">{% trans "Dispatch" %}</a>
 {% endif %}
 {% if perms.servo.change_order and order.can_close %}
   <a class="btn" href="{% url 'orders-close' order.pk %}" data-modal="#modal"><i class="icon-lock"></i> {% trans "Close" %}</a>