# HG changeset patch
# User raph
# Date 1260781521 -3600
# Node ID 381538cb3a8bb6bc7d5ead595609c77c478d2677
# Parent  84837aa8d2cafbe34782550dc2da2fdc49a33612
refactor history template

diff -r 84837aa8d2ca -r 381538cb3a8b src/cm/templates/site/text_history.html
--- a/src/cm/templates/site/text_history.html	Fri Dec 11 13:42:16 2009 +0100
+++ b/src/cm/templates/site/text_history.html	Mon Dec 14 10:05:21 2009 +0100
@@ -35,7 +35,11 @@
 </script>
 
 <div id="text_history" class="tab-meta">    
-<h2>{% blocktrans %}Versions:{% endblocktrans %}</h2>
+<div class="label">{% blocktrans %}Versions:{% endblocktrans %}
+{% for author,color in author_colors %}
+    <span style="background: {{ color }};">{{ author }}</span>
+{% endfor %} 
+</div>
 
 <span id="text_history_timeline">
 {% for v1, v2, color in paired_versions %}
@@ -56,22 +60,18 @@
 {% endfor %}
 </span>
 
-<h2>{% blocktrans %}Authors:{% endblocktrans %}</h2>
-{% for author,color in author_colors %}
-    <span style="background: {{ color }};">{{ author }}</span>
-{% empty %}
-<a href="{% url text-authors text.key %}">{% blocktrans %}authors{% endblocktrans %}</a>
-{% endfor %}
-
 {% if can_edit_text %}
-<h2>{% blocktrans %}Actions:{% endblocktrans %}</h2>
-<form action="{% url text-revert text.key v1_nid %}" method="POST" >{% blocktrans %}Revert to version #{{ v1_nid }}:{% endblocktrans %}<input name="revert" type="submit" value="Revert"/></form>
+<br />
+<br />
+<form action="{% url text-revert text.key v1_nid %}" method="POST" ><input name="revert" type="submit" value="{% blocktrans %}Revert to version #{{ v1_nid }}{% endblocktrans %}"/></form>
 {% endif %}
 
 {% if v2_nid %}
     <h2>{% blocktrans with v1_nid as v1_nid and v1_nid as v1_nid %}Differences between version #{{ v1_nid }} and version #{{ v2_nid }}:{% endblocktrans %}</h2>
 {% else %}
-    <h2>{% blocktrans with version1.created|local_date:tz as date and v1_nid as version_number and version1.title as title %}Version #{{ version_number  }} entitled "{{ title }}" and created on {{ date }}:{% endblocktrans %}</h2>   
+	<h2>{{ version1.title }}</h2>
+    <span class="metadata">{% blocktrans with version1.created|local_date:tz as date and v1_nid as version_number %}Version #{{ version_number }} created on {{ date }}{% endblocktrans %}</span>
+    <br /><br />   
 {% endif %}
 {% autoescape off %}
 
@@ -80,24 +80,31 @@
 <table class="diff" width="100%">
     <tr>
         <td class="diff-head" width="45%">
-            {% blocktrans with v1_nid as version_number and version1.title as title %}{{ title }} / version #{{ version_number }}{% endblocktrans %}
+        	{{ version1.title }}
             <br/>
-            {% blocktrans with version1.created|local_date:tz as date %}created {{ date }}{% endblocktrans %}
+            <span class="metadata">{% blocktrans with version1.created|local_date:tz as date and v1_nid as version_number %}Version #{{ version_number }} created on {{ date }}{% endblocktrans %}</span>
         </td>
         <td width="10%"></td>
         <td class="diff-head" width="45%">
-            {% blocktrans with v2_nid as version_number and version2.title as title %}{{ title }} / version #{{ version_number }}{% endblocktrans %}
+        	{{ version2.title }}
             <br/>
-            {% blocktrans with version2.created|local_date:tz as date %}created {{ date }}{% endblocktrans %}
-            
+            <span class="metadata">{% blocktrans with version2.created|local_date:tz as date and v2_nid as version_number %}Version #{{ version_number }} created on {{ date }}{% endblocktrans %}</span>            
         </td>
     </tr>
 </table>
 {% endif %}
 
+
+{% if is_diff %}
 {{ content }}
+{% else %}
+<center>{% blocktrans %}No differences{% endblocktrans %}</center>
+{% endif %}
+
+{% if embed_code %}
 <div id="autoexpand_text_view_frame_container">
 {{ embed_code }}
+{% endif %}
 </div>
 
 {% endautoescape %}
diff -r 84837aa8d2ca -r 381538cb3a8b src/cm/views/texts.py
--- a/src/cm/views/texts.py	Fri Dec 11 13:42:16 2009 +0100
+++ b/src/cm/views/texts.py	Mon Dec 14 10:05:21 2009 +0100
@@ -484,8 +484,9 @@
                      'v2_id' : v2_id,
                      'version1': v1,
                      'version2': v2,
-                     'content' : content,
+                     'content' : content.strip(),
                      'embed_code':embed_code,
+                     'is_diff' : content !='<table class="diff"><tbody></tbody></table>',
                      'author_colors' : author_colors,
                      }
     return render_to_response('site/text_history.html', template_dict, context_instance=RequestContext(request))