Merge pull request #55 from robinst/change-password-errors

merge pull request by @robinst. Show validation errors on "Change your Askbot password" form.

2 files changed, 12 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();
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>