summaryrefslogtreecommitdiffstats
path: root/templates/authopenid
diff options
context:
space:
mode:
Diffstat (limited to 'templates/authopenid')
-rw-r--r--templates/authopenid/changeemail.html2
-rw-r--r--templates/authopenid/complete.html28
-rw-r--r--templates/authopenid/sendpw.html4
-rw-r--r--templates/authopenid/signin.html29
-rw-r--r--templates/authopenid/signup.html10
5 files changed, 34 insertions, 39 deletions
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html
index d5acb6c9..09857d17 100644
--- a/templates/authopenid/changeemail.html
+++ b/templates/authopenid/changeemail.html
@@ -27,7 +27,7 @@
<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_email">{% trans "Your new Email" %}</label><br/>{{ form.email }}</div>
<!--<div class="form-row"><label for="id_password">{% trans "Password" %}</label>{{ form.password }}</div>-->
<div class="submit-row">
<input class="submit" type="submit" name="change_email" value="{% trans "Change email" %}">
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index b9a14e16..f29b7670 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -7,16 +7,16 @@
<div id="main-bar" class="headNormal">
{% trans "Connect your OpenID with your account on this site" %}
</div>
- <p id="completetxt" >
+ <div id="completetxt" >
<div class="message">
{% blocktrans %}register new {{provider}} account info{% endblocktrans %}
</div>
<p style="display:none">{% trans "This account already exists, please use another." %}</p>
- </p>
+ </div>
{% if form1.errors %}
- <p class="errors">
- <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br>
+ <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>
@@ -25,11 +25,11 @@
<li><span class="error">{{ form1.email.errors|join:", " }}</span></li>
{% endif %}
</ul>
- </p>
+ </div>
{% endif %}
{% if form2.errors %}
- <p class="errors">
- <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br>
+ <div class="errors">
+ <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
<ul class="error-list">
{% if form2.username.errors %}
<li><span class="error">{{ form2.username.errors|join:", " }}</span></li>
@@ -38,15 +38,15 @@
<li><span class="error">{{ form2.password.errors|join:", " }}</span></li>
{% endif %}
</ul>
- </p>
+ </div>
{% endif %}
<div class="login">
<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>
- <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
+ <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>
+ <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
</form>
</div>
<div class="login" style="display:none">
@@ -54,11 +54,11 @@
{{ form.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>
+ <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>
<!--todo double check translation from chinese 确认 = "Register" -->
<div class="submit-row">
- <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}">
+ <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/>
<a href="">{% trans "Forgot your password?" %}</a>
</div>
</fieldset>
diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index ba81dba4..383723ca 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -9,11 +9,11 @@
</div>
<div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br>
+{% 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>
{% if form.errors %}
-<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br>
+<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br/>
{% if form.username.errors %}
<span class="error">{{ form.username.errors|join:", " }}</span>
{% endif %}
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 9a1a6780..8601f6ee 100644
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -62,39 +62,39 @@
</div>
</li>
<li class="username first_tiny_li" title="MyOpenID user name">
- <img src="/content/jquery-openid/images/myopenid.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/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.ico" alt="icon" />
+ <img src="/content/jquery-openid/images/verisign-2.png" alt="icon" />
<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
</li>
</ul>
@@ -115,10 +115,9 @@
<div class="login">
<p style="display:none">{% trans "we support two login modes" %}</p>
<div style="display:none">
- <br>
{% if form1.errors %}
<p class="errors">
- <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br>
+ <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>
@@ -129,14 +128,13 @@
</ul>
</p>
{% endif %}
- <br>
<form name="fauth" action="{% url user_signin %}" method="post">
{{ form1.next }}
<fieldset class="fieldset" >
<legend class="big">{% trans "Use login name and password" %}</legend>
<div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div>
<div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div>
- <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}">
+ <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"/>
<a href="">{% trans "Forgot your password?" %}</a>
<a href="">{% trans "Create new account" %}</a></div>
</fieldset>
@@ -148,7 +146,6 @@
{% block sidebar %}
<div class="boxC">
<h3 class="subtitle">{% trans "Why use OpenID?" %}</h3>
- <p>
<ul class="list-item">
<li>
{% trans "with openid it is easier" %}
@@ -164,10 +161,10 @@
</li>
</ul>
- <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br>
+ <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>
- <br>
</div>
{% endblock%}
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html
index a65dafdc..5e405d3f 100644
--- a/templates/authopenid/signup.html
+++ b/templates/authopenid/signup.html
@@ -14,7 +14,7 @@
{% if form.errors %}
<p class="errors">
- <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br>
+ <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>
@@ -33,17 +33,15 @@
<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_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_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="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>
- <br >
</form>
- <br >
<div style="display:none">
<h2 class="signup">{% trans "Register with your OpenID" %}</h2>
<form name="fopenid" action="{% url user_signin %}" method="post">