X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/cf85775b60d096583ec64a257e8a6afe47e21cd2..598bab51785e33f0f224d0603b260a9ae35cac47:/templates/onesandwich.html
diff --git a/templates/onesandwich.html b/templates/onesandwich.html
index a8096db..d685ea3 100644
--- a/templates/onesandwich.html
+++ b/templates/onesandwich.html
@@ -1,17 +1,30 @@
-
-
- Every Ma'ayanwich Ever!
-
- {{ s.adjective }}
- Made on {{ s.date_made }} and added by {{ s.user.username }}.
- 
- Ingredients
-
- {% for i in s.ingredients.all %}
- - {{ i.name }}
- {% endfor %}
-
- Notes
- {{ s.notes }}
-
-
\ No newline at end of file
+{% extends "base.html" %}
+
+{% block title %} The {{ s.adjective }} Ma'ayanwich {% endblock %}
+
+{% block content %}
+ {{ 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 %}
+
+ {% if s.notes %}
+ Notes
+
{{ s.notes }}
+ {% endif %}
+ {% load comments %}
+ {% get_comment_count for s as c %}
+ Comments
+ {% get_comment_list for s as clist %}
+ {% for comment in clist %}
+
+ {{ comment.comment }}
+ {{ comment.submit_date }}
+ {% endfor %}
+{% endblock %}
\ No newline at end of file