X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/851d4e0ba5381535c55fe4347103aaa53c785606..598bab51785e33f0f224d0603b260a9ae35cac47:/templates/onesandwich.html

diff --git a/templates/onesandwich.html b/templates/onesandwich.html
index bc3c013..d685ea3 100644
--- a/templates/onesandwich.html
+++ b/templates/onesandwich.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 	<h3 class="sandwichtitle">{{ s.adjective }}</h3>
-	<p class="metadata">Made on {{ s.date_made }} and added by {{ s.user.username }}.</p>
+	<p class="metadata">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 %}</p>
 	{% if s.picture %}
 		<img class="sandwichimg" src="{{ s.picture.url }}">
 	{% endif %}
@@ -18,4 +18,13 @@
 		<h4 class="sandwichsub">Notes</h5>
 		<p class="sandnotes"> {{ s.notes }}</p>
 	{% endif %}
+	{% load comments %}
+	{% get_comment_count for s as c %}
+	<h4 class="sandwichsub">Comments</h5>
+	{% get_comment_list for s as clist %}
+	{% for comment in clist %}
+		<p class="comment_user">{{ comment.user_name }} said:</p>
+		<p class="sandnotes">{{ comment.comment }}</p>
+		<p class="metadata">{{ comment.submit_date }}</p>
+	{% endfor %}
 {% endblock %}
\ No newline at end of file