partial fix of login problem when password form is always on

2 files changed, 16 insertions, 6 deletions

diff --git a/askbot/skins/default/media/jquery-openid/jquery.openid.js b/askbot/skins/default/media/jquery-openid/jquery.openid.js
index 4af89369..7ba9adce 100644
--- a/askbot/skins/default/media/jquery-openid/jquery.openid.js
+++ b/askbot/skins/default/media/jquery-openid/jquery.openid.js
@@ -298,9 +298,21 @@ $.fn.authenticator = function() {
     };
 
     var start_password_login_or_change = function(){
+        //called upon clicking on one of the password login buttons 
         reset_form();
         set_provider_name($(this));
         var provider_name = $(this).attr('name');
+        return setup_password_login_or_change(provider_name);
+    };
+
+    var init_always_visible_password_login = function(){
+        reset_form();
+        //will break wordpress and ldap
+        provider_name_input.val('local');
+        setup_password_login_or_change('local');
+    };
+
+    var setup_password_login_or_change = function(provider_name){
         var token_name = extra_token_name[provider_name]
         var password_action_input = $('input[name=password_action]');
         if (userIsAuthenticated === true){
@@ -427,6 +439,9 @@ $.fn.authenticator = function() {
     };
 
     setup_default_handlers();
+    if (askbot['settings']['signin_always_show_local_login'] === true){
+        init_always_visible_password_login();
+    }
     clear_password_fields();
     return this;
 };
diff --git a/askbot/skins/default/templates/authopenid/providers_javascript.html b/askbot/skins/default/templates/authopenid/providers_javascript.html
index 85e55e9f..0fe72eb3 100644
--- a/askbot/skins/default/templates/authopenid/providers_javascript.html
+++ b/askbot/skins/default/templates/authopenid/providers_javascript.html
@@ -34,13 +34,8 @@
     {% else %}
         var userIsAuthenticated = false;
     {% endif %}
-    $("body").authenticator();
-    {% if settings.SIGNIN_ALWAYS_SHOW_LOCAL_LOGIN %}
-        {% if settings.SIGNIN_LOCAL_ENABLED %}
-            $('input.password').remove();
-        {% endif %}
-    {%endif%}
     askbot['settings']['signin_always_show_local_login'] = {% if settings.SIGNIN_ALWAYS_SHOW_LOCAL_LOGIN %}true{% else %}false{% endif %};
+    $("body").authenticator();
 </script>
 {% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %}
 <div id="fb-root"></div>