From 165fa6558c1bfd0a7261bdd51b027b54a46961b6 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 1 Mar 2011 18:54:37 +0000 Subject: Refs #3021: elgg-section-$section => elgg-menu-$menu-$section Added elgg-menu-hz for horizontal menus git-svn-id: http://code.elgg.org/elgg/trunk@8535 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/admin.php | 4 +- views/default/css/elements/navigation.php | 54 ++++++++++++++-------- views/default/navigation/menu/default.php | 8 ++-- views/default/navigation/menu/elements/group.php | 19 -------- views/default/navigation/menu/elements/item.php | 2 +- views/default/navigation/menu/elements/section.php | 15 ++++++ views/default/navigation/menu/metadata.php | 2 +- views/default/navigation/menu/page.php | 5 +- views/default/navigation/menu/site.php | 7 ++- views/default/navigation/menu/user_hover.php | 36 +++++++++------ views/default/page/elements/footer.php | 2 +- views/default/page/elements/topbar.php | 2 +- views/default/page/layouts/content/filter.php | 2 +- views/default/page/layouts/content/header.php | 2 +- 14 files changed, 90 insertions(+), 70 deletions(-) delete mode 100644 views/default/navigation/menu/elements/group.php create mode 100644 views/default/navigation/menu/elements/section.php diff --git a/views/default/css/admin.php b/views/default/css/admin.php index a6e1c1e85..b32e1382b 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -698,10 +698,10 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover { background: #cccccc; text-decoration: none; } -.elgg-hover-admin a { +.elgg-menu-hover-admin a { color: red; } -.elgg-hover-admin a:hover { +.elgg-menu-hover-admin a:hover { color: white; background-color: red; } diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index d0bb4a630..210ff4cbe 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -85,22 +85,38 @@ /* *************************************** * MENUS * - * .elgg-menu does two things: - * 1) Vertically centers inline images and icons - * 2) Abstracts commonly-duplicated code used when adding "separators" to horizontal menus - * - * To make a menu horizontal: - * .elgg-menu-$menu > li {display:inline-block} - * - * To add separators to a horizontal menu: - * .elgg-menu-$menu > li > a {display:inline-block} - * .elgg-menu-$menu > li:after {content: '|'} + * To add separators to a menu: + * .elgg-menu-$menu > li:after {content: '|'; background: ...;} *************************************** */ -.elgg-menu > li {vertical-align: middle;position:relative} -.elgg-menu > li:after {display: inline-block} -.elgg-menu > li:last-child:after {display:none} -.elgg-menu > li > a {display:block} -.elgg-menu img, .elgg-menu .elgg-icon {vertical-align: middle; margin-top: -2px} +/* For dropdown/flyout menus */ +.elgg-menu > li { + position:relative; +} + +/* For separators */ +.elgg-menu > li:last-child:after { + display:none +} + +/* Maximize click target */ +.elgg-menu > li > a { + display:block +} + +/* Image placement correction */ +.elgg-menu img, +.elgg-menu .elgg-icon { + vertical-align: middle; + margin-top: -2px; +} + +/* Horizontal menus w/ separator support */ +.elgg-menu-hz > li, +.elgg-menu-hz > li:after, +.elgg-menu-hz > li > a { + display:inline-block; + vertical-align:middle; +} /* *************************************** BREADCRUMBS @@ -157,7 +173,7 @@ text-decoration: none; } -.elgg-menu-topbar.elgg-section-alt { +.elgg-menu-topbar-alt { float:right; } @@ -366,10 +382,10 @@ background: #cccccc; text-decoration: none; } -.elgg-hover-admin a { +.elgg-menu-hover-admin a { color: red; } -.elgg-hover-admin a:hover { +.elgg-menu-hover-admin a:hover { color: white; background-color: red; } @@ -388,7 +404,7 @@ padding: 0 4px; } -.elgg-menu-footer.elgg-section-alt { +.elgg-menu-footer-alt { float: right; } diff --git a/views/default/navigation/menu/default.php b/views/default/navigation/menu/default.php index 52049f6e0..1a7f292b8 100644 --- a/views/default/navigation/menu/default.php +++ b/views/default/navigation/menu/default.php @@ -2,19 +2,19 @@ /** * Default menu * + * @uses $vars['name'] * @uses $vars['menu'] * @uses $vars['class'] */ $class = "elgg-menu elgg-menu-{$vars['name']}"; if (isset($vars['class'])) { - $class = "$class {$vars['class']}"; + $class .= " {$vars['class']}"; } foreach ($vars['menu'] as $section => $menu_items) { - echo elgg_view('navigation/menu/elements/group', array( - 'section' => $section, + echo elgg_view('navigation/menu/elements/section', array( 'items' => $menu_items, - 'class' => $class, + 'class' => "$class elgg-menu-{$vars['name']}-$section", )); } diff --git a/views/default/navigation/menu/elements/group.php b/views/default/navigation/menu/elements/group.php deleted file mode 100644 index b0c0f54d4..000000000 --- a/views/default/navigation/menu/elements/group.php +++ /dev/null @@ -1,19 +0,0 @@ -"; -foreach ($vars['items'] as $menu_item) { - echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item)); -} -echo ''; diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php index e11b01bbf..893bbd205 100644 --- a/views/default/navigation/menu/elements/item.php +++ b/views/default/navigation/menu/elements/item.php @@ -28,7 +28,7 @@ if ($item_class) { echo "
  • "; echo $item->getContent(); if ($children) { - echo elgg_view('navigation/menu/elements/group', array( + echo elgg_view('navigation/menu/elements/section', array( 'items' => $children, 'class' => 'elgg-menu elgg-child-menu', )); diff --git a/views/default/navigation/menu/elements/section.php b/views/default/navigation/menu/elements/section.php new file mode 100644 index 000000000..f72db847f --- /dev/null +++ b/views/default/navigation/menu/elements/section.php @@ -0,0 +1,15 @@ +"; +foreach ($vars['items'] as $menu_item) { + echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item)); +} +echo ''; diff --git a/views/default/navigation/menu/metadata.php b/views/default/navigation/menu/metadata.php index ae6a9bebb..742aee3ad 100644 --- a/views/default/navigation/menu/metadata.php +++ b/views/default/navigation/menu/metadata.php @@ -11,7 +11,7 @@ $entity = $vars['entity']; $handler = elgg_extract('handler', $vars, ''); ?> -