From 7bb261f81014b3f0abb2677f22289e6906ced749 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 14 Aug 2011 16:12:27 +0200 Subject: [PATCH] more fixes for Personal and Tipsy --- apps/user_openid/js/settings.js | 10 +++++++++- apps/user_openid/templates/settings.php | 6 ++---- core/js/js.js | 14 ++++++++++---- core/templates/layout.user.php | 4 ++-- files/js/files.js | 4 ---- settings/css/settings.css | 2 ++ settings/js/personal.js | 8 ++++++++ settings/templates/personal.php | 11 +++++------ 8 files changed, 38 insertions(+), 21 deletions(-) diff --git a/apps/user_openid/js/settings.js b/apps/user_openid/js/settings.js index b85ce2d352..cfecd7b1cb 100644 --- a/apps/user_openid/js/settings.js +++ b/apps/user_openid/js/settings.js @@ -1,5 +1,5 @@ $(document).ready(function(){ - $('#openidform input').blur(function(event){ + $('#openidform #identity').blur(function(event){ event.preventDefault(); var post = $( "#openidform" ).serialize(); $.post( 'ajax/openid.php', post, function(data){ @@ -9,4 +9,12 @@ $(document).ready(function(){ } }); }); + + // reset value when edited, workaround because of .select() not working with disabled inputs + $('#openid').focus(function(event){ + openidValue = $('#openid').val(); + }); + $('#openid').blur(function(event){ + $('#openid').val(openidValue); + }); }); diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php index b912ff1b79..51c80e566b 100644 --- a/apps/user_openid/templates/settings.php +++ b/apps/user_openid/templates/settings.php @@ -1,9 +1,7 @@
-

OpenID - " title="OpenID"> -

- + +
diff --git a/core/js/js.js b/core/js/js.js index e226368593..2f495321b8 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -299,15 +299,21 @@ $(document).ready(function(){ } }); + // all the tipsy stuff needs to be here (in reverse order) to work + $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); + $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); $('.remove .action').tipsy({gravity:'se', fade:true, live:true}); $('.date .action').tipsy({gravity:'se', fade:true, live:true}); $('.action').tipsy({gravity:'s', fade:true, live:true}); $('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true}); $('.selectedActions a').tipsy({gravity:'n', fade:true, live:true}); - $('input').each(function(i,input) { - if($(input).attr('title')) { - $(input).tipsy({gravity:'w', fade:true}); - } + $('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true}); + $('td.filesize').tipsy({gravity:'s', fade:true, live:true}); + $('td .modified').tipsy({gravity:'s', fade:true, live:true}); + + $('input').tipsy({gravity:'w', fade:true}); + $('input[type=text]').focus(function(){ + this.select(); }); }); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index c0b347937c..2e70fa2938 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,9 +31,9 @@