diff --git a/smash/web/templates/appointment_types/breadcrumb.html b/smash/web/templates/appointment_types/breadcrumb.html
index 969dd7be988cf8dc450c8791f7fd8b166180435f..2ab1c8ec997ca0ccf01b576afb751c3a92981c95 100644
--- a/smash/web/templates/appointment_types/breadcrumb.html
+++ b/smash/web/templates/appointment_types/breadcrumb.html
@@ -1,5 +1,5 @@
<li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
-<li>Configuration</li>
+<li><a href="{% url 'web.views.equipment_and_rooms' %}">Equipment and rooms</a></li>
<li class="active">
<a href="{% url 'web.views.appointment_types' %}">Appointment Types</a>
</li>
\ No newline at end of file
diff --git a/smash/web/templates/appointment_types/index.html b/smash/web/templates/appointment_types/index.html
index 5a233a7101044a5ff89c85bf19d0f185b57dc9ee..0d44cac8932204c9b36e9ea5c0d89108d91807dd 100644
--- a/smash/web/templates/appointment_types/index.html
+++ b/smash/web/templates/appointment_types/index.html
@@ -18,11 +18,21 @@
text-align: center;
background-color: #dd4b39;
}
+ .description{
+ margin: 0;
+ padding: 0;
+ line-height: 1.5;
+ font-variant: small-caps;
+ font-weight: 400;
+ font-size: 12pt;
+ text-align: justify;
+ padding-top: 5px;
+ }
</style>
{% endblock styles %}
{% block ui_active_tab %}
-'general_conf'
+'appointment_types'
{% endblock ui_active_tab %}
{% block page_header %}
@@ -42,16 +52,24 @@
{% block maincontent %}
- <div>
- <a class="btn btn-app" href="{% url 'web.views.appointment_type_add' %}">
- <i class="fa fa-plus"></i> Add new appointment type
- </a>
+ <div class="row">
+ <div class="col-lg-2 col-md-3 col-xs-4">
+ <a class="btn btn-app" href="{% url 'web.views.appointment_type_add' %}">
+ <i class="fa fa-plus"></i> Add new appointment type
+ </a>
+ </div>
+ <div class="col-xs-4">
+ <p class="description">
+ Appointment Types represent the different <u>assesments</u> (i.e. blood test) to be conducted during an appointment.
+ </p>
+ </div>
</div>
<div class="box-body">
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
+ <th>Required Equipment</th>
<th>Code</th>
<th>Description</th>
<th>Default Duration</th>
@@ -63,6 +81,7 @@
<tbody>
{% for appointment_type in appointment_types %}
<tr>
+ <td>{{ appointment_type.required_equipment.all|join:"; " }}</td>
<td>{{ appointment_type.code }}</td>
<td>{{ appointment_type.description }}</td>
<td>{{ appointment_type.default_duration }}</td>
diff --git a/smash/web/templates/configuration/index.html b/smash/web/templates/configuration/index.html
index d5580458239aeb03c3cd24323d5be81f70cfc513..5c6e24c28054eecb2287785875d9a29d260f04e7 100644
--- a/smash/web/templates/configuration/index.html
+++ b/smash/web/templates/configuration/index.html
@@ -9,7 +9,7 @@
{% endblock styles %}
-{% block ui_active_tab %}'general_conf'{% endblock ui_active_tab %}
+{% block ui_active_tab %}'settings'{% endblock ui_active_tab %}
{% block page_header %}Configuration{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
diff --git a/smash/web/templates/doctors/index.html b/smash/web/templates/doctors/index.html
index e1b0fef9d130e9837600cea02f05ca0e849de70d..2e14e5095e8127daabdb0038b548a5f6a14460cf 100644
--- a/smash/web/templates/doctors/index.html
+++ b/smash/web/templates/doctors/index.html
@@ -25,9 +25,9 @@
{% if worker_type == 'STAFF' %}
'workers'
{% elif worker_type == 'HEALTH_PARTNER' %}
-'health_partners'
+'health_partner'
{% elif worker_type == 'VOUCHER_PARTNER' %}
-'voucher_partners'
+'voucher_partner'
{% endif %}
{% endblock ui_active_tab %}
diff --git a/smash/web/templates/equipment_and_rooms/equipment/index.html b/smash/web/templates/equipment_and_rooms/equipment/index.html
index d1869fa9d4264eca843d55d4f78ffce7cb0a1685..2a62cf45a2256837d094bc50572200bac2369882 100644
--- a/smash/web/templates/equipment_and_rooms/equipment/index.html
+++ b/smash/web/templates/equipment_and_rooms/equipment/index.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
+{% block ui_active_tab %}'equipment_items'{% endblock ui_active_tab %}
{% block page_header %}Equipment definitions{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
diff --git a/smash/web/templates/equipment_and_rooms/flying_teams/index.html b/smash/web/templates/equipment_and_rooms/flying_teams/index.html
index df8165b16339e330b96565d457ae17b17b241672..c815e3eadbf0e26e407470b48279bece1c1f06d4 100644
--- a/smash/web/templates/equipment_and_rooms/flying_teams/index.html
+++ b/smash/web/templates/equipment_and_rooms/flying_teams/index.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
+{% block ui_active_tab %}'flying_teams'{% endblock ui_active_tab %}
{% block page_header %}Flying teams{% endblock page_header %}
{% block page_description %}management{% endblock page_description %}
diff --git a/smash/web/templates/equipment_and_rooms/kit_requests/kit_requests.html b/smash/web/templates/equipment_and_rooms/kit_requests/kit_requests.html
index 16b7dbf0f41659911ec26e81d9e95a75728175a4..2e3beade15126929fe26f78953645c7bb949726e 100644
--- a/smash/web/templates/equipment_and_rooms/kit_requests/kit_requests.html
+++ b/smash/web/templates/equipment_and_rooms/kit_requests/kit_requests.html
@@ -1,6 +1,6 @@
{% extends "_base.html" %}
-{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
+{% block ui_active_tab %}'kit_requests'{% endblock ui_active_tab %}
{% block page_header %}
Kits required between {{ start_date | date:"Y-m-d" }} and {% if end_date %} {{ end_date | date:"Y-m-d" }}
{% else %} end of time {% endif %}
diff --git a/smash/web/templates/equipment_and_rooms/rooms/index.html b/smash/web/templates/equipment_and_rooms/rooms/index.html
index c5d34b728335f9d22e64f83474116d62ab101022..7cb6f5f4204a2037c4ea9648a463beb27f169faf 100644
--- a/smash/web/templates/equipment_and_rooms/rooms/index.html
+++ b/smash/web/templates/equipment_and_rooms/rooms/index.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
+{% block ui_active_tab %}'rooms'{% endblock ui_active_tab %}
{% block page_header %}Rooms{% endblock page_header %}
{% block page_description %}management{% endblock page_description %}
diff --git a/smash/web/templates/sidebar.html b/smash/web/templates/sidebar.html
index 524b8dd32c5e3fdcbb7cd167aeeea5fdf8b8892c..a91be3d75937d828cecab8216c779c3b557271a7 100644
--- a/smash/web/templates/sidebar.html
+++ b/smash/web/templates/sidebar.html
@@ -34,16 +34,19 @@
<li data-desc="equipment_and_rooms" class="treeview">
<a href="{% url 'web.views.equipment_and_rooms' %}">
- <i class="fa fa-building-o"></i> <span>Equipment&rooms</span>
+ <i class="fa fa-building-o"></i> <span>Equipment & Rooms</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
- <li><a href="{% url 'web.views.equipment' %}">Equipment items</a></li>
- <li><a href="{% url 'web.views.equipment_and_rooms.flying_teams' %}">Flying teams</a></li>
- <li><a href="{% url 'web.views.kit_requests' %}">Kit requests</a></li>
- <li><a href="{% url 'web.views.equipment_and_rooms.rooms' %}">Rooms</a></li>
+ <li data-desc="equipment_items"><a href="{% url 'web.views.equipment' %}">Equipment items</a></li>
+ {% if "change_appointmenttype" in permissions %}
+ <li data-desc="appointment_types"><a href="{% url 'web.views.appointment_types' %}">Appointment Types</a></li>
+ {% endif %}
+ <li data-desc="flying_teams"><a href="{% url 'web.views.equipment_and_rooms.flying_teams' %}">Flying teams</a></li>
+ <li data-desc="kit_requests"><a href="{% url 'web.views.kit_requests' %}">Kit requests</a></li>
+ <li data-desc="rooms"><a href="{% url 'web.views.equipment_and_rooms.rooms' %}">Rooms</a></li>
</ul>
</li>
@@ -88,31 +91,27 @@
</a>
<ul class="treeview-menu">
{% if "change_configurationitem" in permissions %}
- <li><a href="{% url 'web.views.configuration' %}">General</a></li>
+ <li data-desc="settings"><a href="{% url 'web.views.configuration' %}">General</a></li>
{% endif %}
{% if "change_language" in permissions %}
- <li><a href="{% url 'web.views.languages' %}">Languages</a></li>
- {% endif %}
-
- {% if "change_appointmenttype" in permissions %}
- <li><a href="{% url 'web.views.appointment_types' %}">Appointment Types</a></li>
+ <li data-desc="languages"><a href="{% url 'web.views.languages' %}">Languages</a></li>
{% endif %}
{% if study.has_voucher_types and "change_vouchertype" in permissions %}
- <li><a href="{% url 'web.views.voucher_types' %}">Voucher types</a></li>
+ <li data-desc="voucher_types"><a href="{% url 'web.views.voucher_types' %}">Voucher types</a></li>
{% endif %}
{% if study.has_vouchers and "change_worker" in permissions %}
- <li><a href="{% url 'web.views.workers' 'VOUCHER_PARTNER' %}">Voucher partners</a></li>
+ <li data-desc="voucher_partner"><a href="{% url 'web.views.workers' 'VOUCHER_PARTNER' %}">Voucher partners</a></li>
{% endif %}
{% if "change_worker" in permissions %}
- <li><a href="{% url 'web.views.workers' 'HEALTH_PARTNER' %}">Health partners</a></li>
+ <li data-desc="health_partner"><a href="{% url 'web.views.workers' 'HEALTH_PARTNER' %}">Health partners</a></li>
{% endif %}
{% if "change_study" in permissions %}
- <li><a href="{% url 'web.views.edit_study' study_id %}">Study</a></li>
+ <li data-desc="study_conf"><a href="{% url 'web.views.edit_study' study_id %}">Study</a></li>
{% endif %}
</ul>
</li>