Fixes #3088: Added section header support to page and default menus.

git-svn-id: http://code.elgg.org/elgg/trunk@8661 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/navigation/menu/default.php b/views/default/navigation/menu/default.php
index 13ff9f1e2282b015211c3437625ea59f61985f8b..0dc6dd6b35f0c55ee27752c7533aa3354b1c7c62 100644 (file)
--- a/views/default/navigation/menu/default.php
+++ b/views/default/navigation/menu/default.php
@@ -5,10 +5,12 @@
  * @uses $vars['name']
  * @uses $vars['menu']
  * @uses $vars['class']
+ * @uses $vars['show_section_headers']
  */
 
 // we want css classes to use dashes
 $vars['name'] = str_replace('_', '-', $vars['name']);
+$headers = elgg_extract('show_section_headers', $vars, false);
 
 $class = "elgg-menu elgg-menu-{$vars['name']}";
 if (isset($vars['class'])) {
@@ -19,5 +21,8 @@ foreach ($vars['menu'] as $section => $menu_items) {
        echo elgg_view('navigation/menu/elements/section', array(
                'items' => $menu_items,
                'class' => "$class elgg-menu-{$vars['name']}-$section",
+               'section' => $section,
+               'name' => $vars['name'],
+               'show_section_headers' => $headers
        ));
 }

diff --git a/views/default/navigation/menu/elements/section.php b/views/default/navigation/menu/elements/section.php
index f72db847f11d26861f25ead044e77038cf533fe0..9b31f54b120a514f75bf896af22f5462b1b3a093 100644 (file)
--- a/views/default/navigation/menu/elements/section.php
+++ b/views/default/navigation/menu/elements/section.php
@@ -4,10 +4,20 @@
  *
  * @uses $vars['items']
  * @uses $vars['class']
+ * @uses $vars['name']
+ * @uses $vars['section']
+ * @uses $vars['show_section_headers']
  */
 
+$headers = elgg_extract('show_section_headers', $vars, false);
 $class = elgg_extract('class', $vars, '');
 
+if ($headers) {
+       $name = elgg_extract('name', $vars);
+       $section = elgg_extract('section', $vars);
+       echo elgg_echo("menu:$name:header:$section");
+}
+
 echo "<ul class=\"$class\">";
 foreach ($vars['items'] as $menu_item) {
        echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));

diff --git a/views/default/navigation/menu/page.php b/views/default/navigation/menu/page.php
index bd26117909f4f8455af6414ea34280c3fd9a15cf..c7d858e1d3b1ce250cd11dc64681218521a5467e 100644 (file)
--- a/views/default/navigation/menu/page.php
+++ b/views/default/navigation/menu/page.php
@@ -5,24 +5,23 @@
  * @uses $vars['menu']
  * @uses $vars['selected_item']
  * @uses $vars['class']
+ * @uses $vars['name']
+ * @uses $vars['show_section_headers']
  */
 
+$headers = elgg_extract('show_section_headers', $vars, false);
+
 $class = 'elgg-menu elgg-menu-page';
 if (isset($vars['class'])) {
        $class = "$class {$vars['class']}";
 }
 
-if (isset($vars['selected_item'])) {
-       $parent = $vars['selected_item']->getParent();
-       while ($parent) {
-               $parent->setSelected();
-               $parent = $parent->getParent();
-       }
-}
-
 foreach ($vars['menu'] as $section => $menu_items) {
        echo elgg_view('navigation/menu/elements/section', array(
                'items' => $menu_items,
                'class' => "$class elgg-menu-page-$section",
+               'section' => $section,
+               'name' => $vars['name'],
+               'show_section_headers' => $headers
        ));
 }