Merging the experimental branch back to trunk.

[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..b6300d596ab13fda148935e97c4f74946607728b 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -7,7 +7,7 @@
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r
-{% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}\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
@@ -19,8 +19,6 @@
         {% 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
@@ -46,7 +44,7 @@
         \r
 {% block content %}\r
 <div class="headNormal">\r
-    <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>\r
+    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>\r
 </div>\r
 <div id="main-body" class="">\r
     <div id="askform">\r
@@ -82,11 +80,15 @@
                     </td>\r
                 </tr>\r
             </table>\r
-            {% if question.closed %}\r
+            {% if question.marked %}\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.closed.extra as close_reason %}\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
+            </h3>\r
             </div>\r
             {% endif %}\r
             {% if answers %}\r
@@ -252,7 +254,7 @@
 \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