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

#645140 by casey: Remove inter-dependency between Shortcut and Toolbar.

merge-requests/26/head
Angie Byron 2010-01-07 07:57:09 +00:00
parent 436ddca9fb
commit 1c20428a4b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/shortcut/shortcut.module
View File

@ -560,6 +560,7 @@ function shortcut_preprocess_page(&$variables) {
}
$variables['title_suffix']['add_or_remove_shortcut'] = array(
'#attached' => array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css')),
'#prefix' => '<div class="add-or-remove-shortcuts ' . $link_mode . '-shortcut">',
'#type' => 'link',
'#title' => '<span class="icon"></span><span class="text">' . $link_text . '</span>',

4
modules/toolbar/toolbar.js
View File

@ -53,7 +53,7 @@ Drupal.admin.toolbar.collapse = function() {
.removeClass('toggle-active')
.attr('title', toggle_text)
.html(toggle_text);
$('body').removeClass('toolbar-drawer');
$('body').removeClass('toolbar-drawer').css('paddingTop', $('#toolbar').outerHeight());
$.cookie(
'Drupal.admin.toolbar.collapsed',
1,
@ -75,7 +75,7 @@ Drupal.admin.toolbar.expand = function() {
.addClass('toggle-active')
.attr('title', toggle_text)
.html(toggle_text);
$('body').addClass('toolbar-drawer');
$('body').addClass('toolbar-drawer').css('paddingTop', $('#toolbar').outerHeight());
$.cookie(
'Drupal.admin.toolbar.collapsed',
0,