X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f5e25a1b44bd8ad23ecb5d8194306b319998a72..f73c15a3bd47e9f7fe3a29645f968528fb6415e4:/forum/skins/default/templates/ask.html?ds=sidebyside diff --git a/forum/skins/default/templates/ask.html b/forum/skins/default/templates/ask.html index 1f7d6c6..fa38b76 100644 --- a/forum/skins/default/templates/ask.html +++ b/forum/skins/default/templates/ask.html @@ -1,14 +1,21 @@ {% extends "base.html" %} -{% load i18n %} -{% load extra_tags %} +{% load i18n extra_tags extra_filters %} {% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %} {% block forejs %} + + {% endblock %} {% block content %} @@ -58,21 +93,23 @@
-
+ {% if not request.user.is_authenticated %}
-

{% trans "login to post question info" %}

+ {% trans "You are welcome to start submitting your question anonymously." %} +

{% blocktrans %} + After submiting your question, you will be redirected to the login/signup page. + Your question will be saved in the current session and will be published after you login with your existing account, + or signup for a new account{% endblocktrans %}{% if "ask"|contained_in:settings.REQUIRE_EMAIL_VALIDATION_TO %} + {% trans "and validate your email." %}{% else %}.{% endif %}

{% else %} - {% ifequal settings.EMAIL_VALIDATION 'on' %} - {% if not request.user.email_isvalid %} -
- {% blocktrans with request.user.email as email %}must have valid {{email}} to post, - see {{email_validation_faq_url}} - {% endblocktrans %} -
- {% endif %} - {% endifequal %} + {% if not request.user.email_valid_and_can_ask %} +
+ {% blocktrans %}Remember, your question will not be published until you validate your email.{% endblocktrans %} + {% trans "Send me a validation link." %} +
+ {% endif %} {% endif %}

@@ -81,17 +118,17 @@ {{ form.title.help_text }}
- +
- {{ form.text }} - + {{ form.text }} {{ form.text.errors }}
+ {% if settings.WIKI_ON %}
{% trans "toggle preview" %} {{ form.wiki }} {{ form.wiki.label_tag }} @@ -111,10 +148,19 @@

{{ form.tags.help_text }}

- {% if not request.user.is_authenticated %} - + + {% if form.recaptcha %} +
+ {{ form.recaptcha.errors }} + {{ form.recaptcha }} +
+
+ {% endif %} + + {% if not request.user.is_authenticated %} + {% else %} - + {% endif %}