X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..30beae7541b44060bdd42b55fe525a1113452b55:/forum/skins/default/templates/question.html?ds=sidebyside

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index d878fb0..466df6a 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -1,13 +1,14 @@
 {% 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 title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
@@ -19,14 +20,26 @@
         {% 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,7 +59,7 @@
         
 {% block content %}
 <div class="headNormal">
-    <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
 </div>
 <div id="main-body" class="">
     <div id="askform">
@@ -73,8 +86,7 @@
                                 {% post_controls question request.user %}
                             </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 +94,15 @@
                     </td>
                 </tr>
             </table>
-            {% if question.closed %}
+            {% if question.marked %}
             <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.closed.extra 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>
+                 {% diff_date question.closed.at %}
+            </h3>
             </div>
             {% endif %}
             {% if answers %}
@@ -131,8 +147,7 @@
                                             {% post_controls answer request.user %}
                                         </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 +213,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 +238,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 +262,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 %}