X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Ftemplates%2Fquotes%2Fdisplay.html;h=fcf5906dc5ec720ac4909ce7310143ac90422f93;hb=13c2e4fc8a5506cfa074c06335a73d28a173aba9;hp=2e09b3540a957c03c4613b1ba4fcc72a72eef490;hpb=6a49a8c1fc4489784da44482f0aad9ab491ef0a0;p=djsite.git

diff --git a/quotes/templates/quotes/display.html b/quotes/templates/quotes/display.html
index 2e09b35..fcf5906 100644
--- a/quotes/templates/quotes/display.html
+++ b/quotes/templates/quotes/display.html
@@ -14,20 +14,33 @@
 	  Hide details</a></p>
       <p class="author">
 	— <span class="name">
-	  <a href="{% url 'quotes:author' quote.author.id %}">
-	    {{ quote.author.name }}
-	  </a>
+	  <a href="{% url 'quotes:author' quote.work.author.id %}"
+	     class="author_name">{{ quote.work.author.name }}</a>,
+	  <a href="{% url 'quotes:work' quote.work.id %}"
+	     class="work_name">{{ quote.work.name }}</a>
 	</span>
       </p>
 
+      <div class="quote_notes">
+	<p>{{ quote.notes|safe }}</p>
+      </div>
+
+      {% if not skip_work_notes %}
+        {% include "quotes/work_notes.html" with work=quote.work %}
+      {% endif %}
+      {% if not skip_author_notes %}
+        {% include "quotes/author_notes.html" with author=quote.work.author %}
+      {% endif %}
+      
+
       {% if quote.tags.all %}
       <p class="tags">
 	Tags:
 	{% for tag in quote.tags.all %}
-	<a href="{% url 'quotes:tags' tag.id %}" class="tag_link">
-	  {{ tag.tag }}
-	</a>
-	{% endfor %}
+	  <a href="{% url 'quotes:tags' tag.id %}" class="tag_link"
+	    >{{ tag.tag }}</a
+	    >{% if not forloop.last %}, {% endif %}
+        {% endfor %}
       </p>
       {% endif %}