X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7d7bf25b6fb206343959d7f496ab4215fd1f3df6..700b6dec7e4d655fee91e26f9757442162047281:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 4ffc481..d03af25 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -13,6 +13,7 @@
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">
         {% if not question.nis.closed %}
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
@@ -59,11 +60,11 @@
         
 {% block content %}
 <div class="headNormal">
-    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
+    <h1><a href="{{ question.get_absolute_url }}">{{ question.headline }}</a></h1>
 </div>
 <div id="main-body" class="">
     <div id="askform">
-            <table style="width:100%;" id="question-table" {% if question.nis.deleted %}class="deleted"{%endif%}>
+            <table style="width:100%;" id="question-table" {% post_classes question %}>
                 <tr>
                     <td style="width:30px;vertical-align:top">
                         <div class="vote-buttons">
@@ -111,26 +112,19 @@
                 <div class="tabBar">
                     <a name="sort-top"></a>
                     <div class="headQuestions">
-                    {% blocktrans count answers|length as counter %}
+                    {% blocktrans count answers.paginator.count as counter %}
                     One Answer:
                     {% plural %}
                     {{counter}} Answers:
                     {% endblocktrans %}
                     </div>
-                    <div class="tabsA">
-                         <a id="oldest" href="{{ question.get_absolute_url }}?sort=oldest#sort-top"
-                            title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
-                        <a id="latest" href="{{ question.get_absolute_url }}?sort=latest#sort-top"
-                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
-                        <a id="votes" href="{{ question.get_absolute_url }}?sort=votes#sort-top" 
-                            title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
-                    </div>
+                    {{ answers.paginator.sort_tabs }}
                 </div>
-                {% cnprog_paginator context %}
+                {{ answers.paginator.page_numbers }}
   
-                {% for answer in answers %}
+                {% for answer in answers.paginator.page %}
                     <a name="{{ answer.id }}"></a>
-                    <div id="answer-container-{{ answer.id }}" class="answer {% if answer.nis.accepted %}accepted-answer{% endif %} {% ifequal answer.author_id question.author_id %} answered-by-owner{% endifequal %} {% if answer.nis.deleted %}deleted{% endif %}">
+                    <div id="answer-container-{{ answer.id }}" class="answer {% post_classes answer %}">
                         <table style="width:100%;">
                             <tr>
                                 <td style="width:30px;vertical-align:top">
@@ -159,7 +153,7 @@
                     </div>
                 {% endfor %}
                 <div class="paginator-container-left">
-                    {% cnprog_paginator context %}
+                    {{ answers.paginator.page_numbers }}
                 </div>
             {% endif %}
         <form id="fmanswer" action="{% url answer question.id %}" method="post">
@@ -178,17 +172,23 @@
                     </div>
                     {% endspaceless %}
                 </div>
+                {% comment %}
                 {% if not request.user.is_authenticated %}
-                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>
+                    <div class="message">{% trans "You can answer anonymously and then login." %}</div>
                 {% else %}
                     <p class="message">
                         {% ifequal request.user question.author  %}
-                            {% trans "answer your own question only to give an answer" %}
+                            {% trans "Answer your own question only to give an answer." %}
                         {% else %}
-                            {% trans "please only give an answer, no discussions" %}
+                            {% trans "Please only give an answer, no discussions." %}
                         {% endifequal %}
+                        {% if not request.user.email_valid_and_can_answer %}
+                            {% blocktrans %}Remember, your answer will not be published until you validate your email.{% endblocktrans %}
+                            <a href="{% url send_validation_email %}">{% trans "Send me a validation link." %}</a>
+                        {% endif %}
                     </p>
                 {% endif %}
+                {% endcomment %}
 
                 <div id="description" class="" >
                     <div id="wmd-button-bar" class="wmd-panel"></div>