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

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index d878fb0..b6300d5 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 <!-- question.html -->
-{% load question_page_tags %}
+{% load node_tags %}
 {% load extra_tags %}
 {% load extra_filters %}
 {% 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,8 +19,6 @@
         {% 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 }}";
@@ -46,7 +44,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">
@@ -82,11 +80,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 %}
@@ -252,7 +254,7 @@
 
         {% 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 %}