X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Ftemplates%2Fquotes%2Fdisplay.html;h=a9ff5cfbf3e5c6bdf78fc57f110654a6c8d24a17;hb=060697325678491b635afba501ffae7abe09c468;hp=1369e2ce96f2ac30abb2d9388aa564f587fe66cc;hpb=af3f857eea25b939f927832741f377e4de401f9c;p=djsite.git

diff --git a/quotes/templates/quotes/display.html b/quotes/templates/quotes/display.html
index 1369e2c..a9ff5cf 100644
--- a/quotes/templates/quotes/display.html
+++ b/quotes/templates/quotes/display.html
@@ -1,26 +1,50 @@
 <div class="quote">
-  <p class="text">
-    {{ quote.text }}
-  </p>
-
-  <p class="author">
-    — <span class="name"><a href="{% url 'quotes:author' quote.author.id %}">
-	{{ quote.author.name }}
-    </a></span>
-  </p>
+  <div class="text">
+    {{ quote.text|safe }}
+  </div>
 
-  {% 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 %}
-    </p>
-  {% endif %}
+  <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>
+      <p class="author">
+	— <span class="name">
+	  <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.work.author %}
+      {% endif %}
+      {% if quote.tags.all %}
+      <p class="tags">
+	Tags:
+	{% for tag in quote.tags.all %}
+	  <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>