diff options
author | root <root@u15356270.onlinehome-server.com> | 2009-11-13 20:18:55 -0500 |
---|---|---|
committer | root <root@u15356270.onlinehome-server.com> | 2009-11-13 20:31:40 -0500 |
commit | 7e4f1d542e00b4d3121da6ae5524e95867f2371b (patch) | |
tree | 5a3edfb81cc137dbc877f75f9bde80e9720b3ba0 /templates/authopenid/signup.html | |
parent | 3a4b6ad43221abc0e0ff345d9368c3348b312128 (diff) | |
download | askbot-7e4f1d542e00b4d3121da6ae5524e95867f2371b.tar.gz askbot-7e4f1d542e00b4d3121da6ae5524e95867f2371b.tar.bz2 askbot-7e4f1d542e00b4d3121da6ae5524e95867f2371b.zip |
better comments, email subscriptions, corrected view counter, some ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes
Diffstat (limited to 'templates/authopenid/signup.html')
-rw-r--r-- | templates/authopenid/signup.html | 59 |
1 files changed, 14 insertions, 45 deletions
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index 5e405d3f..45dfb51b 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -1,53 +1,22 @@ -{% extends "base.html" %} +{% extends "base_content.html" %} <!--signup.html--> {% load i18n %} {% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %} {% block content %} -<div id="main-bar" class=""> - <h3 >{% trans "Signup" %}</h3> - -</div> -<div class="jointxt"> - <p>{% trans "We support two types of user registration: conventional username/password, and" %} <a href="{% url user_signin %}">{% trans "the OpenID method" %}</a>.</p> - - {% if form.errors %} - - <p class="errors"> - <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br/> - <ul class="error-list"> - {% if form.username.errors %} - <li><span class="error">{{ form.username.errors|join:", " }}</span></li> - {% endif %} - {% if form.email.errors %} - <li><span class="error">{{ form.email.errors|join:", " }}</span></li> - {% endif %} - {% if form.password2.errors %} - <li><span class="error">{{ form.password2.errors|join:", " }} - </span></li> - {% endif %} - </ul> - </p> - {% endif %} +<div class="headNormal"> + {% trans "Create login name and password" %} </div> - <form action="{% url user_signup %}" method="post" accept-charset="utf-8"> - <fieldset class="fieldset"> - <legend class="big">{% trans "Conventional registration" %}</legend> - <div class="form-row"><label for="id_username">{% trans "choose a user name" %}:</label><br/>{{ form.username }}</div> - - <div class="form-row"><label for="id_email">{% trans "your email address" %}:</label><br/>{{ form.email }}</div> - <div class="form-row"><label for="id_password1">{% trans "choose password" %}:</label><br />{{ form.password1 }}</div> - <div class="form-row"><label for="id_password2">{% trans "retype password" %}:</label><br/>{{ form.password2 }}</div> - <div class="submit-row"><input type="submit" class="submit" value="{% trans "login" %}" > - <a href="{% url user_signin %}">{% trans "back to login" %}</a></div> - </fieldset> - </form> - <div style="display:none"> - <h2 class="signup">{% trans "Register with your OpenID" %}</h2> - <form name="fopenid" action="{% url user_signin %}" method="post"> - <div class="form-row">{{ form2.openid_url }}</div> - <div class="submit-row "><input name="bsignin" class="submit" type="submit" value="{% trans "Login with your OpenID" %}"></div> - </form> - </div> +<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}} + </ul> + <p style="margin:10px 0px 0px 3px;">{% trans "receive updates motivational blurb" %}</p> + {% include "edit_user_email_feeds_form.html" %} + <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> +</form> {% endblock %} <!--end signup.html--> |