# HG changeset patch
# User Branko Majic <branko@majic.rs>
# Date 2013-02-24 11:29:50
# Node ID b0046f7ebbb87fec738d99c5d29fed5e68588732
# Parent  6e11735c3a45132b53ea13f20e68844234193e7d

Added pagination to list pages. Added the measures link.

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 @@
   <li class="item">{% html_link 'brand' brand.name brand.id "btn btn-link btn-fixed" %}</li>
   {% endfor %}
 </ul>
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+<div>No recipes available.</div>
 {% 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 @@
   <li class="item">{% html_link 'ingredient' ingredient.name ingredient.id "btn btn-link btn-fixed" %}</li>
   {% endfor %}
 </ul>
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+<div>No ingredients available.</div>
 {% 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 %}
 
-<ul class="listing">
+<h1>Measures</h1>
+
+{% if measures %}
+<ul class="unstyled">
   {% for measure in measures %}
   <li class="item">{% html_link 'measure' measure measure.id "listing_link" %}</li>
   {% endfor %}
 </ul>
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+<div>No measures available.</div>
+{% 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 @@
   <li class="item">{% html_link 'recipe' recipe.name recipe.id "btn btn-link btn-fixed" %}</li>
   {% endfor %}
 </ul>
+{% include "djangoshaker/pagination.html" %}
+{% else %}
+<div>No recipes available.</div>
 {% 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 @@
               <li class="{% active_link 'index' %}"><a href="{% url index %}"><i class="icon-home icon-white"></i> Main Page</a></li>
               <li class="{% active_link 'recipe_list' %}"><a href="{% url recipe_list %}"><i class="icon-glass icon-white"></i> Recipes</a></li>
               <li class="{% active_link 'brand_list' %}"><a href="{% url brand_list %}"><i class="icon-flag icon-white"></i> Brands</a></li>
-              <li class="{% active_link 'ingredient_list' %}"><a href="{% url ingredient_list %}"><i class="icon-tint icon-white"></i> Ingredients</a></li>
+              <li class="{% active_link 'ingredient_list' %}"><a href="{% url ingredient_list %}"><i class="icon-shopping-cart icon-white"></i> Ingredients</a></li>
+              <li class="{% active_link 'measure_list' %}"><a href="{% url measure_list %}"><i class="icon-tint icon-white"></i> Measures</a></li>
               <li class="{% active_link 'user' %}"><a href="{% url user %}"><i class="icon-user icon-white"></i> My Page</a></li>
             </ul>
               {% 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<pk>\d+)$',