diff -r 9b3438382e53 -r fb5b1e6ad179 src/cm/templates/site/text_history.html
--- a/src/cm/templates/site/text_history.html	Wed Feb 03 15:42:56 2010 +0100
+++ b/src/cm/templates/site/text_history.html	Fri Feb 05 12:23:29 2010 +0100
@@ -12,101 +12,139 @@
 -->
 </script>
 
+<div id="text_history" class="tab-meta">   
+
 <script type="text/javascript">
 <!--
 $(function() {
-    $(".arrow").bind("mouseenter", function(e){
-        $(this).attr('src','{{ MEDIA_URL }}img/arrow_w_red.png');
-    });
-    
-    $(".arrow").bind("mouseout", function(e){
-        $(this).attr('src','{{ MEDIA_URL }}img/arrow_w_blue.png');
-    });
-    
-    $(".ver_span").bind("mouseenter", function(e){
-        $(this).removeClass('version_item').addClass('version_item-selected');
-    });
-        
-    $(".ver_span").bind("mouseout", function(e){
-        $(this).removeClass('version_item-selected').addClass('version_item');
-    });    
-});
+    $(".hidden-text-actions").css('visibility','hidden');   
+}) ;
+$(function() {
+	$("input[name=oldkey]").click(function () {
+		hide_show($(this), 'newkey', true, true, -1);
+		hide_show($(this), 'newkey', false, false, 0);
+	});   
+	$("input[name=newkey]").click(function () {
+		hide_show($(this), 'oldkey', false, true, 0);
+		hide_show($(this), 'oldkey', true, false, +1);
+	});   
+
+	$("input[name=newkey]")[0].click();
+	$("input[name=oldkey]")[1].click();
+}) ;
+
+
+function hide_show(elem, name, hide, up, plus) {	
+	var nb = elem.attr('id').split('-')[1];
+	nb = parseInt(nb) + plus;
+	
+	if (hide)
+		var vis = 'hidden';
+	else
+		var vis = 'visible';
+		
+	if (up)
+		var fu = 'gt';
+	else
+		var fu = 'lt';
+	$("input[name=" + name + "]:" + fu + "(" + nb + ")").css('visibility',vis);
+};
 -->
 </script>
 
-<div id="text_history" class="tab-meta">    
-<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 %}
-    <a href="{% url text-history-version text.key v1.version_number %}" title="{% blocktrans with v1.version_number as v1number %}version #{{ v1number }}{% endblocktrans %}{% if v1.name %} {% blocktrans  with v1.name as v1name %}by {{ v1name }}{% endblocktrans %}{% endif %}{% if v1.note %} / {{ v1.note }}{% endif %} ({% blocktrans with v1.created|local_date as v1created %}created {{ v1created }}{% endblocktrans %})">
-    <span id={{ v1_id }}
-          style="background: {{ color }};" 
-          class="ver_span {% choice_string v1_id v1.id version_item-selected or v1.id v2_id version_item-selected version_item %}">{{ forloop.counter }}</span></a>
+<ul class="sub_list">
+    <li class="active_sub">{% blocktrans %}Version list{% endblocktrans %}</li>
+    {% if last_last_version %}    
+    <li> / </li>
+    <li><a href="{% url text-history-compare text.key last_last_version.key last_version.key %}">{% blocktrans %}Compare last two versions{% endblocktrans %}</a></li>
+    {% endif %}
+</ul>
 
-    {% if v2 %}
-    <span class="{% choice_string v2_nid v2.version_number diff_item-selected diff_item %}">
-        <!-- <a href="{% url text-history-compare text.key v1.version_number v2.version_number %}" title="diff between {{ forloop.counter }} and following ">&rarr;</a>-->
-        <a href="{% url text-history-compare text.key v1.version_number v2.version_number %}" title="{% blocktrans with v1.version_number as v1number and v2.version_number as v2number %}differences between version #{{ v1number }} and #{{ v2number }}{% endblocktrans %}"><span style="vertical-align:middle;" >
-            <img class="arrow"
-                id="arrow_{{ v1.version_number }}"
-                src="{{ MEDIA_URL }}img/arrow_w_blue.png"/></span></a>
-    </span>    
-    {% endif %}
-{% endfor %}
-</span>
+<form id="compare_form" action="." method="post">
+
+<input name="compare" id="compare_button" type="submit" value="{% blocktrans %}Compare selected versions{% endblocktrans %}"/>
 
-{% if can_edit_text %}
 <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 %}
+{% include "site/macros/paginator.html" %}
+
+<div style="clear:both;"></div>
 
