Adds feeds for answers or comments to questions.

[osqa.git] / forum / skins / default / templates / question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 466df6a4907242f0c6ccf04f83bf3b5125794f30..4d5ff090009aa196a96087b217d76ed45a975e27 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -8,12 +8,13 @@
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r

+{% block metadescription %}{{question.summary}}{% endblock %}\r
+{% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}\r

 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
 {% block forejs %}\r
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
 {% block forejs %}\r

-        <meta name="description" content="{{question.summary}}" />\r
-        <meta name="keywords" content="{{question.tagname_meta_generator}}" />\r

         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />\r
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />\r

-        {% if not question.closed %}\r
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">\r
+        {% if not question.nis.closed %}\r

         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>\r
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>\r
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />\r


@@ -59,11 +60,11 @@
         \r
 {% block content %}\r
 <div class="headNormal">\r
         \r
 {% block content %}\r
 <div class="headNormal">\r

-    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>\r
+    <h1><a href="{{ question.get_absolute_url }}">{{ question.headline }}</a></h1>\r

 </div>\r
 <div id="main-body" class="">\r
     <div id="askform">\r
 </div>\r
 <div id="main-body" class="">\r
     <div id="askform">\r

-            <table style="width:100%;" id="question-table" {% if question.deleted %}class="deleted"{%endif%}>\r
+            <table style="width:100%;" id="question-table" {% if question.nis.deleted %}class="deleted"{%endif%}>\r

                 <tr>\r
                     <td style="width:30px;vertical-align:top">\r
                         <div class="vote-buttons">\r
                 <tr>\r
                     <td style="width:30px;vertical-align:top">\r
                         <div class="vote-buttons">\r


@@ -76,14 +77,15 @@
                             <div class="question-body">\r
                                 {{ question.html|safe }}\r
                             </div>\r
                             <div class="question-body">\r
                                 {{ question.html|safe }}\r
                             </div>\r

-                            <div id="question-controls" class="post-controls">\r
-                                <div id="question-tags" class="tags">\r
-                                    {% for tag in question.tagname_list %}\r
-                                        <a href="{% url tag_questions tag|urlencode %}" class="post-tag"\r
-                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>\r
-                                    {% endfor %}\r
-                                </div>\r
+                            <div id="question-tags" class="tags-container tags">\r
+                                {% for tag in question.tagname_list %}\r
+                                    <a href="{% url tag_questions tag|urlencode %}" class="post-tag"\r
+                                        title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>\r
+                                {% endfor %}\r
+                            </div>\r
+                            <div id="question-controls" class="post-controls">                            \r

                                 {% post_controls question request.user %}\r
                                 {% post_controls question request.user %}\r

+                                {% wiki_symbol request.user question %}\r

                             </div>\r
                             <div class="post-update-info-container">\r
                                     {% contributors_info question %}\r
                             </div>\r
                             <div class="post-update-info-container">\r
                                     {% contributors_info question %}\r


@@ -94,14 +96,14 @@
                     </td>\r
                 </tr>\r
             </table>\r
                     </td>\r
                 </tr>\r
             </table>\r

-            {% if question.marked %}\r
+            {% if question.nis.closed %}\r

             <div class="question-status" style="margin-bottom:15px">\r
             <h3>\r
             <div class="question-status" style="margin-bottom:15px">\r
             <h3>\r

-                {% blocktrans with question.closed.extra as close_reason %}\r
+                {% blocktrans with question.nstate.closed.extra as close_reason %}\r

                     The question has been closed for the following reason "{{ close_reason }}" by\r
                 {% endblocktrans %}\r
                     The question has been closed for the following reason "{{ close_reason }}" by\r
                 {% endblocktrans %}\r

-                <a href="{{ question.closed.by.get_profile_url }}">{{ question.closed.by.username }}</a>\r
-                 {% diff_date question.closed.at %}\r
+                <a href="{{ question.nstate.closed.by.get_profile_url }}">{{ question.nstate.closed.by.username }}</a>\r
+                 {% diff_date question.nstate.closed.at %}\r

             </h3>\r
             </div>\r
             {% endif %}\r
             </h3>\r
             </div>\r
             {% endif %}\r


@@ -110,26 +112,19 @@
                 <div class="tabBar">\r
                     <a name="sort-top"></a>\r
                     <div class="headQuestions">\r
                 <div class="tabBar">\r
                     <a name="sort-top"></a>\r
                     <div class="headQuestions">\r

