From ebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
 ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
 arbitrary url prefix, english language improvements, added feedback form,
 versioned css and js files to force browser cache reload when
 settings.RESOURCE_REVISION is incremented , other fixes

---
 templates/revisions_answer.html | 41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

(limited to 'templates/revisions_answer.html')

diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
index 23606dc9..974e589c 100644
--- a/templates/revisions_answer.html
+++ b/templates/revisions_answer.html
@@ -6,8 +6,8 @@
 {% load humanize %}
 {% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
-        <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.editor.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.post.js" %}'></script>
         <script type="text/javascript">
         //todo - take this out into .js file 
         $().ready(function(){
@@ -24,7 +24,9 @@
             var arrow = $("#rev-arrow-" + id);
             var visible = arrow.attr("src").indexOf("hide") > -1;
 
-            arrow.attr("src", "/content/images/expander-arrow-" + (visible ? "show" : "hide") + ".gif");
+            var path = $.i18n._('/') + "content/images/expander-arrow-" + 
+                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
+            arrow.attr("src", path);
             $("#rev-body-" + id).slideToggle("fast");
         }
         
@@ -43,11 +45,14 @@
           <div class="header-controls">
             <table width="100%">
                 <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" src="/content/images/expander-arrow-show.gif"></td>
+                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
+                                                                    src="{% href "/content/images/expander-arrow-show.gif" %}"
+                                                                    alt="{% trans "click to hide/show revision" %}"/>
+                    </td>
                     <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
                     <td width="200px" style="vertical-align:middle">
                         {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}<span></div>
+                        <div class="summary"><span>{{ revision.summary }}</span></div>
                         {% endif %}
                         {% if request.user|can_edit_post:post %}
                         <a href="{% url edit_answer post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
@@ -56,31 +61,7 @@
                     </td>
                     <td align="right">
                         <div class="revision-mark" >
-                            <table width="100%" style="text-align:left" >
-                                <tr >
-                                    <td colspan="2" style="padding:3px 0 3px 0"> 
-                                        {% ifequal revision.revision 1 %}
-                                        {% trans "asked" %} <strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
-                                        {% else %}
-                                        {% trans "updated" %} <strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
-                                        {% endifequal %}
-                                    </td>
-                                    
-                                </tr>
-                                <tr>
-                                    <td width="35px" style="vertical-align:bottom; ">
-                                        {% gravatar revision.author 32 %}
-                                    </td>
-                                    <td style="width:120px; vertical-align:top">
-                                        <div style="height:18px">
-                                            <a href="{% url users %}{{ revision.author.id }}/{{ revision.author.username }}">{{ revision.author.username }}</a></div>
-                                        <div>
-                                        {% get_score_badge revision.author %}
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </table>
+                            {% post_contributor_info revision %}
                         </div>
                     </td>
                 </tr>
-- 
cgit v1.2.3-1-g7c22