diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/js/js.js | 14 | ||||
-rw-r--r-- | core/templates/layout.user.php | 4 |
2 files changed, 12 insertions, 6 deletions
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 @@ <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <form class="searchbox" action="#" method="post"> - <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" autocomplete="off" /> + <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" /> </form> - <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="<?php echo $l->t('Log out');?>"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> + <a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> </div></header> <nav><div id="navigation"> |