X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..46b868a3f5ffa8f693808cb832306286802124f4:/forum/skins/default/templates/questions.html?ds=sidebyside

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index 4c3b96d..f470ba3 100644
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -1,235 +1,49 @@
 {% extends "base.html" %}
 <!-- questions.html -->
-{% load extra_tags %}
+{% load question_list_tags %}
 {% load i18n %}
-{% load humanize %}
-{% load extra_filters %}
-{% load smart_if %}
-{% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-           var tags = {{ tags_autocomplete|safe }};
-           $().ready(function(){
-               var tab_id = "{{ tab_id }}";
-               $("#"+tab_id).attr('className',"on");
-               var on_tab = {% if is_unanswered %}'#nav_unanswered'{% else %}'#nav_questions'{% endif %};
-               $(on_tab).attr('className','on');
-               Hilite.exact = false;
-               Hilite.elementid = "listA";
-               Hilite.debug_referrer = location.href;
-           });
-       </script>
-       <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-       <script type='text/javascript' src='{% media  "/media/js/com.cnprog.tag_selector.js" %}'></script>
+{% load extra_tags %}
+{% load general_sidebar_tags %}
+
+{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
+
+{% block metadescription %}{% spaceless %}
+    {% if tag %}
+        {% blocktrans with settings.APP_TITLE as app_title %}Questions and answers about {{ tag }} on {{ app_title }}{% endblocktrans %}
+    {% endif %}
+{% endspaceless %}{% endblock %}
+
+{% block meta %}
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ feed_url }}" />
 {% endblock %}
+
 {% block content %}
+
 <div class="tabBar">
-    <div class="headQuestions">
-        {% if searchtag %}
-            {% trans "Found by tags" %}
-        {% else %}
-            {% if searchtitle %}
-                {% if settings.USE_SPHINX_SEARCH %}
-                    {% trans "Search results" %}
-                {% else %}
-                    {% trans "Found by title" %}
-                {% endif %}
-            {% else %}
-                {% if is_unanswered %}
-                    {% trans "Unanswered questions" %}
-                {% else %}
-                    {% trans "All questions" %}
-                {% endif %}
-            {% endif %}
-        {% endif %}
-    </div>
-    <div class="tabsA">
-        <a id="latest" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=latest" class="off" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a>
-        <a id="active" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=active" class="off" title="{% trans "most recently updated questions" %}">{% trans "active" %}</a>
-        <a id="hottest" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=hottest" class="off" title="{% trans "hottest questions" %}">{% trans "hottest" %}</a>
-        <a id="mostvoted" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=mostvoted" class="off" title="{% trans "most voted questions" %}">{% trans "most voted" %}</a>    
-    </div>
+    {% include "question_list/title.html" %}
+    <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');" href="{{ feed_url }}" title="{% trans "subscribe to question RSS feed" %}"></a>
+    {{ questions.paginator.sort_tabs }}
 </div>
