removed paragraphs in forms, added show password function

diff --git a/core/js/js.js b/core/js/js.js
index 00618cb30cf23f66c40c141bb0edc78214efe217..9eff3815211ca5d853bb621cef83d7a92bd05f88 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -238,4 +238,123 @@ $(document).ready(function(){
                        }
                }
        });
+       
+       $('#pass2').showPassword();
 });
+
+
+
+
+/*
+*      @name                                                   Show Password
+*      @descripton                                             
+*      @version                                                1.3
+*      @requires                                               Jquery 1.5
+*
+*      @author                                                 Jan Jarfalk
+*      @author-email                                   jan.jarfalk@unwrongest.com
+*      @author-website                                 http://www.unwrongest.com
+*
+*      @special-thanks                                 Michel Gratton
+*
+*      @licens                                                 MIT License - http://www.opensource.org/licenses/mit-license.php
+*/
+(function($){
+     $.fn.extend({
+         showPassword: function(c) {   
+            
+            // Setup callback object
+                       var callback    = {'fn':null,'args':{}}
+                               callback.fn = c;
+                       
+                       // Clones passwords and turn the clones into text inputs
+                       var cloneElement = function( element ) {
+                               
+                               var $element = $(element);
+                                       
+                               $clone = $("<input />");
+                                       
+                               // Name added for JQuery Validation compatibility
+                               // Element name is required to avoid script warning.
+                               $clone.attr({
+                                       'type'          :       'text',
+                                       'class'         :       $element.attr('class'),
+                                       'style'         :       $element.attr('style'),
+                                       'size'          :       $element.attr('size'),
+                                       'name'          :       $element.attr('name')+'-clone',
+                                       'tabindex'      :       $element.attr('tabindex')
+                               });
+                                       
+                               return $clone;
+                       
+                       };
+                       
+                       // Transfers values between two elements
+                       var update = function(a,b){
+                               b.val(a.val());
+                       };
+                       
+                       // Shows a or b depending on checkbox
+                       var setState = function( checkbox, a, b ){
+                       
+                               if(checkbox.is(':checked')){
+                                       update(a,b);
+                                       b.show();
+                                       a.hide();
+                               } else {
+                                       update(b,a);
+                                       b.hide();
+                                       a.show();
+                               }
+                               
+                       };
+            
+            return this.each(function() {
+               
+               var $input                                      = $(this),
+                       $checkbox                               = $($input.data('typetoggle'));
+               
+               // Create clone
+                               var $clone = cloneElement($input);
+                                       $clone.insertAfter($input);
+                               
+                               // Set callback arguments
+               if(callback.fn){        
+                       callback.args.input             = $input;
+                       callback.args.checkbox  = $checkbox;
+                                       callback.args.clone     = $clone;
+               }
+                               
+
+                               
+                               $checkbox.bind('click', function() {
+                                       setState( $checkbox, $input, $clone );
+                               });
+                               
+                               $input.bind('keyup', function() {
+                                       update( $input, $clone )
+                               });
+                               
+                               $clone.bind('keyup', function(){ 
+                                       update( $clone, $input );
+                                       
+                                       // Added for JQuery Validation compatibility
+                                       // This will trigger validation if it's ON for keyup event
+                                       $input.trigger('keyup');
+                                       
+                               });
+                               
+                               // Added for JQuery Validation compatibility
+                               // This will trigger validation if it's ON for blur event
+                               $clone.bind('blur', function() { $input.trigger('focusout'); });
+                               
+                               setState( $checkbox, $input, $clone );
+                               
+                               if( callback.fn ){
+                                       callback.fn( callback.args );
+                               }
+
+            });
+        }
+    });
+})(jQuery);

diff --git a/settings/templates/index.php b/settings/templates/index.php
index 819b71c8943154afe451bbd645e717f4b8c00660..6e68cfa148cee16dfda1143374728c4962722136 100644 (file)
--- a/settings/templates/index.php
+++ b/settings/templates/index.php
@@ -11,21 +11,10 @@
                <legend><?php echo $l->t( 'Change Password' );?></legend>
                <div id="passwordchanged"><?php echo $l->t( 'Your password got changed');?></div>
                <div id="passworderror"></div>
-               <p>
-                       <label for="pass1"><?php echo $l->t( 'Old password:' );?></label>
-                       <input type="password" id="pass1" name="oldpassword" />
-               </p>
-               <p>
-                       <label for="pass2"><?php echo $l->t( 'New password' );?></label>
-                       <input type="password" id="pass2" name="password" />
-               </p>
-               <p>
-                       <input type="checkbox" id="show" name="show" />
-                       <label for="show"><?php echo $l->t( 'Show new password' );?></label>
-               </p>
-               <p class="form_footer">
-                       <input id="passwordbutton" class="prettybutton" type="submit" value="Save" />
-               </p>
+               <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Old password' );?>" />
+               <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t( 'New password' );?>" data-typetoggle="#show" />
+               <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t( 'show' );?></label>
+               <input id="passwordbutton" type="submit" value="Change password" />
        </fieldset>
 </form>
 
@@ -33,9 +22,8 @@
        <form id="openidform">
                <fieldset>
                        <legend><?php echo $l->t( 'OpenID' );?></legend>
-                       <p>OpenID identity for <b><?php echo OC_User::getUser();?></b></p>
-                       <p><input name='identity' id='identity' value='<?php echo $_['identity']; ?>'></input></p>
-                       <p><input type='submit' value='Save'></input></p>
+                       <input type="text" name='identity' id='identity' value="<?php echo $_['identity']; ?>" placeholder="OpenID for <?php echo OC_User::getUser();?>" />
+                       <input type="submit" value="Save" /></p>
                </fieldset>
        </form>
 <?php endif;?>