aboutsummaryrefslogtreecommitdiffstats
path: root/servo/templates
diff options
context:
space:
mode:
Diffstat (limited to 'servo/templates')
-rw-r--r--servo/templates/checkin/newindex.html2
-rwxr-xr-xservo/templates/default.html4
2 files changed, 6 insertions, 0 deletions
diff --git a/servo/templates/checkin/newindex.html b/servo/templates/checkin/newindex.html
index 96c8042..f1fc035 100644
--- a/servo/templates/checkin/newindex.html
+++ b/servo/templates/checkin/newindex.html
@@ -99,6 +99,7 @@
{% bootstrap_field device_form.condition %}
</div>
<div class="col-md-6">
+ {% if questions %}
{% bootstrap_field device_form.pop %}
<table class="table">
<thead>
@@ -121,6 +122,7 @@
{% endfor %}
</tbody>
</table>
+ {% endif %}
{% bootstrap_field customer_form.checkin_location %}
{% bootstrap_field customer_form.checkout_location %}
{% if request.user.is_authenticated %}
diff --git a/servo/templates/default.html b/servo/templates/default.html
index de363f4..15de430 100755
--- a/servo/templates/default.html
+++ b/servo/templates/default.html
@@ -72,7 +72,11 @@
<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 %}