diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-11-03 19:33:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-11-03 19:33:37 +0000 |
| commit | ea53aad7c8ced499e397cbedfe1e0cce205c071f (patch) | |
| tree | b490682ae2b5e126d2e6a3ce53ef8485e4590a30 /themes | |
| parent | cbcb85560ad4e8756f59d2e4a1b5329fc9398a03 (diff) | |
| download | brdo-ea53aad7c8ced499e397cbedfe1e0cce205c071f.tar.gz brdo-ea53aad7c8ced499e397cbedfe1e0cce205c071f.tar.bz2 | |
- Patch #22215 by Richard Archer: refactored primary and secondary links.
Deprecates the primary_links module.
This patch was much needed. Thanks Richards!
NOTE: if some themers could investigate if there is room for improvement
with regard to theming, that would be awesome.
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/bluemarine/page.tpl.php | 4 | ||||
| -rw-r--r-- | themes/chameleon/chameleon.theme | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php index 3039ce7fb..9344e6973 100644 --- a/themes/bluemarine/page.tpl.php +++ b/themes/bluemarine/page.tpl.php @@ -18,8 +18,8 @@ <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?> </td> <td id="menu"> - <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?> - <?php if ($primary_links) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?> + <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('menu_links', $secondary_links) ?></div><?php } ?> + <?php if ($primary_links) { ?><div id="primary"><?php print theme('menu_links', $primary_links) ?></div><?php } ?> <?php print $search_box ?> </td> </tr> diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 56f8ec2b3..0eb915658 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -11,9 +11,7 @@ function chameleon_features() { 'logo', 'toggle_favicon', 'toggle_name', - 'toggle_slogan', - 'toggle_primary_links', - 'toggle_secondary_links'); + 'toggle_slogan'); } function chameleon_regions() { @@ -55,8 +53,8 @@ function chameleon_page($content) { $output .= "</div>\n"; - $primary_links = theme('links', theme_get_setting('primary_links')); - $secondary_links = theme('links', theme_get_setting('secondary_links')); + $primary_links = theme('links', menu_primary_links()); + $secondary_links = theme('links', menu_secondary_links()); if ($primary_links || $secondary_links) { $output .= ' <div class="navlinks">'; if ($primary_links) { |