X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/1964943395e77b097c3a252c111a149b4d6ed2a3..25e2e5d9d53f08724f2fe9661265d58d850c5d17:/templates/allsandwiches.html
diff --git a/templates/allsandwiches.html b/templates/allsandwiches.html
index 64f734f..17c40df 100644
--- a/templates/allsandwiches.html
+++ b/templates/allsandwiches.html
@@ -1,20 +1,28 @@
-
-
- Every Ma'ayanwich Ever!
-
- All Ma'ayanwiches
- {% for s in sandwiches %}
- {{ s.adjective }}
- Made on {{ s.date_made }} and added by {{ s.user.username }}.
- 
- Ingredients
-
+{% extends "base.html" %}
+
+{% block content %}
+ {% for s in allsandwiches %}
+ {{ s.adjective }}
+ Made on {{ s.date_made|date:"F j Y" }} and added by {% if s.user.first_name %} {{ s.user.first_name }} {% if s.user.last_name %} {{ s.user.last_name }} {% endif %} {% else %} {{ s.user.username }}. {% endif %}
+ {% if s.picture %}
+ 
+ {% endif %}
+ Ingredients
+
{% for i in s.ingredients.all %}
- {{ i.name }}
{% endfor %}
- Notes
- {{ s.notes }}
+ {% if s.notes %}
+ Notes
+ {{ s.notes }}
+ {% endif %}
+ {% load comments %}
+ {% get_comment_count for s as c %}
+ {% ifequal c 1 %}
+ 1 comment
+ {% else %}
+ {{ c }} comments
+ {% endifequal %}
{% endfor %}
-
-
\ No newline at end of file
+{% endblock %}
\ No newline at end of file