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

diff --git a/templates/allsandwiches.html b/templates/allsandwiches.html
index 4877263..d55cdb9 100644
--- a/templates/allsandwiches.html
+++ b/templates/allsandwiches.html
@@ -1,18 +1,21 @@
 {% 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 {% 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 %}
 			<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</h5>
+				<p class="sandnotes"> {{ s.notes }}</p>
+			{% endif %}
 		{% endfor %}
 {% endblock %}
\ No newline at end of file