diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 1 | ||||
| -rw-r--r-- | core/js/js.js | 6 | ||||
| -rw-r--r-- | core/l10n/xgettextfiles | 8 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 3 |
4 files changed, 16 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 4a9fe016796..da64adbd14e 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -97,6 +97,7 @@ legend { padding:.2em; font-size:1.2em; } #navigation .subentry a { padding-left:3.1em; font-size:1em; } #navigation #settings { position:absolute; bottom:3.5em; width:100%; } #navigation #expand { margin:0 0 .2em 1.2em; cursor:pointer; } +#navigation #settings>span{padding-bottom:1em}; /* USER SETTINGS ------------------------------------------------------------ */ #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ddd; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } diff --git a/core/js/js.js b/core/js/js.js index 952c1b86ea9..aef3ad1acca 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -270,7 +270,11 @@ $(document).ready(function(){ $('#expand').click(function() { $('#settings li').slideToggle(); }); - + $('#expand').hover(function(){ + $('#navigation #settings>span').fadeIn(); + },function(){ + $('#navigation #settings>span').fadeOut(); + }) }); diff --git a/core/l10n/xgettextfiles b/core/l10n/xgettextfiles new file mode 100644 index 00000000000..932042b3370 --- /dev/null +++ b/core/l10n/xgettextfiles @@ -0,0 +1,8 @@ +../templates/404.php +../templates/installation.php +../templates/layout.guest.php +../templates/login.php +../templates/logout.php +../templates/part.pagenavi.php +../templates/part.searchbox.php +../../lib/app.php diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 2dce647873f..3b065ef6ede 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,7 +32,7 @@ <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a> <?php echo $_['searchbox']?> <ul id="metanav"> - <li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="Log out"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a></li> + <li><a 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></li> </ul> </div></header> @@ -52,6 +52,7 @@ </ul> <ul id="settings"> <img id="expand" class='svg' src="<?php echo image_path('', 'actions/settings.svg'); ?>" /> + <span style="display:none"><?php echo $l->t('Settings');?></span> <?php foreach($_['settingsnavigation'] as $entry):?> <li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li> <?php if( sizeof( $entry["subnavigation"] )): ?> |