From b2768637d2748a1d55ee98a9809c66e135a4190a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sat, 13 Aug 2011 05:13:10 +0200 Subject: updated translations --- core/templates/installation.php | 8 ++++---- core/templates/layout.guest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/templates') diff --git a/core/templates/installation.php b/core/templates/installation.php index 4371c4b17b1..ebd726b4fb9 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -29,18 +29,18 @@ -

t( 'SQLite will be used.' ); ?>

+

SQLite t( 'will be used' ); ?>.

/> - + -

t( 'MySQL will be used.' ); ?>

+

MySQL t( 'will be used' ); ?>.

/> @@ -50,7 +50,7 @@ -

t( 'PostgreSQL will be used.' ); ?>

+

PostgreSQL t( 'will be used' ); ?>.

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 21388509f35..42c2539af13 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -35,6 +35,6 @@ - + -- cgit v1.2.3 From 9be059aced589bea38b7d8cf9553b32c9921dc66 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sat, 13 Aug 2011 05:31:56 +0200 Subject: removed subnavigation code --- core/templates/layout.user.php | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'core/templates') diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 81c0e73ea46..c0b347937cf 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -40,13 +40,6 @@ @@ -57,11 +50,6 @@ -- cgit v1.2.3 From 7bb261f81014b3f0abb2677f22289e6906ced749 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 14 Aug 2011 16:12:27 +0200 Subject: 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(-) (limited to 'core/templates') diff --git a/apps/user_openid/js/settings.js b/apps/user_openid/js/settings.js index b85ce2d3522..cfecd7b1cb4 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 b912ff1b79a..51c80e566b6 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 e2263685939..2f495321b86 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 c0b347937cf..2e70fa29389 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,9 +31,9 @@