X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/df689da172dfd36fe2512833a5c7c07ad5cb6446..f3cb6c9aac4ebeec54e8a82959cf8d56b30b15b5:/templates/onesandwich.html

diff --git a/templates/onesandwich.html b/templates/onesandwich.html
index 1158a43..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 %}
@@ -14,6 +14,17 @@
 			<li>{{ i.name }}
 		{% endfor %}
 	</ul>
-	<h4 class="sandwichsub">Notes</h5>
-	<p class="sandnotes"> {{ s.notes }}</p>
+	{% if s.notes %}
+		<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