summaryrefslogtreecommitdiffstats
path: root/templates/authopenid
diff options
context:
space:
mode:
Diffstat (limited to 'templates/authopenid')
-rw-r--r--templates/authopenid/changeemail.html45
-rw-r--r--templates/authopenid/changeopenid.html2
-rw-r--r--templates/authopenid/changepw.html33
-rw-r--r--templates/authopenid/complete.html86
-rw-r--r--templates/authopenid/confirm_email.txt4
-rw-r--r--templates/authopenid/delete.html3
-rw-r--r--templates/authopenid/external_legacy_login_info.html21
-rw-r--r--templates/authopenid/sendpw.html30
-rw-r--r--templates/authopenid/sendpw_email.txt14
-rw-r--r--templates/authopenid/settings.html2
-rw-r--r--templates/authopenid/signin.html70
-rw-r--r--templates/authopenid/signup.html59
12 files changed, 189 insertions, 180 deletions
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index 09857d17..94d1881c 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -1,37 +1,44 @@
{% extends "base_content.html" %}
{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Change email" %}{% endspaceless %}{% endblock %}
{% block content %}
<!-- changeemail.html action_type={{action_type}}-->
{% ifequal action_type "change" %}
<div id="main-bar" class="headNormal">
- {% trans "Change email" %}
+ {% if user.email %}
+ {% trans "Change email" %}
+ {% else %}
+ {% trans "Save your email address" %}
+ {% endif %}
</div>
<p class="message">
- {% blocktrans %}change {{email}} info{% endblocktrans %}
- </p>
- {% if form.errors %}
- <p class="errors">{% trans "Please correct errors below:" %}<br />
- {% if form.email.errors %}
- <span class="error">{{ form.email.errors|join:", " }}</span>
- {% endif %}
- {% if form.password.errors %}
- <span class="error">{{ form.password.errors|join:", " }}</span>
+ {% if user.email %}
+ {% blocktrans %}change {{email}} info{% endblocktrans %}
+ {% else %}
+ {% blocktrans %}here is why email is required, see {{gravatar_faq_url}}{% endblocktrans %}
{% endif %}
</p>
- {% endif %}
-
{% if msg %}
- <p class="errors">{{ msg }}</p>
+ <p class="error">{{ msg }}</p>
{% endif %}
<div class="aligned">
<form action="." method="post" accept-charset="utf-8">
-
- <div class="form-row"><label for="id_email">{% trans "Your new Email" %}</label><br/>{{ form.email }}</div>
- <!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
+ {% if next %}
+ <input type="hidden" name="next" value="{{next}}"/>
+ {% endif %}
+ <div class="form-row-vertical">
+ <label for="id_email">{% if user.email %}{% trans "Your new Email" %}{% else %}{% trans "Your Email" %}{% endif %}</label>
+ {% if form.email.errors %}
+ <p class="error">{{form.email.errors|join:", "}}</p>
+ {% endif %}
+ {{ form.email }}
+ </div>
<div class="submit-row">
- <input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
+ <input class="submit" type="submit" name="change_email" value="{% if user.email %}{% trans "Change email" %}{% else %}{% trans "Save Email" %}{% endif %}">
+ {% if user.email %}
<input class="submit" type="submit" name="cancel" value="{% trans "Cancel" %}">
+ {% endif %}
</div>
</form>
@@ -42,7 +49,7 @@
{% trans "Validate email" %}
</div>
<p class="message">
- {% blocktrans %}validate {{email}} info{% endblocktrans %}
+ {% blocktrans %}validate {{email}} info or go to {{change_email_url}}{% endblocktrans %}
</p>
{% endifequal %}
{% ifequal action_type "keep" %}
@@ -50,7 +57,7 @@
{% trans "Email not changed" %}
</div>
<p class="message">
- {% blocktrans %}old {{email}} kept{% endblocktrans %}
+ {% blocktrans %}old {{email}} kept, if you like go to {{change_email_url}}{% endblocktrans %}
</p>
{% endifequal %}
{% ifequal action_type "done_novalidate" %}
diff --git a/templates/authopenid/changeopenid.html b/templates/authopenid/changeopenid.html
index 9b5a196a..d01788fb 100644
--- a/templates/authopenid/changeopenid.html
+++ b/templates/authopenid/changeopenid.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
<!-- changeopenid.html -->
{% load i18n %}
-
+{% block title %}{% spaceless %}{% trans "Change OpenID" %}{% endspaceless %}{% endblock %}
{% block content %}
<div id="main-bar" class="">
<h3>
diff --git a/templates/authopenid/changepw.html b/templates/authopenid/changepw.html
index 0e90b172..8b059544 100644
--- a/templates/authopenid/changepw.html
+++ b/templates/authopenid/changepw.html
@@ -1,34 +1,17 @@
{% extends "base.html" %}
<!-- changepw.html -->
{% load i18n %}
-
-{% block head %}
-
-{% endblock %}
-
-
-
+{% block head %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Change password" %}{% endspaceless %}{% endblock %}
{% block content %}
-<div id="main-bar" class="">
- <h3>
- {% trans "Account: change password" %}
- </h3>
-</div>
-<p>{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-{{ form.errors }}
-</p>
-{% endif %}
-
+<div class="headNormal">{% trans "Account: change password" %}</div>
+<p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
<div class="aligned">
<form action="." method="post" accept-charset="utf-8">
-
- <div id="form-row"><label for="id_oldpw">{% trans "Current password" %}</label>{{ form.oldpw }}</div>
- <div id="form-row"><label for="id_password1">{% trans "New password" %}</label>{{ form.password1 }}</div>
- <div id="form-row"><label for="id_password2">{% trans "New password again" %}</label>{{ form.password2 }}</div>
- <p><input type="submit" value="{% trans "Change password" %}"></p>
-
+ <ul id="changepw-form" class="form-horizontal-rows">
+ {{form.as_ul}}
+ </ul>
+ <div class="submit-row"><input type="submit" class="submit" value="{% trans "Change password" %}" /></div>
</form>
</div>
{% endblock %}
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 -->
diff --git a/templates/authopenid/confirm_email.txt b/templates/authopenid/confirm_email.txt
index 29b5cd94..0b3b2505 100644
--- a/templates/authopenid/confirm_email.txt
+++ b/templates/authopenid/confirm_email.txt
@@ -5,8 +5,8 @@ Los detalles de su cuenta son:
Nombre de usuario: {{ username }}
Contraseña: {{ password }}
-Favor inicie sesión aquí:
-{{ site_url }}{% trans "signin/" %}
+{% trans "Please sign in here:" %}
+{{signup_url}}
Saludos,
El equipo administrador de Hasked.com
diff --git a/templates/authopenid/delete.html b/templates/authopenid/delete.html
index d39bc962..0f9f1c60 100644
--- a/templates/authopenid/delete.html
+++ b/templates/authopenid/delete.html
@@ -1,8 +1,7 @@
{% extends "base.html" %}
<!-- delete.html -->
{% load i18n %}
-
-
+{% block title %}{% spaceless %}{% trans "Delete account" %}{% endspaceless %}{% endblock %}
{% block content %}
<div id="main-bar" class="">
<h3>
diff --git a/templates/authopenid/external_legacy_login_info.html b/templates/authopenid/external_legacy_login_info.html
new file mode 100644
index 00000000..dda394c7
--- /dev/null
+++ b/templates/authopenid/external_legacy_login_info.html
@@ -0,0 +1,21 @@
+{% extends "base_content.html" %}
+<!--customize this template-->
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Traditional login information" %}{% endspaceless %}{% endblock %}
+{% block content %}
+<div class="headNormal">
+ {% trans "Traditional login information" %}
+</div>
+{% spaceless %}
+<div class="message">
+<<<<<<< HEAD:templates/authopenid/external_legacy_login_info.html
+fill in template templates/authopenid/external_legacy_login_info.html
+and explain how to change password, recover password, etc.
+<!--add info about your external login site here-->
+=======
+<!--add info about your external login site here-->
+{% trans "how to login with password through external login website" %}
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/authopenid/external_legacy_login_info.html
+</div>
+{% endspaceless %}
+{% endblock %}
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index 37091261..6241c811 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -2,35 +2,25 @@
<!-- sendpw.html -->
{% load i18n %}
{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
-
{% block content %}
-<div id="main-bar" class="">
- <h3>{% trans "Send new password" %}</h3>
-
-</div>
-<div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br/>
-{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
+<div class="headNormal">
+ {% trans "Send new password" %}
</div>
-{% if form.errors %}
-<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
- {% if form.username.errors %}
- <span class="error">{{ form.username.errors|join:", " }}</span>
- {% endif %}
+<p class="message">
+{% trans "password recovery information" %}
</p>
-{% endif %}
{% if msg %}
- <div class="paragraph error">{{ msg }}</div>
+ <p class="action-status"><span>{{msg}}</span><p>
{% endif %}
<div class="aligned">
<form action="." method="post" accept-charset="utf-8">
- <div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
-
- <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
-
+ <ul id="emailpw-form" class="form-horizontal-rows">
+ {{form.as_ul}}
+ </ul>
+ <p style="padding-top:10px"><input type="submit" class="submit" value="{% trans "Reset password" %}" />
+ <a href="{% url user_signin %}"><span class="strong">{% trans "return to login" %}</span></a></p>
</form>
- <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
</div>
{% endblock %}
<!-- end sendpw.html -->
diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt
index 06653d4f..c4910d12 100644
--- a/templates/authopenid/sendpw_email.txt
+++ b/templates/authopenid/sendpw_email.txt
@@ -1,13 +1,9 @@
-Alguien ha solicitado restablecer su contraseña en {{ site_url }}.
-Si no fué usted, ignore este correo
+{% load i18n %}
+{% blocktrans%}Someone has requested to reset your password on {{site_url}}.
+If it were not you, it is safe to ignore this email.{% endblocktrans %}
-Sus nuevo datos son:
-
-Nombre de usuario: {{ username }}
-Contraseña: {{ password }}
-
-Para hacer efectivo el cambio por favor visita:
-{{ site_url }}{{ url_confirm }}?key={{ confirm_key }}
+{% blocktrans %}email explanation how to use new {{password}} for {{username}}
+with the {{key_link}}{% endblocktrans %}
Saludos,
El Equipo administrador de Hasked.com
diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html
index ecc16c72..66ea5953 100644
--- a/templates/authopenid/settings.html
+++ b/templates/authopenid/settings.html
@@ -1,7 +1,7 @@
{% extends "base_content.html" %}
<!-- settings.html -->
{% load i18n %}
-
+{% block title %}{% spaceless %}{% trans "Account functions" %}{% endspaceless %}{% endblock %}
{% block head %}
<style type="text/css" media="screen">
h4 {font-size:12pt;}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 60aa5e5d..1363661e 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -1,13 +1,13 @@
{% extends "base.html" %}
<!-- signin.html -->
{% load i18n %}
+{% load extra_tags %}
{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
{% block forejs %}
- <!--<script type="text/javascript" src="/content/js/jquery.openid.js?"></script>-->
- <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script>
+ <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
- <link rel="stylesheet" type="text/css" media="screen" href="/content/jquery-openid/openid.css"/>
- <script type="text/javascript" src="/content/jquery-openid/jquery.openid.js"></script>
+ <link rel="stylesheet" type="text/css" media="screen" href="{% href "/content/jquery-openid/openid.css" %}"/>
+ <script type="text/javascript" src="{% href "/content/jquery-openid/jquery.openid.js" %}"></script>
<script type="text/javascript"> $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
<!--<script type="text/javascript">
$().ready(function(){
@@ -44,25 +44,27 @@
<ul class="providers">
<li class="local" title="Local login">
<div class="logo_box local_login_box">
- <img src="/content/jquery-openid/images/local-login.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" />
</div>
<span></span>
</li>
<li class="direct" title="Google">
<div class="logo_box google_box">
- <img src="/content/jquery-openid/images/google.gif" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+ <img src="{% href "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
</div>
</li>
<li class="direct" title="Yahoo">
<div class="logo_box yahoo_box">
- <img src="/content/jquery-openid/images/yahoo.gif" alt="icon" /><span>http://yahoo.com/</span>
+ <img src="{% href "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
</div>
</li>
<li class="username" title="AOL screen name">
<div class="logo_box aol_box">
- <img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+ <img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
</div>
</li>
+ </ul>
+ <ul class="providers">
<!--<li class="openid" title="OpenID">
<div class="logo_box openid_box">
<img src="/content/jquery-openid/images/openid.gif" alt="icon" />
@@ -70,43 +72,43 @@
<span><strong>http://{your-openid-url}</strong></span>
</li>-->
<li class="openid first_tiny_li" title="OpenID URL">
- <img src="/content/jquery-openid/images/openidico16.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
<span>http://{your-openid-url}</span>
</li>
<li class="username" title="MyOpenID user name">
- <img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
<span>http://<strong>username</strong>.myopenid.com/</span>
</li>
<li class="username" title="Flickr user name">
- <img src="/content/jquery-openid/images/flickr.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/flickr.png" %}" alt="icon" />
<span>http://flickr.com/<strong>username</strong>/</span>
</li>
<li class="username" title="Technorati user name">
- <img src="/content/jquery-openid/images/technorati-1.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />
<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
</li>
<li class="username" title="Wordpress blog name">
- <img src="/content/jquery-openid/images/wordpress.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />
<span>http://<strong>username</strong>.wordpress.com</span>
</li>
<li class="username" title="Blogger blog name">
- <img src="/content/jquery-openid/images/blogger-1.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />
<span>http://<strong>username</strong>.blogspot.com/</span>
</li>
<li class="username" title="LiveJournal blog name">
- <img src="/content/jquery-openid/images/livejournal-1.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
<span>http://<strong>username</strong>.livejournal.com</span>
</li>
<li class="username" title="ClaimID user name">
- <img src="/content/jquery-openid/images/claimid-0.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />
<span>http://claimid.com/<strong>username</strong></span>
</li>
<li class="username" title="Vidoop user name">
- <img src="/content/jquery-openid/images/vidoop.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />
<span>http://<strong>username</strong>.myvidoop.com/</span>
</li>
<li class="username" title="Verisign user name">
- <img src="/content/jquery-openid/images/verisign-2.png" alt="icon" />
+ <img src="{% href "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />
<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
</li>
</ul>
@@ -125,27 +127,17 @@
</fieldset>
<fieldset id='local_login_fs'>
<p>{% trans 'Enter your login name and password' %}</p>
- {% if form1.errors %}
- <p 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.password.errors %}
- <li><span class="error">{{ form1.password.errors|join:", " }}</span></li>
- {% endif %}
- </ul>
- </p>
- {% endif %}
- <div><label for="username">{% trans "Login name" %}</label>
- {{form1.username}}<br/>
- <label for="password">{% trans "Password" %}</label>
- {{form1.password}}<br/>
+ {% if form1.errors %}
+ {{form1.non_field_errors.as_ul}}
+ {% endif %}
+ <div><p class="login"><label for="id_username">{% trans "Login name" %}</label>
+ {{form1.username}}</p>
+ <p class="login"><label for="id_password">{% trans "Password" %}</label>
+ {{form1.password}}</p>
<p id="local_login_buttons">
<input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />
<a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>
- <a href="{% url user_sendpw %}">{% trans "I forgot my password" %}</a>
+ <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
</p>
</div>
</fieldset>
@@ -170,9 +162,9 @@
</li>
</ul>
- <p>
- <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br/>
- <a href="http://openid.net/get/" target="_blank" style="float:right;position:relative">{% trans "Get OpenID" %} »</a>
+ <p class="info-box-follow-up-links">
+ <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} »</a><br/>
+ <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} »</a>
</p>
</div>
{% endblock%}
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-->