13 files changed, 65 insertions, 10 deletions

diff --git a/templates/content/jquery-openid/images/blogger-1.png b/templates/content/jquery-openid/images/blogger-1.png
new file mode 100644
index 00000000..8b360ea5
--- /dev/null
+++ b/templates/content/jquery-openid/images/blogger-1.png
diff --git a/templates/content/jquery-openid/images/claimid-0.png b/templates/content/jquery-openid/images/claimid-0.png
new file mode 100644
index 00000000..4a0ea1b3
--- /dev/null
+++ b/templates/content/jquery-openid/images/claimid-0.png
diff --git a/templates/content/jquery-openid/images/flickr.png b/templates/content/jquery-openid/images/flickr.png
new file mode 100644
index 00000000..142405a6
--- /dev/null
+++ b/templates/content/jquery-openid/images/flickr.png
diff --git a/templates/content/jquery-openid/images/livejournal-1.png b/templates/content/jquery-openid/images/livejournal-1.png
new file mode 100644
index 00000000..e6436081
--- /dev/null
+++ b/templates/content/jquery-openid/images/livejournal-1.png
diff --git a/templates/content/jquery-openid/images/local-login.png b/templates/content/jquery-openid/images/local-login.png
new file mode 100644
index 00000000..258cedac
--- /dev/null
+++ b/templates/content/jquery-openid/images/local-login.png
diff --git a/templates/content/jquery-openid/images/myopenid-2.png b/templates/content/jquery-openid/images/myopenid-2.png
new file mode 100644
index 00000000..f64fb8e8
--- /dev/null
+++ b/templates/content/jquery-openid/images/myopenid-2.png
diff --git a/templates/content/jquery-openid/images/openidico16.png b/templates/content/jquery-openid/images/openidico16.png
new file mode 100644
index 00000000..ad718ac5
--- /dev/null
+++ b/templates/content/jquery-openid/images/openidico16.png
diff --git a/templates/content/jquery-openid/images/technorati-1.png b/templates/content/jquery-openid/images/technorati-1.png
new file mode 100644
index 00000000..f7195240
--- /dev/null
+++ b/templates/content/jquery-openid/images/technorati-1.png
diff --git a/templates/content/jquery-openid/images/verisign-2.png b/templates/content/jquery-openid/images/verisign-2.png
new file mode 100644
index 00000000..c1467008
--- /dev/null
+++ b/templates/content/jquery-openid/images/verisign-2.png
diff --git a/templates/content/jquery-openid/images/vidoop.png b/templates/content/jquery-openid/images/vidoop.png
new file mode 100644
index 00000000..032c9e98
--- /dev/null
+++ b/templates/content/jquery-openid/images/vidoop.png
diff --git a/templates/content/jquery-openid/images/wordpress.png b/templates/content/jquery-openid/images/wordpress.png
new file mode 100644
index 00000000..ee29f0cf
--- /dev/null
+++ b/templates/content/jquery-openid/images/wordpress.png
diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js
index eec29ab2..763af2c6 100644
--- a/templates/content/jquery-openid/jquery.openid.js
+++ b/templates/content/jquery-openid/jquery.openid.js
@@ -13,6 +13,7 @@ $.fn.openid = function() {
   var $end = $this.find('p:has(input[name=openid_username])>span:eq(1)');
 
   //needed for special effects only
+  var $localfs = $this.find('fieldset:has(input[name=username])');
   var $usrfs = $this.find('fieldset:has(input[name=openid_username])');
   var $idfs = $this.find('fieldset:has(input[name=openid_url])');
 
@@ -33,11 +34,23 @@ $.fn.openid = function() {
     return true;
 
   };
+  var local = function() {
+    var $li = $(this);
+    $('#openid_form .providers li').removeClass('highlight');
+    $li.addClass('highlight');
+    $usrfs.hide();
+    $idfs.hide();
+    $localfs.show();
+    $this.unbind('submit').submit(submitid);
+    return false;
+  };
+
   var direct = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.fadeOut('slow');
+    $localfs.fadeOut('slow');
     $idfs.fadeOut('slow');
     $id.val($this.find("li.highlight span").text());
     setTimeout(function(){$('#bsignin').click()},1000);
@@ -46,9 +59,10 @@ $.fn.openid = function() {
 
   var openid = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
+    $localfs.hide();
     $idfs.show();
     $id.focus();
     $this.unbind('submit').submit(submitid);
@@ -57,9 +71,10 @@ $.fn.openid = function() {
 
   var username = function() {
     var $li = $(this);
-    $li.parent().find('li').removeClass('highlight');
+    $('#openid_form .providers li').removeClass('highlight');
     $li.addClass('highlight');
     $idfs.hide();
+    $localfs.hide();
     $usrfs.show();
     $this.find('#enter_your_what').text($li.attr("title"));
     $front.text($li.find("span").text().split("username")[0]);
@@ -69,6 +84,7 @@ $.fn.openid = function() {
     return false;
   };
 
+  $this.find('li.local').click(local);
   $this.find('li.direct').click(direct);
   $this.find('li.openid').click(openid);
   $this.find('li.username').click(username);
@@ -84,6 +100,9 @@ $.fn.openid = function() {
   });
   $this.find('li span').hide();
   $this.find('li').css('line-height', 0).css('cursor', 'pointer');
+  $usrfs.hide();
+  $idfs.hide();
+  $localfs.hide();
   $this.find('li:eq(0)').click();
 
   return this;
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index e53c1823..88960b56 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -1,26 +1,49 @@
-fieldset {border-style:none;}
+fieldset { border-style:none; }
 img {border-style:none;}
 
-.logo_box {width:90px;height:40px;background:white;border:1px solid #dddddd;}
+.logo_box {display:inline-block;float:left;width:90px;height:40px;background:white;border:1px solid #dddddd;}
 .openid_box img {margin-top:6px;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
 .google_box img {margin-top:6px;}
+.local_login_box img {margin-top:2px;margin-left:-3px;}
 
 form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
-form.openid ul li {float:left; padding:4px;} 
+form.openid ul li {float:left; padding:4px;display:inline-block;} 
+form.openid ul li div {display:inline-block;} 
 form.openid ul li span {padding:0 1em 0 3px}
 form.openid ul li.first_tiny_li {clear:left;}
 form.openid fieldset {clear:both;padding:10px 0px 0px 0px;}
 form.openid div+fieldset {display:none}
-form.openid label {display:block; font-weight:bold; margin-bottom:.5em}
+form.openid label {display:block; font-weight:bold;}
 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 fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
-                          background: #DCDCDC;
-						  padding:10px;display:inline-block}
+form.openid fieldset div {
+    -moz-border-radius:4px; 
+    -webkit-border-radius:4px; 
+    background: #DCDCDC;
+    padding:10px;
+    display:inline-block;
+    float:left;
+}
+form.openid p {margin-bottom:4px;}
 form.openid fieldset div p {padding:0px;margin:0px;}
+form.openid fieldset div p.login {padding:0px;margin:0 0 10px 0;}
+form.openid label {
+    display:inline-block;
+    font-weight:normal;
+    width:6em;
+    text-align:right;
+}
+#local_login_fs div {
+    padding-bottom:4px;
+}
+#local_login_buttons {
+    text-align:center;
+    line-height:1.8em;
+    margin-top:3px;
+}
 /*form.openid input[type='submit'] {margin-left:1em;}*/
 #openid_username {background:#ffffa0;}
 #openid_url {background:#ffffa0;}
@@ -31,3 +54,16 @@ background: url(images/openidico.png) no-repeat;
 
 #openid_login {float:left; width:30%; margin:2em 1em; text-align:center}
 #openid_login div{margin-top:0.5em}
+
+form.openid ul.errorlist {
+    border: none;
+    list-style-position:inside;
+    list-style-type: disc;
+    margin-bottom:5px;
+}
+form.openid ul.errorlist li {
+    text-align: left;
+    margin: 5px;
+    float: none;
+    color:blue;
+}