Commit 10eec627 authored by webchick's avatar webchick
Browse files

#655736 by David_Rothstein: De-couple Dashboard and Toolbar modules from Overlay.

parent 366a52b7
......@@ -161,9 +161,10 @@ function dashboard_page_build(&$page) {
function dashboard_system_info_alter(&$info, $file, $type) {
if ($type == 'theme') {
$info['regions'] += dashboard_region_descriptions();
if (module_exists('overlay')) {
$info['overlay_regions'] = !empty($info['overlay_regions']) ? array_merge($info['overlay_regions'], dashboard_regions()) : dashboard_regions();
}
// Indicate that these regions are intended to be displayed whenever the
// dashboard is displayed in an overlay. This information is provided for
// any module that might need to use it, not just the core Overlay module.
$info['overlay_regions'] = !empty($info['overlay_regions']) ? array_merge($info['overlay_regions'], dashboard_regions()) : dashboard_regions();
}
}
......
......@@ -153,12 +153,15 @@ function toolbar_preprocess_html(&$vars) {
/**
* Implements hook_system_info_alter().
*
* If the overlay module is enabled, indicate that the 'page_top' region (in
* which the toolbar will be displayed) is one of the overlay supplemental
* regions that should be refreshed whenever its content is updated.
* Indicate that the 'page_top' region (in which the toolbar will be displayed)
* is an overlay supplemental region that should be refreshed whenever its
* content is updated.
*
* This information is provided for any module that might need to use it, not
* just the core Overlay module.
*/
function toolbar_system_info_alter(&$info, $file, $type) {
if (module_exists('overlay') && $type == 'theme') {
if ($type == 'theme') {
$info['overlay_supplemental_regions'][] = 'page_top';
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment