Fixing bugs, adding evgeny's changes

Conflicts:
	django_authopenid/urls.py
	templates/authopenid/sendpw.html
	templates/authopenid/signin.html

5 files changed, 38 insertions, 1 deletions

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/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/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js
index eec29ab2..6486fd39 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);
+    $li.parent().find('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');
     $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);
@@ -49,6 +62,7 @@ $.fn.openid = function() {
     $li.parent().find('li').removeClass('highlight');
     $li.addClass('highlight');
     $usrfs.hide();
+    $localfs.hide();
     $idfs.show();
     $id.focus();
     $this.unbind('submit').submit(submitid);
@@ -60,6 +74,7 @@ $.fn.openid = function() {
     $li.parent().find('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 6c59192f..2ec8adf4 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -6,6 +6,7 @@ img {border-style:none;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
 .google_box img {margin-top:6px;}
+.local_login_box img {margin-top:9px;}
 
 form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
 form.openid ul li {float:left; padding:4px;} 
@@ -20,7 +21,22 @@ form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px;
 form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
                           background: #DCDCDC;
 						  padding:10px;display:inline-block}
+form.openid p {margin-bottom:4px;}
 form.openid fieldset div p {padding:0px;margin:0px;}
+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;}
diff --git a/templates/content/style/style.css b/templates/content/style/style.css
index 6d48198b..0fb96c7f 100644
--- a/templates/content/style/style.css
+++ b/templates/content/style/style.css
@@ -1093,7 +1093,9 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p
 	color:#d64000;
 	font-weight:bold;
 }
-
+.grey {
+    color:#808080;
+}
 .about div {
     padding:10px 5px 10px 5px;
     border-top:1px dashed #aaaaaa;