aboutsummaryrefslogtreecommitdiff
path: root/views/default/navigation
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/navigation')
-rw-r--r--views/default/navigation/menu/default.php8
-rw-r--r--views/default/navigation/menu/elements/item.php2
-rw-r--r--views/default/navigation/menu/elements/section.php (renamed from views/default/navigation/menu/elements/group.php)4
-rw-r--r--views/default/navigation/menu/metadata.php2
-rw-r--r--views/default/navigation/menu/page.php5
-rw-r--r--views/default/navigation/menu/site.php7
-rw-r--r--views/default/navigation/menu/user_hover.php36
7 files changed, 34 insertions, 30 deletions
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/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 "<li $class>";
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/group.php b/views/default/navigation/menu/elements/section.php
index b0c0f54d4..f72db847f 100644
--- a/views/default/navigation/menu/elements/group.php
+++ b/views/default/navigation/menu/elements/section.php
@@ -4,13 +4,9 @@
*
* @uses $vars['items']
* @uses $vars['class']
- * @uses $vars['section']
*/
$class = elgg_extract('class', $vars, '');
-if (isset($vars['section'])) {
- $class = "$class elgg-section-{$vars['section']}";
-}
echo "<ul class=\"$class\">";
foreach ($vars['items'] as $menu_item) {
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, '');
?>
-<ul class="elgg-menu elgg-menu-metadata">
+<ul class="elgg-menu elgg-menu-hz elgg-menu-metadata">
<li>
<?php echo elgg_view('output/access', array('entity' => $entity)); ?>
</li>
diff --git a/views/default/navigation/menu/page.php b/views/default/navigation/menu/page.php
index 92006e956..bd2611790 100644
--- a/views/default/navigation/menu/page.php
+++ b/views/default/navigation/menu/page.php
@@ -21,9 +21,8 @@ if (isset($vars['selected_item'])) {
}
foreach ($vars['menu'] as $section => $menu_items) {
- echo elgg_view('navigation/menu/elements/group', array(
+ echo elgg_view('navigation/menu/elements/section', array(
'items' => $menu_items,
- 'section' => $section,
- 'class' => $class,
+ 'class' => "$class elgg-menu-page-$section",
));
}
diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 41c81de03..aa41840fe 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -6,7 +6,7 @@
* @uses $vars['menu']['more']
*/
-echo '<ul class="elgg-menu elgg-menu-site clearfix">';
+echo '<ul class="elgg-menu elgg-menu-site elgg-menu-site-default clearfix">';
foreach ($vars['menu']['default'] as $menu_item) {
echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
}
@@ -17,9 +17,8 @@ if (isset($vars['menu']['more'])) {
$more = elgg_echo('more');
echo "<a title=\"$more\">$more</a>";
- echo elgg_view('navigation/menu/elements/group', array(
- 'class' => 'elgg-menu',
- 'section' => 'more',
+ echo elgg_view('navigation/menu/elements/section', array(
+ 'class' => 'elgg-menu elgg-menu-site-more',
'items' => $vars['menu']['more'],
));
diff --git a/views/default/navigation/menu/user_hover.php b/views/default/navigation/menu/user_hover.php
index bbca41e21..8e3c4de9f 100644
--- a/views/default/navigation/menu/user_hover.php
+++ b/views/default/navigation/menu/user_hover.php
@@ -24,29 +24,39 @@ echo "<li>$name_link</li>";
// actions
if (elgg_is_logged_in() && $actions) {
- echo '<li><ul>';
+
+ echo '<li>';
foreach ($actions as $menu_item) {
- echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
+ echo elgg_view('navigation/menu/elements/section', array(
+ 'class' => "elgg-menu elgg-menu-hover-actions",
+ 'items' => $actions,
+ ));
}
- echo '</ul></li>';
+ echo '</li>';
}
// main
if ($main) {
- echo '<li><ul>';
- foreach ($main as $menu_item) {
- echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
- }
- echo '</ul></li>';
+ echo '<li>';
+
+ echo elgg_view('navigation/menu/elements/section', array(
+ 'class' => 'elgg-menu elgg-menu-hover-default',
+ 'items' => $main,
+ ));
+
+ echo '</li>';
}
// admin
if (elgg_is_admin_logged_in() && $admin) {
- echo '<li><ul class="elgg-hover-admin">';
- foreach ($admin as $menu_item) {
- echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
- }
- echo '</ul></li>';
+ echo '<li>';
+
+ echo elgg_view('navigation/menu/elements/section', array(
+ 'class' => 'elgg-menu elgg-menu-hover-admin',
+ 'items' => $admin,
+ ));
+
+ echo '</li>';
}
echo '</ul>';