Corrections

smash/web/templates/equipment_and_rooms/equipment/add.html

@@ -2,11 +2,6 @@
 {% load static %}
 {% load filters %}
 
-{% block styles %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
 {% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
 {% block page_header %}New equipment definition{% endblock page_header %}
 {% block page_description %}{% endblock page_description %}

smash/web/templates/equipment_and_rooms/equipment/edit.html

@@ -2,11 +2,6 @@
 {% load static %}
 {% load filters %}
 
-{% block styles %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
 {% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
 {% block page_header %}Edit equipment definition{% endblock page_header %}
 {% block page_description %}{% endblock page_description %}

smash/web/templates/equipment_and_rooms/rooms/add.html

@@ -2,11 +2,6 @@
 {% load static %}
 {% load filters %}
 
-{% block styles %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
 {% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
 {% block page_header %}New room{% endblock page_header %}
 {% block page_description %}{% endblock page_description %}

smash/web/templates/equipment_and_rooms/rooms/edit.html

@@ -2,11 +2,6 @@
 {% load static %}
 {% load filters %}
 
-{% block styles %}
-    {{ block.super }}
-    <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
-{% endblock styles %}
-
 {% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %}
 {% block page_header %}Edit room{% endblock page_header %}
 {% block page_description %}{% endblock page_description %}

smash/web/urls.py

@@ -121,7 +121,7 @@ urlpatterns = [
     #    EQUIPMENT     #
     ####################
 
-    url(r'^equipment_and_rooms$', views.equipment.equipment_and_rooms, name='web.views.equipment_and_rooms'),
+    url(r'^equipment_and_rooms$', views.equipment_and_rooms.equipment_and_rooms, name='web.views.equipment_and_rooms'),
     url(r'^equipment_and_rooms/equipment/add$', views.equipment.equipment_add, name='web.views.equipment_add'),
     url(r'^equipment_and_rooms/equipment/edit/(?P<equipment_id>\d+)$', views.equipment.equipment_edit, name='web.views.equipment_edit'),
     url(r'^equipment_and_rooms/equipment/delete/(?P<equipment_id>\d+)$', views.equipment.equipment_delete, name='web.views.equipment_delete'),

smash/web/views/__init__.py

@@ -70,6 +70,7 @@ import visit
 import doctor
 import subject
 import equipment
+import equipment_and_rooms
 import flying_teams
 import kit
 import mails

smash/web/views/equipment.py

@@ -16,7 +16,6 @@ def equipment(request):
 
 
 def equipment_add(request):
-    0 // 0
     if request.method == 'POST':
         form = ItemForm(request.POST)
         if form.is_valid():
@@ -46,16 +45,3 @@ def equipment_delete(request, equipment_id):
     the_item.delete()
 
     return redirect('web.views.equipment')
-
-
-def equipment_add(request):
-    equipment_list = Item.objects.order_by('-name')
-    context = {
-        'equipment_list': equipment_list
-    }
-
-    return wrap_response(request, "equipment_and_rooms/equipment/index.html", context)
-
-
-def equipment_and_rooms(request):
-    return wrap_response(request, "equipment_and_rooms/index.html", {})

smash/web/views/equipment_and_rooms.py

+from . import wrap_response
+
+
+def equipment_and_rooms(request):
+    return wrap_response(request, "equipment_and_rooms/index.html", {})