Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #663906 by casey, Bojhan: visual tweaks to the 'edit shortcuts' link.

merge-requests/26/head
Dries Buytaert 2010-01-07 11:03:18 +00:00
parent 176f86958c
commit 646a5b43e5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/shortcut/shortcut.css
View File

@ -1,6 +1,14 @@
/* $Id$ */ /* $Id$ */
div#toolbar a#toolbar-customize { div#toolbar a#edit-shortcuts {
float: right; 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 { div#toolbar div.toolbar-shortcuts ul {

8
modules/shortcut/shortcut.module
View File

@ -28,12 +28,12 @@ function shortcut_help($path, $arg) {
$output .= '<dt>' . t('Adding and removing shortcuts') . '</dt>'; $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 .= '<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 .= '<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>'; $output .= '</dl>';
return $output; return $output;
} }
} }
/** /**
* Implements hook_permission(). * Implements hook_permission().
*/ */
@ -595,9 +595,9 @@ function shortcut_toolbar_pre_render($toolbar) {
if (shortcut_set_edit_access($shortcut_set)) { if (shortcut_set_edit_access($shortcut_set)) {
$configure_link = array( $configure_link = array(
'#type' => 'link', '#type' => 'link',
'#title' => t('edit shortcuts'), '#title' => t('Edit shortcuts'),
'#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name, '#href' => 'admin/config/system/shortcut/' . $shortcut_set->set_name,
'#options' => array('attributes' => array('id' => 'toolbar-customize')), '#options' => array('attributes' => array('id' => 'edit-shortcuts')),
); );
} }