diff options
| -rw-r--r-- | modules/block/block.install | 2 | ||||
| -rw-r--r-- | modules/system/page.tpl.php | 4 | ||||
| -rw-r--r-- | modules/system/system.module | 2 | ||||
| -rw-r--r-- | themes/bartik/bartik.info | 2 | ||||
| -rw-r--r-- | themes/bartik/templates/maintenance-page.tpl.php | 2 | ||||
| -rw-r--r-- | themes/bartik/templates/page.tpl.php | 4 | ||||
| -rw-r--r-- | themes/garland/page.tpl.php | 2 | ||||
| -rw-r--r-- | themes/garland/style.css | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/modules/block/block.install b/modules/block/block.install index b9f1285bc..1a6ec333a 100644 --- a/modules/block/block.install +++ b/modules/block/block.install @@ -346,7 +346,7 @@ function block_update_7004() { 'theme' => $theme, 'status' => 1, 'weight' => 0, - 'region' => 'highlight', + 'region' => 'highlighted', 'visibility' => BLOCK_VISIBILITY_LISTED, 'pages' => '<front>', 'cache' => DRUPAL_NO_CACHE, diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index 2577f190a..ee3ac5786 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -55,7 +55,7 @@ * * Regions: * - $page['help']: Dynamic help text, mostly for admin pages. - * - $page['highlight']: Items for the highlighted content region. + * - $page['highlighted']: Items for the highlighted content region. * - $page['content']: The main content of the current page. * - $page['sidebar_first']: Items for the first sidebar. * - $page['sidebar_second']: Items for the second sidebar. @@ -117,7 +117,7 @@ <div id="main-wrapper"><div id="main" class="clearfix"> <div id="content" class="column"><div class="section"> - <?php if ($page['highlight']): ?><div id="highlight"><?php print render($page['highlight']); ?></div><?php endif; ?> + <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?> <a id="main-content"></a> <?php print render($title_prefix); ?> <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?> diff --git a/modules/system/system.module b/modules/system/system.module index f16927aa4..05eb78661 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2350,7 +2350,7 @@ function _system_rebuild_theme_data() { 'content' => 'Content', 'header' => 'Header', 'footer' => 'Footer', - 'highlight' => 'Highlighted content', + 'highlighted' => 'Highlighted', 'help' => 'Help', 'page_top' => 'Page top', 'page_bottom' => 'Page bottom', diff --git a/themes/bartik/bartik.info b/themes/bartik/bartik.info index d3f6bf00c..c300b94c9 100644 --- a/themes/bartik/bartik.info +++ b/themes/bartik/bartik.info @@ -18,7 +18,7 @@ regions[header] = Header regions[help] = Help regions[page_top] = Page top regions[page_bottom] = Page bottom -regions[highlight] = Highlighted +regions[highlighted] = Highlighted regions[featured] = Featured regions[content] = Content diff --git a/themes/bartik/templates/maintenance-page.tpl.php b/themes/bartik/templates/maintenance-page.tpl.php index 57e40a07a..5ba63def1 100644 --- a/themes/bartik/templates/maintenance-page.tpl.php +++ b/themes/bartik/templates/maintenance-page.tpl.php @@ -66,7 +66,7 @@ <div id="main-wrapper"><div id="main" class="clearfix"> <div id="content" class="column"><div class="section"> - <?php if ($highlight): ?><div id="highlight"><?php print $highlight; ?></div><?php endif; ?> + <?php if ($highlighted): ?><div id="highlighted"><?php print $highlighted; ?></div><?php endif; ?> <a id="main-content"></a> <?php if ($title): ?> <h1 class="title" id="page-title"> diff --git a/themes/bartik/templates/page.tpl.php b/themes/bartik/templates/page.tpl.php index 87f6a73e8..74fc27766 100644 --- a/themes/bartik/templates/page.tpl.php +++ b/themes/bartik/templates/page.tpl.php @@ -66,7 +66,7 @@ * Regions: * - $page['header']: Items for the header region. * - $page['featured']: Items for the featured region. - * - $page['highlight']: Items for the highlighted content region. + * - $page['highlighted']: Items for the highlighted content region. * - $page['help']: Dynamic help text, mostly for admin pages. * - $page['content']: The main content of the current page. * - $page['sidebar_first']: Items for the first sidebar. @@ -168,7 +168,7 @@ <div id="content" class="column"><div class="section"> - <?php if ($page['highlight']): ?><div id="highlight"><?php print render($page['highlight']); ?></div><?php endif; ?> + <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?> <a id="main-content"></a> <?php print render($title_prefix); ?> <?php if ($title): ?> diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php index 54f67bfd2..44017455a 100644 --- a/themes/garland/page.tpl.php +++ b/themes/garland/page.tpl.php @@ -39,7 +39,7 @@ <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner"> <?php print $breadcrumb; ?> - <?php if ($page['highlight']): ?><div id="highlight"><?php render($page['highlight']); ?></div><?php endif; ?> + <?php if ($page['highlighted']): ?><div id="highlighted"><?php render($page['highlighted']); ?></div><?php endif; ?> <a id="main-content"></a> <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?> <?php print render($title_prefix); ?> diff --git a/themes/garland/style.css b/themes/garland/style.css index 96e4875b3..bdbc88d85 100644 --- a/themes/garland/style.css +++ b/themes/garland/style.css @@ -622,7 +622,7 @@ div#branding strong { color: #529ad6; } -#highlight { +#highlighted { padding: 1em; background-color: #fff; border: 1px solid #e0e5fb; |