X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..64b2d51a7d52a03c37bc7c35fa90e111e257fd93:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index d878fb0..81711e0 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -1,32 +1,45 @@
 {% extends "base.html" %}
 <!-- question.html -->
-{% load question_page_tags %}
+{% load node_tags %}
 {% load extra_tags %}
 {% load extra_filters %}
+{% load general_sidebar_tags %}
 {% load smart_if %}
 {% load humanize %}
 {% load i18n %}
 {% load cache %}
-{% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
+{% block metadescription %}{{question.summary}}{% endblock %}
+{% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}
+{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <meta name="description" content="{{question.summary}}" />
-        <meta name="keywords" content="{{question.tagname_meta_generator}}" />
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
-        {% if not question.closed %}
+        {% 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>
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
         {% endif %}
 
         <script type="text/javascript">
-        // define reputation needs for comments
-        var repNeededForComments = 50;
         $().ready(function(){
             $("#nav_questions").attr('className',"on");
             var answer_sort_tab = "{{ tab_id }}";
-            $("#" + answer_sort_tab).attr('className',"on");
+
+            if (answer_sort_tab) {
+                $("#" + answer_sort_tab).attr('className',"on");
+            }
 
             $('#editor').TextAreaResizer();
+            
+            //toggle preview of editor
+            var display = true;
+            var txt = "[{% trans "hide preview" %}]";
+            $('#pre-collapse').text(txt);
+            $('#pre-collapse').bind('click', function(){
+                txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";
+                display = !display;
+                $('#previewer').toggle();
+                $('#pre-collapse').text(txt);
+            });
         });
         </script>
         <noscript>
@@ -46,11 +59,11 @@
         
 {% block content %}
 <div class="headNormal">
-    <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</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.deleted %}class="deleted"{%endif%}>
+            <table style="width:100%;" id="question-table" {% if question.nis.deleted %}class="deleted"{%endif%}>
                 <tr>
                     <td style="width:30px;vertical-align:top">
                         <div class="vote-buttons">
@@ -63,18 +76,18 @@
                             <div class="question-body">
                                 {{ question.html|safe }}
                             </div>
-                            <div id="question-controls" class="post-controls">
-                                <div id="question-tags" class="tags">
-                                    {% for tag in question.tagname_list %}
-                                        <a href="{% url tag_questions tag|urlencode %}" class="post-tag"
-                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
-                                    {% endfor %}
-                                </div>
+                            <div id="question-tags" class="tags-container tags">
+                                {% for tag in question.tagname_list %}
+                                    <a href="{% url tag_questions tag|urlencode %}" class="post-tag"
+                                        title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
+                                {% endfor %}
+                            </div>
+                            <div id="question-controls" class="post-controls">                            
                                 {% post_controls question request.user %}
+                                {% wiki_symbol request.user question %}
                             </div>
                             <div class="post-update-info-container">
-                                    {% post_contributor_info question "original_author" %}
-                                    {% post_contributor_info question "last_updater" %}
+                                    {% contributors_info question %}
                             </div>
                             {% comments question request.user %}
                         </div>
@@ -82,11 +95,15 @@
                     </td>
                 </tr>
             </table>
-            {% if question.closed %}
+            {% if question.nis.closed %}
             <div class="question-status" style="margin-bottom:15px">
-            <h3>{% blocktrans with question.get_close_reason_display as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %} 
-            <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 
-            {% blocktrans with question.closed_at as closed_at %}close date {{closed_at}}{% endblocktrans %}</h3>
+            <h3>
+                {% blocktrans with question.nstate.closed.extra as close_reason %}
+                    The question has been closed for the following reason "{{ close_reason }}" by
+                {% endblocktrans %}
+                <a href="{{ question.nstate.closed.by.get_profile_url }}">{{ question.nstate.closed.by.username }}</a>
+                 {% diff_date question.nstate.closed.at %}
+            </h3>
             </div>
             {% endif %}
             {% if answers %}
@@ -113,7 +130,7 @@
   
                 {% for answer in answers %}
                     <a name="{{ answer.id }}"></a>
-                    <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 %}">
+                    <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 %}">
                         <table style="width:100%;">
                             <tr>
                                 <td style="width:30px;vertical-align:top">
@@ -129,10 +146,10 @@
                                         </div>
                                         <div class="answer-controls post-controls">
                                             {% post_controls answer request.user %}
+                                            {% wiki_symbol request.user answer %}
                                         </div>
                                         <div class="post-update-info-container">
-                                                {% post_contributor_info answer "original_author" %}
-                                                {% post_contributor_info answer "last_updater" %}
+                                            {% contributors_info answer %}
                                         </div>
                                         {% comments answer request.user %}
                                     </div>
@@ -198,8 +215,8 @@
                         
                         </table>  
                     </div>
-                    <div id="previewer" class="wmd-preview"></div>
                     {{ answer.text.errors }}
+                    <div id="previewer" class="wmd-preview"></div>                    
                 </div>
                 <p><span class="form-error"></span></p>
                 <input type="submit" 
@@ -223,13 +240,14 @@
 <div class="boxC" id="subscription_box">
     {% include "subscription_status.html" %}
 </div>
+{% sidebar_upper %}
 {% cache 60 questions_tags settings.APP_URL question.id %}
 <div class="boxC">
     <p>
 		{% trans "Question tags" %}:
     </p>
     <p class="tags" >
-        {% for tag in tags %}
+        {% for tag in question.tags.all %}
         	<a href="{% url tag_questions tag.name|urlencode %}" 
 			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
 			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>
@@ -246,13 +264,14 @@
     </p>
 </div>
 {% endcache %}
+{% sidebar_lower %}
 <div class="boxC">
     <h3 class="subtitle">{% trans "Related questions" %}</h3>
     <div class="questions-related">
 
         {% for question in similar_questions %}
         <p>
-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+            <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
         </p>
         {% endfor %}