Commits

Robert Kern  committed 960aca1

BUG: Fix some CSS issues with the OpenID selector and Solace's error reporting.
(transplanted from d3a156b2abeafbf03cab1dfd818441bfc4810c13)

  • Participants
  • Parent commits 152938c

Comments (0)

Files changed (3)

File solace/static/jquery.openid.js

     $idfs.fadeOut();
 
     $this.unbind('submit').submit(function() {
-        console.log($this.find("li.highlight span").text());
-      $id.val($this.find("li.highlight span").text());
+      $id.val($this.find("ul.providers li.highlight span span").text());
     });
-    console.log($this);
     $this.submit();
     return false;
   };
     return false;
   };
 
-  $this.find('li.direct').click(direct);
-  $this.find('li.openid').click(openid);
-  $this.find('li.username').click(username);
+  $this.find('ul.providers li.direct').click(direct);
+  $this.find('ul.providers li.openid').click(openid);
+  $this.find('ul.providers li.username').click(username);
   $id.keypress(function(e) {
     if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
       return submitid();
       return submitusr();
     }
   });
-  $this.find('li span').hide();
-  $this.find('li').css('line-height', 0).css('cursor', 'pointer');
-  $this.find('li:eq(0)').click();
+  $this.find('ul.providers li span').hide();
+  $this.find('ul.providers li').css('line-height', 0).css('cursor', 'pointer');
+  $this.find('ul.providers li:eq(0)').click();
   return this;
 };

File solace/static/openid.css

 fieldset {border-style:none;}
 img {border-style:none;}
 
-form.openid ul { text-align:center; list-style-type:none; display:inline;}
-form.openid ul li {float:left; padding:4px}
-form.openid ul li span {padding:0 1em 0 3px}
+form.openid ul.providers { text-align:center; list-style-type:none; display:inline;}
+form.openid ul.providers li {float:left; padding:4px}
+form.openid ul.providers li span {padding:0 1em 0 3px}
 form.openid fieldset {clear:both; padding:1em 0}
 form.openid div+fieldset {display:none}
 form.openid label {display:block; font-weight:bold; font-size:larger; margin-bottom:.5em}
 input[name=openid_username] {width:8em}
 input[name=openid_identifier] {width:18em}
