diff options
Diffstat (limited to 'templates/authopenid')
| -rw-r--r-- | templates/authopenid/complete.html | 14 | ||||
| -rw-r--r-- | templates/authopenid/external_legacy_login_info.html | 2 | ||||
| -rw-r--r-- | templates/authopenid/signup.html | 14 |
3 files changed, 21 insertions, 9 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html index 1606cfc5..c967e8e2 100644 --- a/templates/authopenid/complete.html +++ b/templates/authopenid/complete.html @@ -11,7 +11,7 @@ parameters: * username (same as screen name or username in the models, and nickname in openid sreg) * form1 - OpenidRegisterForm * form2 - OpenidVerifyForm not clear what this form is supposed to do, not used for legacy -* email_feeds_form forum.forms.EditUserEmailFeedsForm +* email_feeds_form forum.forms.SimpleEmailSubscribeForm * openid_username_exists {% endcomment %} {% load i18n %} @@ -92,9 +92,11 @@ parameters: {% endif %} {{ form1.email }} </div> - <p class='nomargin'>{% trans "receive updates motivational blurb" %}</p> - {% include "edit_user_email_feeds_form.html" %} - <p class='nomargin'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p> + <p>{% trans "receive updates motivational blurb" %}</p> + <div class='simple-subscribe-options'> + {{email_feeds_form.subscribe}} + </div> + <p class='space-above'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p> <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div> </form> </div> @@ -108,7 +110,9 @@ parameters: <div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div> <div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div> <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p> - {% include "edit_user_email_feeds_form.html" %} + <div class='simple-subscribe-options'> + {{email_feeds_form.subscribe}} + </div> <!--todo double check translation from chinese 确认 = "Register" --> <div class="submit-row"> <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html index c200b29d..3318499c 100644 --- a/templates/authopenid/external_legacy_login_info.html +++ b/templates/authopenid/external_legacy_login_info.html @@ -9,7 +9,7 @@ {% spaceless %} <div class="message"> <!--add info about your external login site here--> -{% trans "how to login with password through external login website" %} +{% blocktrans %}how to login with password through external login website or use {{feedback_url}}{% endblocktrans %} </div> {% endspaceless %} {% endblock %} diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index 45dfb51b..d800eaf9 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -10,10 +10,18 @@ <p class="message">{% trans "Traditional signup info" %}</p> <form action="{% url user_signup %}" method="post" accept-charset="utf-8"> <ul class="form-horizontal-rows"> - {{form.as_ul}} + <li><label for="usename_id">{{form.username.label}}</label>{{form.username}}{{form.username.errors}}</li> + <li><label for="email_id">{{form.email.label}}</label>{{form.email}}{{form.email.errors}}</li> + <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> - <p style="margin:10px 0px 0px 3px;">{% trans "receive updates motivational blurb" %}</p> - {% include "edit_user_email_feeds_form.html" %} + <p class="signup_p">{% trans "receive updates motivational blurb" %}</p> + <p class="signup_p">{% trans "Please select your preferred email update schedule for the following groups of questions:" %}</p> + <div class='simple-subscribe-options'> + {{email_feeds_form.subscribe}} + </div> + <p class="signup_p">{% trans "Please read and type in the two words below to help us prevent automated account creation." %}</p> + {{form.recaptcha}} <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> <strong>{% trans "or" %} <a href="{% url user_signin %}">{% trans "return to OpenID login" %}</a></strong></div> |