diff --git a/djangoshaker/templates/djangoshaker/brand_list.html b/djangoshaker/templates/djangoshaker/brand_list.html
--- a/djangoshaker/templates/djangoshaker/brand_list.html
+++ b/djangoshaker/templates/djangoshaker/brand_list.html
@@ -14,6 +14,9 @@
{% html_link 'brand' brand.name brand.id "btn btn-link btn-fixed" %}
{% endfor %}
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+No recipes available.
{% endif %}
{% endblock %}
diff --git a/djangoshaker/templates/djangoshaker/ingredient_list.html b/djangoshaker/templates/djangoshaker/ingredient_list.html
--- a/djangoshaker/templates/djangoshaker/ingredient_list.html
+++ b/djangoshaker/templates/djangoshaker/ingredient_list.html
@@ -14,6 +14,9 @@
{% html_link 'ingredient' ingredient.name ingredient.id "btn btn-link btn-fixed" %}
{% endfor %}
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+No ingredients available.
{% endif %}
{% endblock %}
diff --git a/djangoshaker/templates/djangoshaker/measure_list.html b/djangoshaker/templates/djangoshaker/measure_list.html
--- a/djangoshaker/templates/djangoshaker/measure_list.html
+++ b/djangoshaker/templates/djangoshaker/measure_list.html
@@ -4,15 +4,20 @@
{% block title %}Django Shaker - Measure List {% endblock %}
-{% block header_title %}Measure List{% endblock %}
-
{% block content %}
-
+Measures
+
+{% if measures %}
+
{% for measure in measures %}
- {% html_link 'measure' measure measure.id "listing_link" %}
{% endfor %}
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+No measures available.
+{% endif %}
{% endblock %}
diff --git a/djangoshaker/templates/djangoshaker/recipe_list.html b/djangoshaker/templates/djangoshaker/recipe_list.html
--- a/djangoshaker/templates/djangoshaker/recipe_list.html
+++ b/djangoshaker/templates/djangoshaker/recipe_list.html
@@ -14,6 +14,9 @@
- {% html_link 'recipe' recipe.name recipe.id "btn btn-link btn-fixed" %}
{% endfor %}
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+No recipes available.
{% endif %}
{% endblock %}
diff --git a/djangoshaker/templates/djangoshaker/template.html b/djangoshaker/templates/djangoshaker/template.html
--- a/djangoshaker/templates/djangoshaker/template.html
+++ b/djangoshaker/templates/djangoshaker/template.html
@@ -33,7 +33,8 @@
Main Page
Recipes
Brands
- Ingredients
+ Ingredients
+ Measures
My Page
{% endblock %}
diff --git a/djangoshaker/urls.py b/djangoshaker/urls.py
--- a/djangoshaker/urls.py
+++ b/djangoshaker/urls.py
@@ -10,28 +10,32 @@ urlpatterns = patterns(
url(r'^recipe/$',
ListView.as_view(queryset = Recipe.objects.filter(published = True).order_by("name"),
template_name = 'djangoshaker/recipe_list.html',
- context_object_name = 'recipes'),
+ context_object_name = 'recipes',
+ paginate_by = 15),
name='recipe_list'),
url(r'^brand/$',
ListView.as_view(model = Brand,
queryset = Brand.objects.all().order_by("name"),
template_name = 'djangoshaker/brand_list.html',
- context_object_name = 'brands'),
+ context_object_name = 'brands',
+ paginate_by = 15),
name="brand_list"),
- url(r'^ingredient/$',
+ url(r'^ingredients$',
ListView.as_view(model = Ingredient,
queryset = Ingredient.objects.all().order_by("name"),
template_name = 'djangoshaker/ingredient_list.html',
- context_object_name = 'ingredients'),
+ context_object_name = 'ingredients',
+ paginate_by = 15),
name="ingredient_list"),
url(r'^measure/$',
ListView.as_view(model = Measure,
queryset = Measure.objects.all().order_by("name"),
template_name = 'djangoshaker/measure_list.html',
- context_object_name = 'measures'),
+ context_object_name = 'measures',
+ paginate_by = 15),
name="measure_list"),
url(r'^brand/(?P\d+)$',