-<html>
- <head>
- <title>Every Ma'ayanwich Ever!</title></head>
- <body>
- <h3>{{ s.adjective }}</h3>
- <p>Made on {{ s.date_made }} and added by {{ s.user.username }}.</p>
- <img src="{{ s.picture.url }}">
- <h5>Ingredients</h5>
- <ul>
- {% for i in s.ingredients.all %}
- <li>{{ i.name }}
- {% endfor %}
- </ul>
- <h5>Notes</h5>
- <p> {{ s.notes }}</p>
- </body>
-</html>
\ No newline at end of file
+{% extends "base.html" %}
+
+{% block title %} The {{ s.adjective }} Ma'ayanwich {% endblock %}
+
+{% block content %}
+ <h3 class="sandwichtitle">{{ s.adjective }}</h3>
+ <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>
+ {% 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