summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-01-07 11:03:18 +0000
committerDries Buytaert <dries@buytaert.net>2010-01-07 11:03:18 +0000
commit646a5b43e563572705e1ae4b1714137b0d91744b (patch)
treec86f2a2c0206094154ac778b48b2fe156bf185ad
parent176f86958c8b8513f09f09eeaec6eb05cb67777f (diff)
downloadbrdo-646a5b43e563572705e1ae4b1714137b0d91744b.tar.gz
brdo-646a5b43e563572705e1ae4b1714137b0d91744b.tar.bz2
- Patch #663906 by casey, Bojhan: visual tweaks to the 'edit shortcuts' link.
-rw-r--r--modules/shortcut/shortcut.css10
-rw-r--r--modules/shortcut/shortcut.module8
2 files changed, 13 insertions, 5 deletions
diff --git a/modules/shortcut/shortcut.css b/modules/shortcut/shortcut.css
index 3cb92652b..f7cb6fcb9 100644
--- a/modules/shortcut/shortcut.css
+++ b/modules/shortcut/shortcut.css
@@ -1,6 +1,14 @@
/* $Id$ */
-div#toolbar a#toolbar-customize {
+div#toolbar a#edit-shortcuts {
float: right;
+ padding: 10px 10px 10px 5px;
+ line-height: 30px;
+ color: #bbb;
+}
+div#toolbar a#edit-shortcuts:focus,
+div#toolbar a#edit-shortcuts:hover,
+div#toolbar a#edit-shortcuts.active {
+ color: #fff;
}
div#toolbar div.toolbar-shortcuts ul {
diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module
index 61ce8ae36..00c40597f 100644
--- a/modules/shortcut/shortcut.module
+++ b/modules/shortcut/shortcut.module
@@ -28,12 +28,12 @@ function shortcut_help($path, $arg) {
$output .= '<dt>' . t('Adding and removing shortcuts') . '</dt>';
$output .= '<dd>' . t('The Shortcut module creates an add/remove link for each page on your site; the link lets you add or remove the current page from the currently-enabled set of shortcuts (if your theme displays it). The core Seven administration theme displays this link next to the page title, as a small + or - sign. If you click on the + sign, you will add that page to your preferred set of shortcuts. If the page is already part of your shortcut set, the link will be a - sign, and will allow you to remove the current page from your shortcut set.') . '</dd>';
$output .= '<dt>' . t('Displaying shortcuts') . '</dt>';
- $output .= '<dd>' . t('You can display your shortcuts by enabling the Shortcuts block on the <a href="@blocks">Blocks administration page</a>. Certain administrative modules also display your shortcuts; for example, the core <a href="@toolbar-help">Toolbar module</a> displays them near the top of the page, along with an <em>edit shortcuts</em> link.', array('@blocks' => url('admin/structure/block'), '@toolbar-help' => url('admin/help/toolbar'))) . '</dd>';
+ $output .= '<dd>' . t('You can display your shortcuts by enabling the Shortcuts block on the <a href="@blocks">Blocks administration page</a>. Certain administrative modules also display your shortcuts; for example, the core <a href="@toolbar-help">Toolbar module</a> displays them near the top of the page, along with an <em>Edit shortcuts</em> link.', array('@blocks' => url('admin/structure/block'), '@toolbar-help' => url('admin/help/toolbar'))) . '</dd>';
$output .= '</dl>';
return $output;
}
}
-
+
/**
* Implements hook_permission().
*/
@@ -595,9 +595,9 @@ function shortcut_toolbar_pre_render($toolbar) {
if (shortcut_set_edit_access($shortcut_set)) {
$configure_link = array(
'#type' => 'link',
- '#title' => t('edit shortcuts'),
+ '#title' => t('Edit shortcuts'),
'#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name,
- '#options' => array('attributes' => array('id' => 'toolbar-customize')),
+ '#options' => array('attributes' => array('id' => 'edit-shortcuts')),
);
}