diff --git a/equipment/templates/equipment/equipment.html b/equipment/templates/equipment/equipment.html index 63b4233..0bf091b 100644 --- a/equipment/templates/equipment/equipment.html +++ b/equipment/templates/equipment/equipment.html @@ -1,31 +1,24 @@ {% extends "base.html" %} {% load mathfilters %} {% block title %}Equipment Information{% endblock %} + +{% block jumbotron %}Equipment{% endblock %} +{% block jumbotronsub %}{{ equipment.id }}{% endblock %} + {% block content %} -
+
- -
-
-

Equipment: {{ equipment.id }}

-
-
- -
- -

Attributes

-
    +

    Attributes

    +
    • Type: {{ equipment.keg_type.name }}
    • Size: {{ equipment.keg_type.size_gal }} Gallons
    • Status: {{ equipment.kegstate.name }}
      • -
    - +
-
-
+ {% endblock %} \ No newline at end of file diff --git a/equipment/templates/equipment/equipment_list.html b/equipment/templates/equipment/equipment_list.html index d9fbdf8..03af97d 100644 --- a/equipment/templates/equipment/equipment_list.html +++ b/equipment/templates/equipment/equipment_list.html @@ -1,17 +1,12 @@ {% extends "base.html" %} {% load mathfilters %} {% block title %}Kegging Dashboard{% endblock %} + +{% block jumbotron %}Equipment Dashboard{% endblock %} + {% block content %}
- -
-
-

Equipment Dashboard

- -
-
-
diff --git a/equipment/views.py b/equipment/views.py index 30eb792..566908c 100644 --- a/equipment/views.py +++ b/equipment/views.py @@ -14,8 +14,8 @@ def home(request): class EquipmentListView(ListView): model = Equipment -def equipment(request, keg_id): - equipment = get_object_or_404(Equipment, pk=keg_id) +def equipment(request, equipment_id): + equipment = get_object_or_404(Equipment, pk=equipment_id) return render(request, 'equipment/equipment.html', {'equipment': equipment}) def equipment_labels(request): diff --git a/templates/base.html b/templates/base.html index 26cd9f9..31e7b98 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,19 +4,29 @@ {% block title %}{% endblock %} - + + + + - - + + + + + + {% block script %}{% endblock %}