-form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; background-color: #FD6}
+form.openid ul.providers li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; background-color: #FD6}
 form.openid fieldset div {font-family:arial;-moz-border-radius:4px; -webkit-border-radius:4px; 
                           background: #DCDCDC url(images/fadegrey.png); padding:10px;display:inline-block}
 form.openid input[type='submit'] {margin-left:1em;}

File solace/templates/core/login_openid.html

 {% block body %}
   <h1>{{ _('Login with OpenID') }}</h1>
   <p>{% trans -%}
-    Enter your OpenID URL to login.
+    <a href="http://openid.net/">OpenID</a> is a way to share a single login
+    between different websites. Chances are, you are already using a web service
+    that provides you with an OpenID. If you do, click its button below or enter
+    the URL of your OpenID if you know it. If you don’t already have an OpenID,
+    <a href="http://openid.net/get-an-openid/">find out how to get one for free
+      here</a>. After you have submitted your OpenID, you will be redirected to
+    your provider’s site for authentication and then returned here.
   {%- endtrans %}
   {% call form(class="openid") %}
-  <div><ul class="providers"> 
-          <li class="openid" title="OpenID"><img src="{{ url_for('static', file='images/openidW.png') }}" alt="icon" /> 
-  <span><strong>http://{your-openid-url}</strong></span></li> 
-  <li class="direct" title="Google"> 
-		<img src="{{ url_for('static', file='images/googleW.png') }}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span></li> 
-  <li class="direct" title="Yahoo"> 
-		<img src="{{ url_for('static', file='images/yahooW.png') }}" alt="icon" /><span>http://yahoo.com/</span></li> 
-  <li class="username" title="AOL screen name"> 
-		<img src="{{ url_for('static', file='images/aolW.png') }}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span></li> 
-  <li class="username" title="MyOpenID user name"> 
-		<img src="{{ url_for('static', file='images/myopenid.png') }}" alt="icon" /><span>http://<strong>username</strong>.myopenid.com/</span></li> 
-  <li class="username" title="Flickr user name"> 
-		<img src="{{ url_for('static', file='images/flickr.png') }}" alt="icon" /><span>http://flickr.com/<strong>username</strong>/</span></li> 
-  <li class="username" title="Technorati user name"> 
-		<img src="{{ url_for('static', file='images/technorati.png') }}" alt="icon" /><span>http://technorati.com/people/technorati/<strong>username</strong>/</span></li> 
-  <li class="username" title="Wordpress blog name"> 
-		<img src="{{ url_for('static', file='images/wordpress.png') }}" alt="icon" /><span>http://<strong>username</strong>.wordpress.com</span></li> 
-  <li class="username" title="Blogger blog name"> 
-		<img src="{{ url_for('static', file='images/blogger.png') }}" alt="icon" /><span>http://<strong>username</strong>.blogspot.com/</span></li> 
-  <li class="username" title="LiveJournal blog name"> 
-		<img src="{{ url_for('static', file='images/livejournal.png') }}" alt="icon" /><span>http://<strong>username</strong>.livejournal.com</span></li> 
-  <li class="username" title="ClaimID user name"> 
-		<img src="{{ url_for('static', file='images/claimid.png') }}" alt="icon" /><span>http://claimid.com/<strong>username</strong></span></li> 
-  <li class="username" title="Vidoop user name"> 
-		<img src="{{ url_for('static', file='images/vidoop.png') }}" alt="icon" /><span>http://<strong>username</strong>.myvidoop.com/</span></li> 
-  <li class="username" title="Verisign user name"> 
-		<img src="{{ url_for('static', file='images/verisign.png') }}" alt="icon" /><span>http://<strong>username</strong>.pip.verisignlabs.com/</span></li> 
+  <div>
+  <ul class="providers"> 
+    <li class="openid" title="OpenID">
+      <img src="{{ url_for('static', file='images/openidW.png') }}" alt="icon" /> 
+      <span><strong>http://{your-openid-url}</strong></span></li> 
+    <li class="direct" title="Google"> 
+      <img src="{{ url_for('static', file='images/googleW.png') }}" alt="icon" />
+      <span>https://www.google.com/accounts/o8/id</span></li> 
+    <li class="direct" title="Yahoo"> 
+      <img src="{{ url_for('static', file='images/yahooW.png') }}" alt="icon" />
+      <span>http://yahoo.com/</span></li> 
+    <li class="username" title="AOL screen name"> 
+      <img src="{{ url_for('static', file='images/aolW.png') }}" alt="icon" />
+      <span>http://openid.aol.com/<strong>username</strong></span></li> 
+    <li class="username" title="MyOpenID user name"> 
+      <img src="{{ url_for('static', file='images/myopenid.png') }}" alt="icon" />
+      <span>http://<strong>username</strong>.myopenid.com/</span></li> 
+    <li class="username" title="Flickr user name"> 
+      <img src="{{ url_for('static', file='images/flickr.png') }}" alt="icon" />
+      <span>http://flickr.com/<strong>username</strong>/</span></li> 
+    <li class="username" title="Technorati user name"> 
+      <img src="{{ url_for('static', file='images/technorati.png') }}" alt="icon" />
+      <span>http://technorati.com/people/technorati/<strong>username</strong>/</span></li> 
+    <li class="username" title="Wordpress blog name"> 
+      <img src="{{ url_for('static', file='images/wordpress.png') }}" alt="icon" />
+      <span>http://<strong>username</strong>.wordpress.com</span></li> 
+    <li class="username" title="Blogger blog name"> 
+      <img src="{{ url_for('static', file='images/blogger.png') }}" alt="icon" />
+      <span>http://<strong>username</strong>.blogspot.com/</span></li> 
+    <li class="username" title="LiveJournal blog name"> 
+      <img src="{{ url_for('static', file='images/livejournal.png') }}" alt="icon" />
+      <span>http://<strong>username</strong>.livejournal.com</span></li> 
+    <li class="username" title="ClaimID user name"> 
+      <img src="{{ url_for('static', file='images/claimid.png') }}" alt="icon" />
+      <span>http://claimid.com/<strong>username</strong></span></li> 
+    <li class="username" title="Vidoop user name"> 
+      <img src="{{ url_for('static', file='images/vidoop.png') }}" alt="icon" />
+      <span>http://<strong>username</strong>.myvidoop.com/</span></li> 
+    <li class="username" title="Verisign user name"> 
+      <img src="{{ url_for('static', file='images/verisign.png') }}" alt="icon" />
+      <span>http://<strong>username</strong>.pip.verisignlabs.com/</span></li> 
   </ul></div> 
 
   <fieldset>