added comment form plus number of comments.

[~kgodey/maayanwich.git] / templates / onesandwich.html

diff --git a/templates/onesandwich.html b/templates/onesandwich.html
index b9bf28b..60ea42b 100644 (file)
--- a/templates/onesandwich.html
+++ b/templates/onesandwich.html
@@ -4,14 +4,38 @@
 
 {% block content %}
        <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</h4>
+               <p class="sandnotes"> {{ s.notes }}</p>
+       {% endif %}
+       {% load comments %}
+       {% get_comment_count for s as c %}
+       {% ifequal c 1 %}
+                       <h4 class="sandwichsub">1 Comment</h4>
+       {% else %}
+               {% ifequal c 0 %}
+                       <p class="sandnotes"><b>No comments</b></p>
+               {% else %}
+                       <h4 class="sandwichsub">{{c}} Comments</h4>
+               {% endifequal %}
+       {% endifequal %}
+
+       {% 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 %}
+       <h4 class="addcomment">Add a Comment</h4>
+       {% render_comment_form for s %}
 {% endblock %}
\ No newline at end of file