From dbdf001b867cb686beb6113d329eaa42b02ed4ca Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 27 Jan 2011 13:01:46 +0000
Subject: removed menu code introduced for elgg.com that did not make it into
 1.8

git-svn-id: http://code.elgg.org/elgg/trunk@7949 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/layout/elements/sidebar.php  |  1 -
 views/default/layout/elements/title.php    | 13 ---------
 views/default/navigation/sidebar_menu.php  | 13 ---------
 views/default/navigation/submenu_group.php | 40 --------------------------
 views/default/navigation/submenu_item.php  | 46 ------------------------------
 views/default/navigation/submenu_js.php    | 29 -------------------
 6 files changed, 142 deletions(-)
 delete mode 100644 views/default/navigation/sidebar_menu.php
 delete mode 100644 views/default/navigation/submenu_group.php
 delete mode 100644 views/default/navigation/submenu_item.php
 delete mode 100644 views/default/navigation/submenu_js.php

(limited to 'views/default')

diff --git a/views/default/layout/elements/sidebar.php b/views/default/layout/elements/sidebar.php
index 93dd659f5..9a8a08723 100644
--- a/views/default/layout/elements/sidebar.php
+++ b/views/default/layout/elements/sidebar.php
@@ -9,7 +9,6 @@ echo elgg_view('layout/elements/page_links', $vars);
 
 echo elgg_view('layout/elements/owner_block', $vars);
 
-echo elgg_view('navigation/sidebar_menu');
 echo elgg_view_menu('page', array('sort_by' => 'name'));
 
 // optional 'sidebar' parameter
diff --git a/views/default/layout/elements/title.php b/views/default/layout/elements/title.php
index c5eeb9e0e..5354352c9 100644
--- a/views/default/layout/elements/title.php
+++ b/views/default/layout/elements/title.php
@@ -4,19 +4,6 @@
  * @uses $vars['title'] The page title
  */
 
-$page_owner = elgg_get_page_owner_guid();
-$page_owner_entity = get_entity($page_owner);
-
 $display = "<h2>" . $vars['title'] . "</h2>";
 
-$submenu = elgg_get_submenu();
-if (!empty($submenu)) {
-	$submenu = "<ul class='submenu extended'>" . $submenu . "</ul>";
-}
-
-if (!empty($submenu)  && $vars['submenu'] == true) {
-	// plugins can extend this to add menu options
-	$display .= $submenu;
-}
-
 echo $display;
\ No newline at end of file
diff --git a/views/default/navigation/sidebar_menu.php b/views/default/navigation/sidebar_menu.php
deleted file mode 100644
index 75fe7c743..000000000
--- a/views/default/navigation/sidebar_menu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg sidebar menu
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-// Plugins can add to the sidebar menu by calling elgg_add_submenu_item()
-$submenu = elgg_get_submenu();
-
-echo $submenu;
diff --git a/views/default/navigation/submenu_group.php b/views/default/navigation/submenu_group.php
deleted file mode 100644
index df750aff7..000000000
--- a/views/default/navigation/submenu_group.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Elgg submenu group.  Writes the <ul> for a submenu and passes items one by one
- * to navigation/submenu_item
- *
- * @uses $vars['group_name']
- * @uses $vars['items']
- * @package Elgg
- * @subpackage Core
- */
-
-$group = (isset($vars['group'])) ? $vars['group'] : 'default';
-$items = (isset($vars['items'])) ? $vars['items'] : array();
-$hidden = (isset($vars['hidden']) && $vars['hidden']) ? 'hidden' : '';
-$child = (isset($vars['child']) && $vars['child']) ? 'child' : '';
-
-echo "<ul class='submenu $group $hidden $child'>\n";
-
-foreach ($items as $item) {
-	$item_vars = array('item' => $item, 'group' => $group);
-	if (isset($item->vars) && is_array($item->vars)) {
-		$item_vars = array_merge($item->vars, $item_vars);
-	}
-
-	if (isset($item->children)) {
-		$child_vars = array(
-			'group' => $group,
-			'items' => $item->children,
-			// if this menu item is selected, make sure to display the full tree
-			// ie, don't hide it.
-			'hidden' => !$item->selected,
-			'child' => TRUE
-		);
-		$item_vars['children_html'] = elgg_view('navigation/submenu_group', $child_vars);
-	}
-
-	echo elgg_view('navigation/submenu_item', $item_vars);
-}
-
-echo "</ul>\n";
\ No newline at end of file
diff --git a/views/default/navigation/submenu_item.php b/views/default/navigation/submenu_item.php
deleted file mode 100644
index 09aa24a8e..000000000
--- a/views/default/navigation/submenu_item.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Elgg submenu item.  Displays the <li> part of a submenu.
- *
- * @uses $vars['group']
- * @uses $vars['item']
- * @uses $vars['children_html']
- * @package Elgg
- * @subpackage Core
- */
-
-$group = (isset($vars['group'])) ? $vars['group'] : 'default';
-$item = (isset($vars['item'])) ? $vars['item'] : FALSE;
-$children_html = (isset($vars['children_html'])) ? $vars['children_html'] : '';
-
-if ($item) {
-	$has_children = (isset($item->children) && $item->children) ? TRUE : FALSE;
-	$selected = (isset($item->selected) && $item->selected == TRUE) ? 'class="selected"' : '';
-	$js = (isset($vars['js'])) ? $vars['js'] : '';
-
-	$child_indicator = '';
-	if ($has_children) {
-		if ($selected) {
-			$child_indicator = '<span class="close_child">-</span>';
-			$child_indicator .= '<span class="hidden open_child">+</span>';
-		} else {
-			$child_indicator = '<span class="hidden close_child">-</span>';
-			$child_indicator .= '<span class="open_child">+</span>';
-		}
-
-		$child_indicator = "<span class=\"child_indicator\">$child_indicator </span>";
-	}
-
-	$url = htmlentities($item->href);
-	$text = $child_indicator . htmlentities($item->text);
-
-	$link_vars = array_merge($vars, array(
-		'href' => $item->href,
-		'text' => $text,
-		'encode_text' => FALSE
-	));
-
-	$link = elgg_view('output/url', $link_vars);
-}
-
-echo "<li $selected>$link$children_html</li>";
diff --git a/views/default/navigation/submenu_js.php b/views/default/navigation/submenu_js.php
deleted file mode 100644
index 1ed710b2b..000000000
--- a/views/default/navigation/submenu_js.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Javascript to expand submenu items.
- *
- * @package Elgg
- * @subpackage Core
- */
-?>
-
-<script type="text/javascript">
-$(document).ready(function() {
-	$('.submenu span.child_indicator').click(function() {
-		var submenu = $(this).parent().parent().find('ul.submenu.child:first');
-		var closeChild = $($(this).find('.close_child'));
-		var openChild = $($(this).find('.open_child'));
-
-		if (submenu.is(':visible')) {
-			closeChild.addClass('hidden');
-			openChild.removeClass('hidden');
-		} else {
-			closeChild.removeClass('hidden');
-			openChild.addClass('hidden');
-		}
-
-		submenu.slideToggle();
-		return false;
-	});
-});
-</script>
\ No newline at end of file
-- 
cgit v1.2.3