-{% 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>{{ 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 %}
+<table summary="text list" class="large_table">
+    <thead>
+        <tr>
+            <th>{% blocktrans %}Version{% endblocktrans %}</th>
+            <th colspan="2" width="1%">{% blocktrans %}Selection{% endblocktrans %}</th>
+            <th>{% blocktrans %}Title{% endblocktrans %}</th>
+            <th>{% blocktrans %}Author{% endblocktrans %}</th>
+            <th>{% blocktrans %}Created{% endblocktrans %}</th>
+            <th>{% blocktrans %}# comments{% endblocktrans %}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for text_version in object_list %}
+        
+        {% get_local_text_perm request text can_edit_text as can_edit_text %}
+        {% get_local_text_perm request text can_delete_text as can_delete_text %}
+        {% get_local_text_perm request text can_manage_text as can_manage_text %}
+        
+        <tr class="text-{{ text_version.key }} {% cycle 'odd' 'even' %}">
+            {% if can_manage_workspace %}<td><input type="checkbox" class="text_check" name="check-{{ text_version.key }}"/></td>{% endif %}
+            <td>#{{ forloop.counter0|add:page_obj.start_index|invneg:paginator.count|add:"1" }}</td>
+            <td><input id="oldkey-{{ forloop.counter0 }}" type="radio" name="oldkey" value="{{ text_version.key }}"/></td>
+            <td><input id="newkey-{{ forloop.counter0 }}" type="radio" name="newkey" value="{{ text_version.key }}"/></td>                        
+            <td>
+                <a class="main_object_title" href="{% url text-history-version text.key text_version.key %}">{{ text_version.title }}</a>
+                
+                
+                <div class="hidden-text-actions text-actions-{{ text_version.key }}">
+                    <a href="{% url text-history-version text.key text_version.key %}">{% blocktrans %}View{% endblocktrans %}</a> 
+                    {% if text_version.get_previous_version %}| <a href="{% url text-history-compare text.key text_version.key text_version.get_previous_version.key %}">{% blocktrans %}Compare with previous version{% endblocktrans %}</a>{% endif %}
+                    {% if can_edit_text %} | <a href="{% url text-revert text.key text_version.key %}">{% blocktrans %}Revert to this version{% endblocktrans %}</a>{% endif %}
+                    {% comment %}{% if can_delete_text %}<a id="text-delete-{{ text_version.key }}" href="#">{% blocktrans %}Delete{% endblocktrans %}</a>
+                    <script type="text/javascript">                
+                    <!--
+                    $(function() {
+                        $("#text-delete-{{ text_version.key }}").click(function(){
+                            url = '{% url text-version-delete text.key text_version.key %}';
+                            question = "{% blocktrans %}Are you sure you want to delete this version?{% endblocktrans %}";
+                            if (confirm(question)) {
+                                $.post(url, function(data){
+                                      window.location = '{% url index %}';
+                                    });                        
+                            }
+                        });
+                        
+                    }) ;
+                    --> 
+                    </script>                    
+                    {% endif %}
+                    {% endcomment %}
+                </div>
+                <script type="text/javascript">                
+                <!--
+                $(function() {
+                    $(".text-{{ text_version.key }}").mouseover(function(){
+                        $(".text-actions-{{ text_version.key }}").css('visibility','visible');
+                        $(".text-{{ text_version.key }}").addClass('hover');   
+                    });
+                    $(".text-{{ text_version.key }}").mouseout(function(){
+                        $(".text-actions-{{ text_version.key }}").css('visibility','hidden');   
+                        $(".text-{{ text_version.key }}").removeClass('hover');   
+                    });
+                }) ;
+                --> 
+                </script>
+            </td>
+            <td>{{ text_version.get_name }}</td>
+            <td>{{ text_version.created|local_date }}</td>
+            <td>{{ text_version|nb_comments:request }}</td>
 
-{% if v2_nid %}
-<br />
-<table class="diff" width="100%">
-    <tr>
-        <td class="diff-head" width="45%">
-        	{{ version1.title }}
-            <br/>
-            <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%">
-        	{{ version2.title }}
-            <br/>
-            <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>
+        </tr>
+        {% endfor %}
+    </tbody>
 </table>
-{% endif %}
-
 
-{% if is_diff %}
-{{ content }}
-{% else %}
-<center>{% blocktrans %}No differences{% endblocktrans %}</center>
-{% endif %}
+</form>
 
-{% if embed_code %}
-<div id="autoexpand_text_view_frame_container">
-{{ embed_code }}
-{% endif %}
-</div>
-
-{% endautoescape %}
 </div>
 {% endblock %}