-<div id="listA">
-    {% for question in questions.object_list %}
-    <div class="qstA"
-        {% if request.user.is_authenticated %}
-            {% if question.interesting_score > 0 %}
-                    style="background:#ffff99;"
-            {% else %}
-                {% if not request.user.hide_ignored_questions %}
-                    {% if question.ignored_score > 0 %}
-                    style="background:#f3f3f3;"
-                    {% endif %}
-                {% endif %}
-            {% endif %}
-        {% endif %}
-    >
-        <h2>
-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
-        </h2>
-        <div class="stat">
-            <table>
-                <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>
-                    <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> 
-            </table>
-        </div>
-        
-        <div class="summary">
-            {{ question.summary }}...                
-        </div>
-        
-        {% ifequal tab_id 'active'%}
-        {% 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 %}
-            <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 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 %}
-            {% 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 tag_questions tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
-        {% endfor %}
-        </div>
-    </div>
-    {% endfor %}
-    {% if searchtitle %}
-        {% if questions_count == 0 %}
-        <p class="evenMore" style="padding-top:30px;text-align:center;">
-            {% trans "Did not find anything?" %}
-        {% else %}
-        <p class="evenMore" style="padding-left:9px">
-            {% trans "Did not find what you were looking for?" %} 
-        {% endif %}
-        <a href="{% url ask %}">{% trans "Please, post your question!" %}</a>
-        </p>
+<div id="listA">{% for question in questions.paginator.page %}
+    {% if show_summary %}
+      {% question_list_item question question_summary=yes %}
+    {% else %}
+      {% question_list_item question %}
     {% endif %}
-</div>
+{% endfor %}</div>
 {% endblock %}
 
 {% block tail %}
-    <div class="pager">{% cnprog_paginator context %}</div>
-    <div class="pagesize">{% cnprog_pagesize context %}</div>
+    <div class="pager">{{ questions.paginator.page_numbers }}</div>
+    <div class="pagesize">{{ questions.paginator.page_sizes }}</div>
 {% endblock %}
 
 {% block sidebar %}
-<div class="boxC">
-		{% if searchtag %}
-            {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}
-            have total {{q_num}} questions tagged {{tagname}}
-            {% plural %}
-            have total {{q_num}} questions tagged {{tagname}}
-            {% endblocktrans %}
-		{% else %}
-			{% if searchtitle %}
-                {% if settings.USE_SPHINX_SEARCH %}
-                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
-                    have total {{q_num}} questions containing {{searchtitle}} in full text
-                    {% plural %}
-                    have total {{q_num}} questions containing {{searchtitle}} in full text
-                    {% endblocktrans %}
-                {% else %}
-                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}
-                    have total {{q_num}} questions containing {{searchtitle}}
-                    {% plural %}
-                    have total {{q_num}} questions containing {{searchtitle}}
-                    {% endblocktrans %}
-                {% endif %}
-			{% else %}
-                {% if is_unanswered %}
-                    {% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
-                    have total {{q_num}} unanswered questions
-                    {% plural %}
-                    have total {{q_num}} unanswered questions
-                    {% endblocktrans %}
-                {% else %}
-                    {% blocktrans count questions as cnt with questions_count|intcomma as q_num %}
-                    have total {{q_num}} questions
-                    {% plural %}
-                    have total {{q_num}} questions
-                    {% endblocktrans %}
-                {% endif %}
-			{% endif %}
-		{% endif %}
-        <p class="nomargin">
-        {% ifequal tab_id "latest" %}
-			{% trans "latest questions info" %}
-        {% endifequal %}
-        
-        {% ifequal tab_id "active" %}
-            {% trans "Questions are sorted by the <strong>time of last update</strong>." %} 
-			{% trans "Most recently answered ones are shown first." %}
-        {% endifequal %}
-        
-        {% ifequal tab_id "hottest" %}
-			{% trans "Questions sorted by <strong>number of responses</strong>." %}
-            {% trans "Most answered questions are shown first." %}
-        {% endifequal %}
-        
-        {% ifequal tab_id "mostvoted" %}
-			{% trans "Questions are sorted by the <strong>number of votes</strong>." %}
-            {% trans "Most voted questions are shown first." %}
-        {% endifequal %}
-        </p>
-</div>
-{% if request.user.is_authenticated %} 
-{% include "tag_selector.html" %}
-{% endif %}
-<div class="boxC">
-	<h3 class="subtitle">{% trans "Related tags" %}</h3>
-    <div class="tags">
-        {% for tag in tags %}
-            <a rel="tag" title="{% blocktrans with tag.name as tag_name %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"  href="{% url tag_questions tag.name|urlencode %}">{{ tag.name }}</a>
-            <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
-            <br />
-        {% endfor %}
-    </div>
-</div>
+    {% include "question_list/count.html" %}
+    {% sidebar_upper %}
+    {% tag_selector %}
+    {% sidebar_lower %}
+    {% question_list_related_tags questions.paginator.page %}
 
 {% endblock %}
 <!-- end questions.html -->