X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/be26ac9493b40e87e07c773a8d7c79ef1e8b7b48..5c27752e396ef1b6e794a489b577b0f7be3126b6:/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 b879874..20fdf1c 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 %}
-        <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" %}" />
@@ -59,7 +59,7 @@
         
 {% block content %}
 <div class="headNormal">
-    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
+    <h1><a href="{{ question.get_absolute_url }}">{{ question.headline }}</a></h1>
 </div>
 <div id="main-body" class="">
     <div id="askform">
@@ -178,17 +178,23 @@
                     </div>
                     {% endspaceless %}
                 </div>
+                {% comment %}
                 {% if not request.user.is_authenticated %}
-                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>
+                    <div class="message">{% trans "You can answer anonymously and then login." %}</div>
                 {% else %}
                     <p class="message">
                         {% 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 %}
+                            <a href="{% url send_validation_email %}">{% trans "Send me a validation link." %}</a>
+                        {% endif %}
                     </p>
                 {% endif %}
+                {% endcomment %}
 
                 <div id="description" class="" >
                     <div id="wmd-button-bar" class="wmd-panel"></div>