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/unanswered.html | 66 +++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 25 deletions(-)

(limited to 'templates/unanswered.html')

diff --git a/templates/unanswered.html b/templates/unanswered.html
index a56d3ae3..80a23631 100644
--- a/templates/unanswered.html
+++ b/templates/unanswered.html
@@ -4,6 +4,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load extra_filters %}
+{% load smart_if %}
 {% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
@@ -17,65 +18,82 @@
 <div class="tabBar">
     <span class="headQuestions">{% trans "Unanswered questions" %}</span>
     <div class="tabsA">
-        <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
+        <a id="latest" href="{% url unanswered %}?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> 
     </div>
 </div>
-
 <div id="listA">
     {% for question in questions.object_list %}
     <div class="qstA">
-        <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2>
+        <h2>
+            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+        </h2>
         <div class="stat">
             <table>
-	            <tr>
+                <tr>
                     <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
                     <td><span class="num">{{ question.score|intcomma }}</span> </td>
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-	            </tr>  
+                </tr>  
                 <tr>
                     <td><span class="unit">{% trans "answers" %}</span></td>
                     <td><span class="unit">{% trans "votes" %}</span></td>
                     <td><span class="unit">{% trans "views" %}</span></td>
-	            </tr> 
+                </tr> 
             </table>
         </div>
+        
         <div class="summary">
             {{ question.summary }}...                
         </div>
-    
+        
         {% ifequal tab_id 'active'%}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
-             {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
+            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
             <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
             <span class="score">{% get_score_badge question.last_activity_by %} </span>
             <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
         </div>
         {% endif %}
         {% else %}
-        {% if question.wiki %}
+        {% if question.wiki and settings.WIKI_ON %}
         <span class="from wiki">{% trans "community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
-             {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
+            {% if question.last_activity_at != question.added_at %}
+                {% if question.author.id != question.last_activity_by.id %}
+                    {% trans "Posted:" %}
+                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                    <span class="score">{% get_score_badge question.author %} </span>
+                    / {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% else %}
+                    {% trans "Updated:" %}
+                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
+                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
+                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
+                {% endif %}
+            {% else %}
+                {% trans "Posted:" %}
+                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
+                <span class="score">{% get_score_badge question.author %} </span>
+                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
+            {% endif %}
         </div>
         {% endif %}
         {% endifequal %}
         
         <div class="tags">
-			{% for tag in question.tagname_list %}
-			<a href="{% url forum.views.tag tag|urlencode %}" 
-				title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" 
-				rel="tag">{{ tag }}
-			</a>
-			{% endfor %}
+        {% for tag in question.tagname_list %}
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
+        {% endfor %}
         </div>
     </div>
     {% endfor %}
@@ -93,10 +111,8 @@
 
 {% block sidebar %}
 <div class="boxC">
-    <p>
-		{% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
-        <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
-    </p>
+    {% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %}
+    <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>-->
 </div>
 <div class="boxC">
 	<h3 class="subtitle">{% trans "Related tags" %}</h3>
@@ -104,7 +120,7 @@
     <div class="tags">
         {% for tag in tags %}
             <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number"> &#x2715; {{ tag.used_count|intcomma }}</span>
+            <span class="tag-number"> &#215; {{ tag.used_count|intcomma }}</span>
             <br/>
         {% endfor %}
         <br/>
-- 
cgit v1.2.3-1-g7c22