Implement and use get_absolute_url

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

diff --git a/quotes/templates/quotes/display.html b/quotes/templates/quotes/display.html
index 89010857aba943beb62d6a2f3ff65b904e437a99..d15cc05934294cf41908aa587bf1f5bcf6164d7f 100644 (file)
--- a/quotes/templates/quotes/display.html
+++ b/quotes/templates/quotes/display.html
@@ -1,6 +1,6 @@
 <div class="quote">
   <p class="text">
-    {{ quote.text }}
+    {{ quote.text|safe }}
   </p>
 
   <div class="details">
@@ -14,30 +14,35 @@
          Hide details</a></p>
       <p class="author">
        — <span class="name">
-         <a href="{% url 'quotes:author' quote.author.id %}">
-           {{ quote.author.name }}
-         </a>
+         <a href="{{ quote.work.author.get_absolute_url }}"
+            class="author_name">{{ quote.work.author.name }}</a>,
+         <a href="{% quote.work.get_absolute_url }}"
+            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="{{ tag.get_absolute_url }}" class="tag_link"
+           >{{ tag.tag }}</a
+           >{% if not forloop.last %}, {% endif %}
+        {% endfor %}
       </p>
       {% endif %}
 
     </div> <!-- /hidden_details -->
   </div>   <!-- /details -->
   <p class="permalink">
-    <a href="{% url 'quotes:onequote' quote.id %}">Permalink</a>
+    <a href="{{ quote.get_absolute_url }}">Permalink</a>
   </p>
 </div>