# HG changeset patch # User Branko Majic # Date 2013-02-24 17:25:53 # Node ID 421d2a0bc61bc133e94acb8e36ffecacd8bf8ded # Parent 57edd5668912951985fc79aa418aea9f3eb8592a Always show the headings on user page. Show pagination _only_ if there's at least one page available. diff --git a/djangoshaker/templates/djangoshaker/pagination.html b/djangoshaker/templates/djangoshaker/pagination.html --- a/djangoshaker/templates/djangoshaker/pagination.html +++ b/djangoshaker/templates/djangoshaker/pagination.html @@ -1,3 +1,4 @@ +{% if page_obj.number %} +{% endif %} \ No newline at end of file diff --git a/djangoshaker/templates/djangoshaker/user.html b/djangoshaker/templates/djangoshaker/user.html --- a/djangoshaker/templates/djangoshaker/user.html +++ b/djangoshaker/templates/djangoshaker/user.html @@ -5,9 +5,10 @@ {% block content %}
-
+
+

Your Drinks

+
This is a list of drinks you can make with the ingredients you have.
{% if available_recipes %} -

Your Drinks

    {% for recipe in available_recipes %}
  • {% html_link 'recipe' recipe.name recipe.id "btn btn-link" %}
  • @@ -18,7 +19,8 @@
-

Your Ingredients

+

Your Ingredients

+
This is a list of ingredients you have.
{% if user_ingredients %} {% include "djangoshaker/ingredient_selection.html" with ingredients=user_ingredients %} {% endif %}