X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Ftemplates%2Fquotes%2Fdisplay.html;h=2db4c572c2a38dccf5c48d079a182d24d6873472;hb=bb8b5bd36c5f921ba31635bb858db3d4788ef0e9;hp=89010857aba943beb62d6a2f3ff65b904e437a99;hpb=1403f44199bde09f56e466285e00462e88e344fd;p=djsite.git

diff --git a/quotes/templates/quotes/display.html b/quotes/templates/quotes/display.html
index 8901085..2db4c57 100644
--- a/quotes/templates/quotes/display.html
+++ b/quotes/templates/quotes/display.html
@@ -1,43 +1,42 @@
 <div class="quote">
-  <p class="text">
-    {{ quote.text }}
-  </p>
+  <div class="text">
+    {{ quote.text|safe }}
+  </div>
 
-  <div class="details">
-    <p id="details_{{ quote.id}}_button">
-      <a href="" class="show_details"
-	  onclick="showDetails('details_{{ quote.id }}'); return false;">
-	Show details</a></p>
-    <div class="hidden_details" id="details_{{ quote.id }}">
-      <p><a href="" class="hide_details"
-	    onclick="hideDetails('details_{{ quote.id }}'); return false;">
-	  Hide details</a></p>
+  <div class="details" id="details_{{ quote.id }}">
+    <p><a href="#" class="showhide_button"></a></p>
+    <div class="hidden_details">
       <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>
-
+      {% if quote.notes %}
+        <div class="quote_notes">
+	  {{ quote.notes|safe }}
+        </div>
+      {% endif %}
+      {% 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 %}
+      {% if quote.tags.all.count %}
       <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>