Add a 'work' concept

[djsite.git] / quotes / templates / quotes / display.html

diff --git a/quotes/templates/quotes/display.html b/quotes/templates/quotes/display.html
index 89010857aba943beb62d6a2f3ff65b904e437a99..fcf5906dc5ec720ac4909ce7310143ac90422f93 100644 (file)
--- a/quotes/templates/quotes/display.html
+++ b/quotes/templates/quotes/display.html
@@ -14,24 +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.author %}
+        {% 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 %}