osqa-342

[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 7a265c6370f318be29cd4e1355458df72a262da5..81711e02f34d50332ad1ebeaaa4d70e159a12a60 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -3,30 +3,43 @@
 {% load node_tags %}\r
 {% load extra_tags %}\r
 {% load extra_filters %}\r
 {% load node_tags %}\r
 {% load extra_tags %}\r
 {% load extra_filters %}\r

+{% load general_sidebar_tags %}\r

 {% load smart_if %}\r
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r
 {% load smart_if %}\r
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r

-{% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}\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 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
+        {% 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
         {% endif %}\r
 \r
         <script type="text/javascript">\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
         {% endif %}\r
 \r
         <script type="text/javascript">\r

-        // define reputation needs for comments\r
-        var repNeededForComments = 50;\r

         $().ready(function(){\r
             $("#nav_questions").attr('className',"on");\r
             var answer_sort_tab = "{{ tab_id }}";\r
         $().ready(function(){\r
             $("#nav_questions").attr('className',"on");\r
             var answer_sort_tab = "{{ tab_id }}";\r

-            $("#" + answer_sort_tab).attr('className',"on");\r
+\r
+            if (answer_sort_tab) {\r
+                $("#" + answer_sort_tab).attr('className',"on");\r
+            }\r

 \r
             $('#editor').TextAreaResizer();\r
 \r
             $('#editor').TextAreaResizer();\r

+            \r
+            //toggle preview of editor\r
+            var display = true;\r
+            var txt = "[{% trans "hide preview" %}]";\r
+            $('#pre-collapse').text(txt);\r
+            $('#pre-collapse').bind('click', function(){\r
+                txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";\r
+                display = !display;\r
+                $('#previewer').toggle();\r
+                $('#pre-collapse').text(txt);\r
+            });\r

         });\r
         </script>\r
         <noscript>\r
         });\r
         </script>\r
         <noscript>\r


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

-    <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</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


@@ -63,18 +76,18 @@
                             <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
                             </div>\r
                             <div class="post-update-info-container">\r

-                                    {% post_contributor_info question "original_author" %}\r
-                                    {% post_contributor_info question "last_updater" %}\r
+                                    {% contributors_info question %}\r

                             </div>\r
                             {% comments question request.user %}\r
                         </div>\r
                             </div>\r
                             {% comments question request.user %}\r
                         </div>\r


@@ -82,11 +95,15 @@
                     </td>\r
                 </tr>\r
             </table>\r
                     </td>\r
                 </tr>\r
             </table>\r

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

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

-            <h3>{% blocktrans with question.get_close_reason_display as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %} \r
-            <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> \r
-            {% blocktrans with question.closed_at as closed_at %}close date {{closed_at}}{% endblocktrans %}</h3>\r
+            <h3>\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
+                <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
             {% if answers %}\r
             </div>\r
             {% endif %}\r
             {% if answers %}\r


@@ -113,7 +130,7 @@
   \r
                 {% for answer in answers %}\r
                     <a name="{{ answer.id }}"></a>\r
   \r
                 {% for answer in answers %}\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


@@ -129,10 +146,10 @@
                                         </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
                                         </div>\r
                                         <div class="post-update-info-container">\r

-                                                {% post_contributor_info answer "original_author" %}\r
-                                                {% post_contributor_info answer "last_updater" %}\r
+                                            {% contributors_info answer %}\r

                                         </div>\r
                                         {% comments answer request.user %}\r
                                     </div>\r
                                         </div>\r
                                         {% comments answer request.user %}\r
                                     </div>\r


@@ -198,8 +215,8 @@
                         \r
                         </table>  \r
                     </div>\r
                         \r
                         </table>  \r
                     </div>\r

-                    <div id="previewer" class="wmd-preview"></div>\r

                     {{ answer.text.errors }}\r
                     {{ answer.text.errors }}\r

+                    <div id="previewer" class="wmd-preview"></div>                    \r

                 </div>\r
                 <p><span class="form-error"></span></p>\r
                 <input type="submit" \r
                 </div>\r
                 <p><span class="form-error"></span></p>\r
                 <input type="submit" \r


@@ -223,13 +240,14 @@
 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r
 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r

+{% sidebar_upper %}\r

 {% cache 60 questions_tags settings.APP_URL question.id %}\r
 <div class="boxC">\r
     <p>\r
                {% trans "Question tags" %}:\r
     </p>\r
     <p class="tags" >\r
 {% cache 60 questions_tags settings.APP_URL question.id %}\r
 <div class="boxC">\r
     <p>\r
                {% trans "Question tags" %}:\r
     </p>\r
     <p class="tags" >\r

-        {% for tag in tags %}\r
+        {% for tag in question.tags.all %}\r

                <a href="{% url tag_questions tag.name|urlencode %}" \r
                        title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" \r
                        rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>\r
                <a href="{% url tag_questions tag.name|urlencode %}" \r
                        title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" \r
                        rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>\r


@@ -246,13 +264,14 @@
     </p>\r
 </div>\r
 {% endcache %}\r
     </p>\r
 </div>\r
 {% endcache %}\r

+{% sidebar_lower %}\r

 <div class="boxC">\r
     <h3 class="subtitle">{% trans "Related questions" %}</h3>\r
     <div class="questions-related">\r
 \r
         {% for question in similar_questions %}\r
         <p>\r
 <div class="boxC">\r
     <h3 class="subtitle">{% trans "Related questions" %}</h3>\r
     <div class="questions-related">\r
 \r
         {% for question in similar_questions %}\r
         <p>\r

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

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