diff options
-rw-r--r-- | askbot/templates/widgets/ask_form.html | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/askbot/templates/widgets/ask_form.html b/askbot/templates/widgets/ask_form.html index 0f851fee..87f3c4a6 100644 --- a/askbot/templates/widgets/ask_form.html +++ b/askbot/templates/widgets/ask_form.html @@ -1,16 +1,18 @@ {% import "macros.html" as macros %} <form id="fmask" action="" method="post" >{% csrf_token %} <div class="form-item"> - <div id="askFormBar"> - {% if not request.user.is_authenticated() %} + {% if not request.user.is_authenticated() %} <p>{% trans %}<span class=\"strong big\">You are welcome to start submitting your question anonymously</span>. When you submit the post, you will be redirected to the login/signup page. Your question will be saved in the current session and will be published after you log in. Login/signup process is very simple. Login takes about 30 seconds, initial signup takes a minute or less.{% endtrans %}</p> - {% else %} - {% if settings.EMAIL_VALIDATION %} - {% if not request.user.email_isvalid %} - {% trans email=request.user.email %}<span class='strong big'>Looks like your email address, %(email)s has not yet been validated.</span> To post messages you must verify your email, please see <a href='%(email_validation_faq_url)s'>more details here</a>.<br>You can submit your question now and validate email after that. Your question will saved as pending meanwhile.{% endtrans %} - {% endif %} + {% else %} + {% if settings.EMAIL_VALIDATION %} + {% if not request.user.email_isvalid %} + <p>{% trans email=request.user.email %}<span class='strong big'>Looks like your email address, %(email)s has not yet been validated.</span> To post messages you must verify your email, please see <a href='%(email_validation_faq_url)s'>more details here</a>.<br>You can submit your question now and validate email after that. Your question will saved as pending meanwhile.{% endtrans %}</p> {% endif %} {% endif %} + {% endif %} + </div> + <div class="form-item ask-form-bar"> + <div id="askFormBar"> <input id="id_title" class="questionTitleInput" name="title" autocomplete="off" value="{% if form.initial.title %}{{form.initial.title|escape}}{% endif %}"/> <span class="form-error">{{ form.title.errors }}</span> @@ -19,7 +21,6 @@ {{ form.title.help_text }} </div> </div> - <div id='question-list'></div> {{ macros.edit_post( form, |