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

#845928 by JohnAlbin: Fixed System menu blocks don't get the same styling as menu module blocks.

merge-requests/26/head
Angie Byron 2010-08-09 16:54:50 +00:00
parent 8db34bb271
commit a4df7936bb
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/system/system.module
View File

@ -1981,6 +1981,16 @@ function system_block_view($delta = '') {
}
}
/**
* Implements hook_preprocess_block().
*/
function system_preprocess_block(&$variables) {
// System menu blocks should get the same class as menu module blocks.
if ($variables['block']->module == 'system' && in_array($variables['block']->delta, array_keys(menu_list_system_menus()))) {
$variables['classes_array'][] = 'block-menu';
}
}
/**
* Provide a single block on the administration overview page.
*

10
themes/bartik/template.php
View File

@ -105,17 +105,9 @@ function bartik_process_maintenance_page(&$variables) {
function bartik_preprocess_block(&$variables) {
// In the header region, visually hide the title of any menu block or of the
// user login block, but leave it accessible.
if ($variables['block']->region == 'header' && ($variables['block']->module == 'menu' || $variables['block']->module == 'user' && $variables['block']->delta == 'login')) {
if ($variables['block']->region == 'header' && ($variables['block']->module == 'user' && $variables['block']->delta == 'login' || in_array('block-menu', $variables['classes_array']))) {
$variables['title_attributes_array']['class'][] = 'element-invisible';
}
// System menu blocks should get the same class as menu module blocks.
if (in_array($variables['block']->delta, array_keys(menu_list_system_menus()))) {
$variables['classes_array'][] = 'block-menu';
// Also, hide the title if its in the header region.
if ($variables['block']->region == 'header') {
$variables['title_attributes_array']['class'][] = 'element-invisible';
}
}
// Set "first" and "last" classes.
if ($variables['block']->position_first){
$variables['classes_array'][] = 'first';