diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/authopenid/complete.html | |
parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/authopenid/complete.html')
-rw-r--r-- | templates/authopenid/complete.html | 86 |
1 files changed, 69 insertions, 17 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html index f29b7670..e3c12ae5 100644 --- a/templates/authopenid/complete.html +++ b/templates/authopenid/complete.html @@ -1,5 +1,19 @@ {% extends "base_content.html" %} <!-- complete.html --> +{% comment %} +views calling this template: +* django_authopenid.views.register with login_type='openid' +* django_authopenid.views.signin - with login_type='legacy' + +parameters: +* provider +* login_type openid|legacy +* 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 +* openid_username_exists +{% endcomment %} {% load i18n %} {% block head %}{% endblock %} {% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %} @@ -9,25 +23,34 @@ </div> <div id="completetxt" > <div class="message"> - {% blocktrans %}register new {{provider}} account info{% endblocktrans %} + {% ifequal login_type 'openid' %} + {% blocktrans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %} + {% else %} + {% ifequal login_type 'legacy' %} + {% if external_login_name_is_taken %} + {% blocktrans %}{{username}} already exists, choose another name for + {{provider}}. Email is required too, see {{gravatar_faq_url}} + {% endblocktrans %} + {% else %} + {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %} + {% endif %} + {% endifequal %} + {% endifequal %} </div> <p style="display:none">{% trans "This account already exists, please use another." %}</p> </div> {% if form1.errors %} - <div class="errors"> - <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> - <ul class="error-list"> - {% if form1.username.errors %} - <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> - {% endif %} - {% if form1.email.errors %} - <li><span class="error">{{ form1.email.errors|join:", " }}</span></li> - {% endif %} + <ul class="errorlist"> + {% if form1.non_field_errors %} + {% for error in form1.non_field_errors %} + <li>{{error}}</li> + {% endfor %} + {% endif %} </ul> - </div> {% endif %} - {% if form2.errors %} + {% comment %} + {% if form2.errors %}<!--form2 is dysfunctional so commented out --> <div class="errors"> <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> <ul class="error-list"> @@ -40,29 +63,58 @@ </ul> </div> {% endif %} + {% endcomment %} <div class="login"> + {% ifequal login_type 'openid' %} <form name="fregister" action="{% url user_register %}" method="POST"> - {{ form.next }} - <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br/>{{ form1.username }}</div> - <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br/>{{ form1.email }}</div> + {% else %} + <form name="fregister" action="{% url user_signin %}" method="POST"> + {% endifequal %} + {{ form1.next }} + <div class="form-row-vertical"> + <label for="id_username">{% trans "Screen name label" %}</label> + {% if form1.username.errors %} + <p class="error">{{ form1.username.errors|join:", " }}</p> + {% endif %} + {{ form1.username }} + </div> + <div class="form-row-vertical margin-bottom"> + <label for="id_email">{% trans "Email address label" %}</label> + {% if form1.email.errors %} + <p class="error">{{ form1.email.errors|join:", " }}</p> + {% endif %} + {{ form1.email }} + </div> + <p class='nomargin'>{% trans "receive updates motivational blurb" %}</p> + {% include "edit_user_email_feeds_form.html" %} +<<<<<<< HEAD:templates/authopenid/complete.html +======= + <p class='nomargin'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p> +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/authopenid/complete.html <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div> </form> </div> + {% comment %}<!-- this form associates openID with an existing password-protected account, not yet functional --> + {% if form2 %} <div class="login" style="display:none"> <form name="fverify" action="{% url user_register %}" method="POST"> - {{ form.next }} + {{ form2.next }} <fieldset style="padding:10px"> <legend class="big">{% trans "Existing account" %}</legend> <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" %} <!--todo double check translation from chinese 确认 = "Register" --> <div class="submit-row"> <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> - <a href="">{% trans "Forgot your password?" %}</a> + <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a> </div> </fieldset> </form> </div> + {% endif %} + {% endcomment %} {% endblock %} <!-- end complete.html --> |