diff options
Diffstat (limited to 'askbot/templates/authopenid')
-rw-r--r-- | askbot/templates/authopenid/complete.html | 6 | ||||
-rw-r--r-- | askbot/templates/authopenid/providers_javascript.html | 5 | ||||
-rw-r--r-- | askbot/templates/authopenid/signin.html | 1 | ||||
-rw-r--r-- | askbot/templates/authopenid/signup_with_password.html | 5 | ||||
-rw-r--r-- | askbot/templates/authopenid/verify_email.html | 2 |
5 files changed, 13 insertions, 6 deletions
diff --git a/askbot/templates/authopenid/complete.html b/askbot/templates/authopenid/complete.html index c41f0a0f..cefb1941 100644 --- a/askbot/templates/authopenid/complete.html +++ b/askbot/templates/authopenid/complete.html @@ -63,11 +63,15 @@ anyone, must be valid</i>) {% endif %} {{ openid_register_form.email }} </div> + {% if openid_register_form.recaptcha %} + <div class="form-row-vertical"> + {{ macros.form_field_with_errors(openid_register_form.recaptcha ) }} + </div> + {% endif %} <div class="submit-row"> <input id="register-button" type="submit" - class="submit" name="bnewaccount" value="{% trans %}Signup{% endtrans %}" /> diff --git a/askbot/templates/authopenid/providers_javascript.html b/askbot/templates/authopenid/providers_javascript.html index 86f1004f..d20f052f 100644 --- a/askbot/templates/authopenid/providers_javascript.html +++ b/askbot/templates/authopenid/providers_javascript.html @@ -1,11 +1,14 @@ <script type='text/javascript' src='{{ "/js/jquery.validate.min.js"|media }}'></script> +{% if settings.SIGNIN_MOZILLA_PERSONA_ENABLED %} +<script type="text/javascript" src="https://login.persona.org/include.js"></script> +{% endif %} <script type="text/javascript" src="{{ "/jquery-openid/jquery.openid.js"|media }}"></script> <script type="text/javascript"> askbot['urls']['changePassword'] = '{% url change_password %}'; + askbot['urls']['deleteLoginMethod'] = '{% url delete_login_method %}'; var extra_token_name = {}; var create_pw_text = {}; var change_pw_text = {}; - var authUrl = '/{% trans %}account/{% endtrans %}'; var siteName = '{{settings.APP_SHORT_NAME}}'; var provider_count = {{existing_login_methods|length}}; {% for login_provider in major_login_providers %} diff --git a/askbot/templates/authopenid/signin.html b/askbot/templates/authopenid/signin.html index daf5a45a..c2717023 100644 --- a/askbot/templates/authopenid/signin.html +++ b/askbot/templates/authopenid/signin.html @@ -44,6 +44,7 @@ {% endif %}
{{ login_form.login_provider_name }}
{{ login_form.next }}
+ {{ login_form.persona_assertion }}
{{
login_macros.provider_buttons(
login_form = login_form,
diff --git a/askbot/templates/authopenid/signup_with_password.html b/askbot/templates/authopenid/signup_with_password.html index c3625b62..ef8d8572 100644 --- a/askbot/templates/authopenid/signup_with_password.html +++ b/askbot/templates/authopenid/signup_with_password.html @@ -38,9 +38,8 @@ your login details with anyone and having to remember yet another password.{% en <li><label for="password1_id">{{form.password1.label}}</label>{{form.password1}}{{form.password1.errors}}</li> <li><label for="password2_id">{{form.password2.label}}</label>{{form.password2}}{{form.password2.errors}}</li> </ul> - {% if settings.USE_RECAPTCHA %} - <p class="signup_p">{% trans %}Please read and type in the two words below to help us prevent automated account creation.{% endtrans %}</p> - {{form.recaptcha}} + {% if form.recaptcha %} + {{ main_macros.form_field_with_errors(form.recaptcha) }} {% endif %} <div class="submit-row"><input id="signup-button" type="submit" class="button" value="{% trans %}Signup{% endtrans %}" /> {% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == False %} diff --git a/askbot/templates/authopenid/verify_email.html b/askbot/templates/authopenid/verify_email.html index 613ca589..1312658b 100644 --- a/askbot/templates/authopenid/verify_email.html +++ b/askbot/templates/authopenid/verify_email.html @@ -8,7 +8,7 @@ </label> <form method="post">{% csrf_token %} <input id="validation-code" type="text" name="validation_code" /> - <input type="submit" class="submit" value="{% trans %}Confirm email{% endtrans %}" /> + <input type="submit" value="{% trans %}Confirm email{% endtrans %}" /> </form> {% endblock %} <!-- end changeemail.html --> |