fixed form issues on the signin and signup pages

4 files changed, 22 insertions, 16 deletions

diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py
index a7357fe8..132562d5 100644
--- a/askbot/conf/login_providers.py
+++ b/askbot/conf/login_providers.py
@@ -30,7 +30,7 @@ settings.register(
 )
 
 providers = (
-    'Local',
+    'local',
     'AOL',
     'Blogger',
     'ClaimID',
@@ -44,7 +44,7 @@ providers = (
     'Technorati',
     'Wordpress',
     'Vidoop',
-    'Verisign'
+    'Verisign',
     'Yahoo',
 )
 
diff --git a/askbot/skins/default/templates/authopenid/macros.html b/askbot/skins/default/templates/authopenid/macros.html
index 6e80658c..534fb42f 100644
--- a/askbot/skins/default/templates/authopenid/macros.html
+++ b/askbot/skins/default/templates/authopenid/macros.html
@@ -17,7 +17,6 @@
                     settings = None
                 )
 %}
-<form id="signin-form" method="post" action="{% url user_signin %}">
     {{login_form.login_provider_name}}
     {{ login_form.next }}
     <div id="login-icons">
@@ -53,5 +52,4 @@
         <input type="text" name="openid_login_token" />
         <input class="submit-b" type="submit" name="openid_login_with_extra_token" value="{% trans %}Sign in{% endtrans %}"/>
     </fieldset> 
-</form>
 {% endmacro %}
diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html
index a91aa07d..aa67c95f 100644
--- a/askbot/skins/default/templates/authopenid/signin.html
+++ b/askbot/skins/default/templates/authopenid/signin.html
@@ -44,13 +44,18 @@
         <p class="warning">{{ openid_error_message }}</p>

     {% endif %}

     {% if view_subtype != 'email_sent' and view_subtype != 'bad_key' %}

-        {# in this branch we display the login icons #}

+    <form id="signin-form" method="post" action="{% url user_signin %}">

+        {# in this branch - the real signin view we display the login icons

+            here we hide the local login button only if admin

+            wants to always show the password login form - then

+            the button is useless.

+        #}

         {{ 

             login_macros.provider_buttons(

                 login_form = login_form,

                 major_login_providers = major_login_providers,

                 minor_login_providers = minor_login_providers,

-                hide_local_login = True,

+                hide_local_login = settings.SIGNIN_ALWAYS_SHOW_LOCAL_LOGIN,

                 settings = settings

             )

         }}

@@ -114,7 +119,6 @@
             {% endif %}

         </fieldset>

         {% endif %}

-        </form>

         {% if user.is_authenticated() and existing_login_methods %}

         <div 

             id='existing-login-methods'

@@ -149,6 +153,7 @@
             </table>

         </div>

         {% endif %}

+    </form>

     {% endif %}

     {% if view_subtype != 'email_sent' or view_subtype == 'bad_key' %}

         {% if user.is_anonymous() %}

diff --git a/askbot/skins/default/templates/authopenid/signup_with_password.html b/askbot/skins/default/templates/authopenid/signup_with_password.html
index 7f024c05..d85f8671 100644
--- a/askbot/skins/default/templates/authopenid/signup_with_password.html
+++ b/askbot/skins/default/templates/authopenid/signup_with_password.html
@@ -8,15 +8,18 @@
 {% block content %}
 {% if settings.PASSWORD_REGISTER_SHOW_PROVIDER_BUTTONS == True %}
     <h1>{% trans %}Please register by clicking on any of the icons below{% endtrans %}</h1>
-    {{ 
-        login_macros.provider_buttons(
-            login_form = login_form,
-            major_login_providers = major_login_providers,
-            minor_login_providers = minor_login_providers,
-            hide_local_login = True,
-            settings = settings
-        )
-    }}
+    <form id="signin-form" method="post" action="{% url user_signin %}">
+        {# hide_local_login == True because it is password reg form #}
+        {{ 
+            login_macros.provider_buttons(
+                login_form = login_form,
+                major_login_providers = major_login_providers,
+                minor_login_providers = minor_login_providers,
+                hide_local_login = True,
+                settings = settings
+            )
+        }}
+    </form>
     <h2>{% trans %}or create a new user name and password here{% endtrans %}</h2>
 {% else %}
     <h1>{% trans %}Create login name and password{% endtrans %}</h1>