X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/dc419dfdff7030d1eea9d3c21803e8dbb6fdf071..162b4fd442c169a61d2f5b2b3bd613546c8472da:/forum/skins/default/templates/question.html diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html index bdc2c22..305f62c 100644 --- a/forum/skins/default/templates/question.html +++ b/forum/skins/default/templates/question.html @@ -8,12 +8,12 @@ {% load humanize %} {% load i18n %} {% load cache %} +{% block metadescription %}{{question.summary}}{% endblock %} +{% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %} {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %} {% block forejs %} - - - {% if not question.closed %} + {% if not question.nis.closed %} @@ -59,11 +59,11 @@ {% block content %}
- {{ question.headline }} +

{{ question.headline }}

- +
@@ -76,14 +76,15 @@
{{ question.html|safe }}
-
-
- {% for tag in question.tagname_list %} - - {% endfor %} -
+
+ {% for tag in question.tagname_list %} + + {% endfor %} +
+
{% post_controls question request.user %} + {% wiki_symbol request.user question %}
{% contributors_info question %} @@ -94,14 +95,14 @@
- {% if question.marked %} + {% if question.nis.closed %}

- {% blocktrans with question.closed.extra as close_reason %} + {% blocktrans with question.nstate.closed.extra as close_reason %} The question has been closed for the following reason "{{ close_reason }}" by {% endblocktrans %} - {{ question.closed.by.username }} - {% diff_date question.closed.at %} + {{ question.nstate.closed.by.username }} + {% diff_date question.nstate.closed.at %}

{% endif %} @@ -110,26 +111,19 @@
- {% blocktrans count answers|length as counter %} + {% blocktrans count answers.paginator.count as counter %} One Answer: {% plural %} {{counter}} Answers: {% endblocktrans %}
- + {{ answers.paginator.sort_tabs }}
- {% cnprog_paginator context %} + {{ answers.paginator.page_numbers }} - {% for answer in answers %} + {% for answer in answers.paginator.page %} -
+
@@ -145,6 +139,7 @@
{% post_controls answer request.user %} + {% wiki_symbol request.user answer %}
{% contributors_info answer %} @@ -157,7 +152,7 @@
{% endfor %}
- {% cnprog_paginator context %} + {{ answers.paginator.page_numbers }}
{% endif %}
@@ -176,17 +171,23 @@ {% endspaceless %} + {% comment %} {% if not request.user.is_authenticated %} -
{% trans "you can answer anonymously and then login" %}
+
{% trans "You can answer anonymously and then login." %}
{% else %}

{% ifequal request.user question.author %} - {% trans "answer your own question only to give an answer" %} + {% trans "Answer your own question only to give an answer." %} {% else %} - {% trans "please only give an answer, no discussions" %} + {% trans "Please only give an answer, no discussions." %} {% endifequal %} + {% if not request.user.email_valid_and_can_answer %} + {% blocktrans %}Remember, your answer will not be published until you validate your email.{% endblocktrans %} + {% trans "Send me a validation link." %} + {% endif %}

{% endif %} + {% endcomment %}
@@ -213,8 +214,8 @@
-
{{ answer.text.errors }} +