diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-09-11 00:37:38 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-09-11 00:37:38 +0000 |
| commit | 0a5c95af4391595c94aa4f61b3eac6af602652f9 (patch) | |
| tree | cf93a501cedd78cf88feda819c782639290fe936 | |
| parent | fc755aed2f3fe2689e3ba45b245484c3343cbbde (diff) | |
| download | brdo-0a5c95af4391595c94aa4f61b3eac6af602652f9.tar.gz brdo-0a5c95af4391595c94aa4f61b3eac6af602652f9.tar.bz2 | |
#555712 by TheRec: Moved shortcut bar collapse icon to the left side so it's more easily accessible and 'Log out' is no longer mistakenly clicked.
| -rw-r--r-- | modules/toolbar/toolbar.css | 11 | ||||
| -rw-r--r-- | modules/toolbar/toolbar.js | 3 | ||||
| -rw-r--r-- | modules/toolbar/toolbar.tpl.php | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css index e64d353cc..086378eb8 100644 --- a/modules/toolbar/toolbar.css +++ b/modules/toolbar/toolbar.css @@ -76,7 +76,7 @@ div#toolbar div.toolbar-menu { div#toolbar div.toolbar-menu #toolbar-user { position: absolute; - right: 35px; + right: 10px; } div#toolbar div.toolbar-menu #toolbar-menu { @@ -84,9 +84,16 @@ div#toolbar div.toolbar-menu #toolbar-menu { left: 10px; } +/** + * Give space for the shortcuts visibility toggling element when it is added. + */ +div#toolbar.toolbar-processed div.toolbar-menu #toolbar-menu { + left: 45px; +} + div#toolbar div.toolbar-menu span.toggle { position: absolute; - right: 10px; + left: 10px; cursor: pointer; background: url(toolbar.png) 0 -60px no-repeat; text-indent: -9999px; diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js index c2653d91a..61bfb91d4 100644 --- a/modules/toolbar/toolbar.js +++ b/modules/toolbar/toolbar.js @@ -10,6 +10,9 @@ Drupal.behaviors.admin = { // Set the intial state of the toolbar. $('#toolbar', context).once('toolbar', Drupal.admin.toolbar.init); + // Add the toggling element for shortcuts visibility. + $('#toolbar div.toolbar-menu').prepend('<span class="toggle toggle-active"><a href="#">' + Drupal.t('Show shortcuts') + '</a></span>'); + // Toggling of admin shortcuts visibility. $('#toolbar span.toggle', context).once('toolbar-toggle').click(function() { Drupal.admin.toolbar.toggle(); diff --git a/modules/toolbar/toolbar.tpl.php b/modules/toolbar/toolbar.tpl.php index 8a68998af..0da130872 100644 --- a/modules/toolbar/toolbar.tpl.php +++ b/modules/toolbar/toolbar.tpl.php @@ -16,7 +16,6 @@ ?> <div id="toolbar" class="clearfix"> <div class="toolbar-menu clearfix"> - <span class="toggle toggle-active"><?php print t('Show shortcuts'); ?></span> <?php print render($toolbar['toolbar_menu']); ?> <?php print render($toolbar['toolbar_user']); ?> </div> |