X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/blobdiff_plain/735e53fa41a4911c1464a25ed0f24ac8769b878f..e191066a70eb4a1452b49c61016f121dc5c17397:/templates/allsandwiches.html

diff --git a/templates/allsandwiches.html b/templates/allsandwiches.html
index 4877263..4f3a901 100644
--- a/templates/allsandwiches.html
+++ b/templates/allsandwiches.html
@@ -1,18 +1,38 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<h1 class="pagetitle">All Ma'ayanwiches</h1>
 		{% for s in allsandwiches %}
 			<h3 class="sandwichtitle">{{ s.adjective }}</h3>
-			<p class="metadata">Made on {{ s.date_made }} and added by {{ s.user.username }}.</p>
-			<img class="sandwichimg" src="{{ s.picture.url }}">
+			<p class="metadata">Made on {{ s.date_made|date:"F j Y" }} and added by  
+				{% ifequal s.user request.user %} you. 
+					<a href="{% url edit_sandwich slug=s.slug %}"> (Edit) 
+				{% else %} 
+					{% if s.user.first_name %} {{ s.user.first_name }} 
+						{% if s.user.last_name %} {{ s.user.last_name }} 
+						{% endif %} 
+					{% else %} 
+						{{ s.user.username }}. 
+					{% endif %}
+				{% endifequal %}</p>
+			{% if s.picture %}
+				<img class="sandwichimg" src="{{ s.picture.url }}">
+			{% endif %}
 			<h4 class="sandwichsub">Ingredients</h4>
 			<ul class="ingredients">
 				{% for i in s.ingredients.all %}
 					<li>{{ i.name }}
 				{% endfor %}
 			</ul>
-			<h4 class="sandwichsub">Notes</h5>
-			<p class="sandnotes"> {{ s.notes }}</p>
+			{% if s.notes %}
+				<h4 class="sandwichsub">Notes</h4>
+				<p class="sandnotes"> {{ s.notes }}</p>
+			{% endif %}
+			{% load comments %}
+			{% get_comment_count for s as c %}
+			{% ifequal c 1 %}
+				<p class="sandnotes"><a href="{{ s.get_absolute_url }}">1 comment</a></p>
+			{% else %}
+				<p class="sandnotes"><a href="{{ s.get_absolute_url }}">{{ c }} comments</a></p>
+			{% endifequal %}
 		{% endfor %}
 {% endblock %}
\ No newline at end of file