-                    {% blocktrans count answers|length as counter %}\r
+                    {% blocktrans count answers.paginator.count as counter %}\r

                     One Answer:\r
                     {% plural %}\r
                     {{counter}} Answers:\r
                     {% endblocktrans %}\r
                     </div>\r
                     One Answer:\r
                     {% plural %}\r
                     {{counter}} Answers:\r
                     {% endblocktrans %}\r
                     </div>\r

-                    <div class="tabsA">\r
-                         <a id="oldest" href="{{ question.get_absolute_url }}?sort=oldest#sort-top"\r
-                            title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>\r
-                        <a id="latest" href="{{ question.get_absolute_url }}?sort=latest#sort-top"\r
-                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>\r
-                        <a id="votes" href="{{ question.get_absolute_url }}?sort=votes#sort-top" \r
-                            title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   \r
-                    </div>\r
+                    {{ answers.paginator.sort_tabs }}\r

                 </div>\r
                 </div>\r

-                {% cnprog_paginator context %}\r
+                {{ answers.paginator.page_numbers }}\r

   \r
   \r

-                {% for answer in answers %}\r
+                {% for answer in answers.paginator.page %}\r

                     <a name="{{ answer.id }}"></a>\r
                     <a name="{{ answer.id }}"></a>\r

-                    <div id="answer-container-{{ answer.id }}" class="answer {% if answer.accepted %}accepted-answer{% endif %} {% ifequal answer.author_id question.author_id %} answered-by-owner{% endifequal %} {% if answer.deleted %}deleted{% endif %}">\r
+                    <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 %}">\r

                         <table style="width:100%;">\r
                             <tr>\r
                                 <td style="width:30px;vertical-align:top">\r
                         <table style="width:100%;">\r
                             <tr>\r
                                 <td style="width:30px;vertical-align:top">\r


@@ -145,6 +140,7 @@
                                         </div>\r
                                         <div class="answer-controls post-controls">\r
                                             {% post_controls answer request.user %}\r
                                         </div>\r
                                         <div class="answer-controls post-controls">\r
                                             {% post_controls answer request.user %}\r

+                                            {% wiki_symbol request.user answer %}\r

                                         </div>\r
                                         <div class="post-update-info-container">\r
                                             {% contributors_info answer %}\r
                                         </div>\r
                                         <div class="post-update-info-container">\r
                                             {% contributors_info answer %}\r


@@ -157,7 +153,7 @@
                     </div>\r
                 {% endfor %}\r
                 <div class="paginator-container-left">\r
                     </div>\r
                 {% endfor %}\r
                 <div class="paginator-container-left">\r

-                    {% cnprog_paginator context %}\r
+                    {{ answers.paginator.page_numbers }}\r

                 </div>\r
             {% endif %}\r
         <form id="fmanswer" action="{% url answer question.id %}" method="post">\r
                 </div>\r
             {% endif %}\r
         <form id="fmanswer" action="{% url answer question.id %}" method="post">\r


@@ -176,17 +172,23 @@
                     </div>\r
                     {% endspaceless %}\r
                 </div>\r
                     </div>\r
                     {% endspaceless %}\r
                 </div>\r

+                {% comment %}\r

                 {% if not request.user.is_authenticated %}\r
                 {% if not request.user.is_authenticated %}\r

-                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>\r
+                    <div class="message">{% trans "You can answer anonymously and then login." %}</div>\r

                 {% else %}\r
                     <p class="message">\r
                         {% ifequal request.user question.author  %}\r
                 {% else %}\r
                     <p class="message">\r
                         {% ifequal request.user question.author  %}\r

-                            {% trans "answer your own question only to give an answer" %}\r
+                            {% trans "Answer your own question only to give an answer." %}\r

                         {% else %}\r
                         {% else %}\r

-                            {% trans "please only give an answer, no discussions" %}\r
+                            {% trans "Please only give an answer, no discussions." %}\r

                         {% endifequal %}\r
                         {% endifequal %}\r

+                        {% if not request.user.email_valid_and_can_answer %}\r
+                            {% blocktrans %}Remember, your answer will not be published until you validate your email.{% endblocktrans %}\r
+                            <a href="{% url send_validation_email %}">{% trans "Send me a validation link." %}</a>\r
+                        {% endif %}\r

                     </p>\r
                 {% endif %}\r
                     </p>\r
                 {% endif %}\r

+                {% endcomment %}\r

 \r
                 <div id="description" class="" >\r
                     <div id="wmd-button-bar" class="wmd-panel"></div>\r
 \r
                 <div id="description" class="" >\r
                     <div id="wmd-button-bar" class="wmd-panel"></div>\r