From bfc3213f0591da036dea165992769b2ec862a309 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Mon, 6 Feb 2012 12:48:20 +0100
Subject: Show errors of "Change password" for local provider

When submitting the "Change your Askbot password" form previously, and
validation had an error (e.g. "Please choose password > 8 characters"),
the error was never displayed because the JavaScript always removed it.

Now, the error message is shown. The display can be improved though, as
the trailing span messes up the horizontal alignment of the input
fields.
---
 askbot/skins/common/media/jquery-openid/jquery.openid.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/askbot/skins/common/media/jquery-openid/jquery.openid.js b/askbot/skins/common/media/jquery-openid/jquery.openid.js
index 29b31b34..249413b9 100644
--- a/askbot/skins/common/media/jquery-openid/jquery.openid.js
+++ b/askbot/skins/common/media/jquery-openid/jquery.openid.js
@@ -193,7 +193,6 @@ $.fn.authenticator = function() {
             password_input_fields.hide();
         }
         reset_password_input_fields();
-        $('.error').remove();
         if (userIsAuthenticated === false){
             email_input_fields.hide();
             account_recovery_heading.hide();
@@ -210,13 +209,18 @@ $.fn.authenticator = function() {
         }
     };
 
+    var reset_form_and_errors = function(){
+        reset_form();
+        $('.error').remove();
+    }
+
     var set_provider_name = function(element){
         var provider_name = element.attr('name');
         provider_name_input.val(provider_name);
     };
 
     var show_openid_input_fields = function(provider_name){
-        reset_form();
+        reset_form_and_errors();
         var token_name = extra_token_name[provider_name]
         if (userIsAuthenticated){
             $('#openid-heading').html(
@@ -290,7 +294,7 @@ $.fn.authenticator = function() {
 
     var start_password_login_or_change = function(){
         //called upon clicking on one of the password login buttons 
-        reset_form();
+        reset_form_and_errors();
         set_provider_name($(this));
         var provider_name = $(this).attr('name');
         return setup_password_login_or_change(provider_name);
@@ -370,7 +374,7 @@ $.fn.authenticator = function() {
     };
 
     var start_account_recovery = function(){
-        reset_form();
+        reset_form_and_errors();
         account_recovery_hint.hide(); 
         account_recovery_heading.css('margin-bottom', '0px');
         account_recovery_heading.html(account_recovery_prompt_text).show();
-- 
cgit v1.2.3-1-g7c22


From 0e7cdff2e568520373f20db2fce8be73cc2b10ac Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Mon, 6 Feb 2012 12:56:01 +0100
Subject: Fix alignment of input fields with error messages on signin form

Because table.login is text-align: right, the horizontal alignment of
the input fields is broken when an error message is shown. By moving the
error messages into separate tds, this is fixed.
---
 askbot/skins/common/templates/authopenid/signin.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/askbot/skins/common/templates/authopenid/signin.html b/askbot/skins/common/templates/authopenid/signin.html
index 7fdbe203..30a576cc 100644
--- a/askbot/skins/common/templates/authopenid/signin.html
+++ b/askbot/skins/common/templates/authopenid/signin.html
@@ -117,6 +117,8 @@
                         <td><label for="id_new_password">{% trans %}New password{% endtrans %}</label></td>
                         <td>
                             {{login_form.new_password}}
+                        </td>
+                        <td>
                             <span class="error">{{login_form.new_password.errors[0]}}</span>
                         </td>
                     </tr>
@@ -124,6 +126,8 @@
                         <td><label for="id_new_password_retyped">{% trans %}Please, retype{% endtrans %}</label></td>
                         <td>
                             {{login_form.new_password_retyped}}
+                        </td>
+                        <td>
                             <span class="error">{{login_form.new_password_retyped.errors[0]}}</span>
                         </td>
                     </tr>
-- 
cgit v1.2.3-1-g7c22