From ebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: 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

---
 templates/authopenid/signin.html | 70 ++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 39 deletions(-)

(limited to 'templates/authopenid/signin.html')

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%}
-- 
cgit v1.2.3-1-g7c22