13 files changed, 140 insertions, 119 deletions

diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php
index 680f1b125..8dbdc27e6 100644
--- a/views/default/page/layouts/admin.php
+++ b/views/default/page/layouts/admin.php
@@ -10,51 +10,9 @@
  * @uses $vars['title']   Title string
  */
 
-$admin_title = elgg_get_site_entity()->name . ' ' . elgg_echo('admin');
-
-$view_site = elgg_view('output/url', array(
-	'href' => elgg_get_site_url(),
-	'text' => elgg_echo('admin:view_site'),
-));
-$logout = elgg_view('output/url', array(
-	'href' => 'action/logout',
-	'text' => elgg_echo('logout'),
-));
 ?>
 
-<div class="elgg-page-header">
-	<div class="elgg-inner clearfix">
-		<h1 class="elgg-heading-site">
-			<a href="<?php echo elgg_get_site_url(); ?>pg/admin/">
-				<?php echo $admin_title; ?>
-			</a>
-		</h1>
-		<ul class="elgg-menu-user">
-			<li><?php echo elgg_echo('admin:loggedin', array(elgg_get_logged_in_user_entity()->name)); ?></li>
-			<li><?php echo $view_site; ?></li>
-			<li><?php echo $logout; ?></li>
-		</ul>
-	</div>
-</div>
-
-<?php
-// @todo clean up system messages code
-$messages = null;
-if (count_messages()) {
-	// get messages - try for errors first
-	$messages = system_messages(NULL, "error");
-	if (count($messages["error"]) == 0) {
-		// no errors so grab rest of messages
-		$messages = system_messages(null, "");
-	} else {
-		// we have errors - clear out remaining messages
-		system_messages(null, "");
-	}
-}
-echo elgg_view('page/elements/messages', array('object' => $messages));
-?>
-
-<div class="elgg-page-body">
+<div class="elgg-layout elgg-layout-one-sidebar">
 	<div class="elgg-sidebar clearfix">
 		<?php
 			echo elgg_view('admin/sidebar', $vars);
@@ -63,6 +21,11 @@ echo elgg_view('page/elements/messages', array('object' => $messages));
 	<div class="elgg-main elgg-body">
 		<div class="elgg-head">
 		<?php
+			echo elgg_view_menu('title', array(
+				'sort_by' => 'priority',
+				'class' => 'elgg-menu-hz',
+			));
+
 			if (isset($vars['title'])) {
 				echo elgg_view_title($vars['title']);
 			}
@@ -74,6 +37,4 @@ echo elgg_view('page/elements/messages', array('object' => $messages));
 			}
 		?>
 	</div>
-</div>
-<div class="elgg-page-footer">
-</div>
+</div>
\ No newline at end of file
diff --git a/views/default/page/layouts/content.php b/views/default/page/layouts/content.php
index 454fbd73f..c406c9faf 100644
--- a/views/default/page/layouts/content.php
+++ b/views/default/page/layouts/content.php
@@ -10,7 +10,6 @@
  * @uses $vars['filter']         HTML of the content area filter (override)
  * @uses $vars['title']          Title text (override)
  * @uses $vars['context']        Page context (override)
- * @uses $vars['buttons']        Content header buttons (override)
  * @uses $vars['filter_context'] Filter context: everyone, friends, mine
  * @uses $vars['class']          Additional class to apply to layout
  */
@@ -21,9 +20,6 @@ $params = $vars;
 $params['content'] = $sidebar_content;
 $sidebar = elgg_view('page/layouts/content/sidebar', $params);
 
-// navigation defaults to breadcrumbs
-$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
-
 // allow page handlers to override the default header
 if (isset($vars['header'])) {
 	$vars['header_override'] = $vars['header'];
@@ -45,7 +41,7 @@ $params = $vars;
 $params['content'] = $footer_content;
 $footer = elgg_view('page/layouts/content/footer', $params);
 
-$body = $nav . $header . $filter . $content . $footer;
+$body = $header . $filter . $content . $footer;
 
 $params = array(
 	'content' => $body,
diff --git a/views/default/page/layouts/content/filter.php b/views/default/page/layouts/content/filter.php
index 9daee6d71..701c6418a 100644
--- a/views/default/page/layouts/content/filter.php
+++ b/views/default/page/layouts/content/filter.php
@@ -23,21 +23,30 @@ if (elgg_is_logged_in() && $context) {
 	// generate a list of default tabs
 	$tabs = array(
 		'all' => array(
-			'title' => elgg_echo('all'),
-			'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "pg/$context/all/",
+			'text' => elgg_echo('all'),
+			'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all",
 			'selected' => ($filter_context == 'all'),
+			'priority' => 200,
 		),
 		'mine' => array(
-			'title' => elgg_echo('mine'),
-			'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$context/owner/$username/",
+			'text' => elgg_echo('mine'),
+			'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "$context/owner/$username",
 			'selected' => ($filter_context == 'mine'),
+			'priority' => 300,
 		),
 		'friend' => array(
-			'title' => elgg_echo('friends'),
-			'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$context/friends/$username/",
+			'text' => elgg_echo('friends'),
+			'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username",
 			'selected' => ($filter_context == 'friends'),
+			'priority' => 400,
 		),
 	);
+	
+	foreach ($tabs as $name => $tab) {
+		$tab['name'] = $name;
+		
+		elgg_register_menu_item('filter', $tab);
+	}
 
-	echo elgg_view('navigation/tabs', array('tabs' => $tabs));
+	echo elgg_view_menu('filter', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
 }
diff --git a/views/default/page/layouts/content/header.php b/views/default/page/layouts/content/header.php
index 7a3ab1ae9..1e66e52db 100644
--- a/views/default/page/layouts/content/header.php
+++ b/views/default/page/layouts/content/header.php
@@ -2,48 +2,42 @@
 /**
  * Main content header
  *
- * This includes a title and a new content button by default
+ * Title and title menu
  *
  * @uses $vars['header_override'] HTML for overriding the default header (override)
  * @uses $vars['title']           Title text (override)
  * @uses $vars['context']         Page context (override)
- * @uses $vars['buttons']         Content header buttons (override)
  */
 
+if (isset($vars['buttons'])) {
+	// it was a bad idea to implement buttons with a pass through
+	elgg_deprecated_notice("Use elgg_register_menu_item() to register for the title menu", 1.0);
+}
+
 if (isset($vars['header_override'])) {
 	echo $vars['header_override'];
 	return true;
 }
 
 $context = elgg_extract('context', $vars, elgg_get_context());
-if ($context) {
-	$title = elgg_extract('title', $vars, '');
-	if (!$title) {
-		$title = elgg_echo($context);
-	}
 
-	if (isset($vars['buttons'])) {
-		$buttons = $vars['buttons'];
-	} else {
-		if (elgg_is_logged_in() && $context) {
-			$owner = elgg_get_page_owner_entity();
-			if (elgg_instanceof($owner, 'group')) {
-				$guid = $owner->getGUID();
-			} else {
-				$guid = elgg_get_logged_in_user_guid();
-			}
-			$new_link = elgg_extract('new_link', $vars, "pg/$context/add/$guid/");
-			$params = array(
-				'href' => $new_link = elgg_normalize_url($new_link),
-				'text' => elgg_echo("$context:add"),
-				'class' => 'elgg-button-action',
-			);
-			$buttons = elgg_view('output/url', $params);
-		}
-	}
-	echo <<<HTML
+$title = elgg_extract('title', $vars, '');
+if (!$title) {
+	$title = elgg_echo($context);
+}
+$title = elgg_view_title($title, array('class' => 'elgg-heading-main'));
+
+if (isset($vars['buttons']) && $vars['buttons']) {
+	$buttons = $vars['buttons'];
+} else {
+	$buttons = elgg_view_menu('title', array(
+		'sort_by' => 'priority',
+		'class' => 'elgg-menu-hz',
+	));
+}
+
+echo <<<HTML
 <div class="elgg-head clearfix">
-	<h2 class="elgg-heading-main">$title</h2>$buttons
+	$title$buttons
 </div>
 HTML;
-}
diff --git a/views/default/page/layouts/error.php b/views/default/page/layouts/error.php
new file mode 100644
index 000000000..cdce28a8e
--- /dev/null
+++ b/views/default/page/layouts/error.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Error layout
+ */
+
+$class = 'elgg-layout-error';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+$vars['class'] = $class;
+
+echo elgg_view('page/layouts/one_column', $vars);
diff --git a/views/default/page/layouts/one_column.php b/views/default/page/layouts/one_column.php
index ab6a24878..491d5b459 100644
--- a/views/default/page/layouts/one_column.php
+++ b/views/default/page/layouts/one_column.php
@@ -9,17 +9,30 @@
  * @uses $vars['class']   Additional class to apply to layout
  */
 
-$class = 'elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-column clearfix';
 if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }
+
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
 ?>
-<div class="<?php echo $class; ?>" id="elgg-layout-one-column">
-	<div class="elgg-body">
-	<?php echo $vars['content']; ?>
+<div class="<?php echo $class; ?>">
+	<div class="elgg-body elgg-main">
 	<?php
+		echo $nav;
+
+		if (isset($vars['title'])) {
+			echo elgg_view_title($vars['title']);
+		}
+
+		echo $vars['content'];
+		
 		// @deprecated 1.8
-		echo $vars['area1'];
+		if (isset($vars['area1'])) {
+			echo $vars['area1'];
+		}
 	?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index 53f065b3e..d74dad53d 100644
--- a/views/default/page/layouts/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
@@ -9,17 +9,21 @@
  * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
  * @uses $vars['title']   Optional title for main content area
  * @uses $vars['class']   Additional class to apply to layout
+ * @uses $vars['nav']     HTML of the page nav (override) (default: breadcrumbs)
  */
 
-$class = 'elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-one-sidebar clearfix';
 if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }
 
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
 ?>
 
-<div class="<?php echo $class; ?>" id="elgg-layout-sidebar">
-	<div class="elgg-sidebar elgg-aside">
+<div class="<?php echo $class; ?>">
+	<div class="elgg-sidebar">
 		<?php
 			echo elgg_view('page/elements/sidebar', $vars);
 		?>
@@ -27,6 +31,8 @@ if (isset($vars['class'])) {
 
 	<div class="elgg-main elgg-body">
 		<?php
+			echo $nav;
+			
 			if (isset($vars['title'])) {
 				echo elgg_view_title($vars['title']);
 			}
diff --git a/views/default/page/layouts/two_column_left_sidebar.php b/views/default/page/layouts/two_column_left_sidebar.php
index 97f4d2719..e395a5053 100644
--- a/views/default/page/layouts/two_column_left_sidebar.php
+++ b/views/default/page/layouts/two_column_left_sidebar.php
@@ -17,7 +17,7 @@ unset($vars['area2']);
 unset($vars['area3']);
 
 // backward compatability support for plugins that are not using the new approach
-// of routing through pg/admin
+// of routing through 'admin'
 if (elgg_get_context() == 'admin') {
 	echo elgg_view('page/layouts/admin', $vars);
 	return true;
diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php
index 1e6c2aae7..7521dd44f 100644
--- a/views/default/page/layouts/two_sidebar.php
+++ b/views/default/page/layouts/two_sidebar.php
@@ -5,32 +5,27 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['content'] The content string for the main column
- * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
+ * @uses $vars['content']     The content string for the main column
+ * @uses $vars['sidebar']     Optional content that is displayed in the sidebar
  * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar
- * @uses $vars['class']   Additional class to apply to layout
+ * @uses $vars['class']       Additional class to apply to layout
  */
 
-$class = 'elgg-inner clearfix';
+$class = 'elgg-layout elgg-layout-two-sidebar clearfix';
 if (isset($vars['class'])) {
 	$class = "$class {$vars['class']}";
 }
 ?>
 
-<div class="<?php echo $class; ?>" id="elgg-layout-two-sidebar">
-	<div class="elgg-sidebar elgg-aside">
+<div class="<?php echo $class; ?>">
+	<div class="elgg-sidebar">
 		<?php
 			echo elgg_view('page/elements/sidebar', $vars);
 		?>
 	</div>
-	<div class="elgg-sidebar elgg-alt elgg-aside">
+	<div class="elgg-sidebar-alt">
 		<?php
-			//$params = $vars;
-			//$params['sidebar'] = $vars['sidebar_alt'];
-			$params = array(
-				'sidebar' => elgg_view_module('test', 'Testing', 'Hello, world!'),
-			);
-			echo elgg_view('page/elements/sidebar', $params);
+			echo elgg_view('page/elements/sidebar_alt', $vars);
 		?>
 	</div>
 
diff --git a/views/default/page/layouts/walled_garden.php b/views/default/page/layouts/walled_garden.php
new file mode 100644
index 000000000..6ecd941ef
--- /dev/null
+++ b/views/default/page/layouts/walled_garden.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Walled Garden layout
+ *
+ * @uses $vars['content'] Main content
+ * @uses $vars['class']   CSS classes
+ * @uses $vars['id']      CSS id
+ */
+
+$class = elgg_extract('class', $vars, 'elgg-walledgarden-single');
+echo elgg_view_module('walledgarden', '', $vars['content'], array(
+	'class' => $class,
+	'id' => elgg_extract('id', $vars, ''),
+	'header' => ' ',
+	'footer' => ' ',
+));
diff --git a/views/default/page/layouts/widgets.php b/views/default/page/layouts/widgets.php
index 342150f70..c6b162516 100644
--- a/views/default/page/layouts/widgets.php
+++ b/views/default/page/layouts/widgets.php
@@ -16,6 +16,8 @@ $show_access = elgg_extract('show_access', $vars, true);
 
 $owner = elgg_get_page_owner_entity();
 
+$widget_types = elgg_get_widget_types();
+
 $context = elgg_get_context();
 elgg_push_context('widgets');
 
@@ -29,6 +31,7 @@ if (elgg_can_edit_widget_layout($context)) {
 		'widgets' => $widgets,
 		'context' => $context,
 		'exact_match' => $exact_match,
+		'show_access' => $show_access,
 	);
 	echo elgg_view('page/layouts/widgets/add_panel', $params);
 }
@@ -37,12 +40,18 @@ echo $vars['content'];
 
 $widget_class = "elgg-col-1of{$num_columns}";
 for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
-	$column_widgets = $widgets[$column_index];
+	if (isset($widgets[$column_index])) {
+		$column_widgets = $widgets[$column_index];
+	} else {
+		$column_widgets = array();
+	}
 
 	echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">";
-	if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
+	if (sizeof($column_widgets) > 0) {
 		foreach ($column_widgets as $widget) {
-			echo elgg_view_entity($widget, array('show_access' => $show_access));
+			if (array_key_exists($widget->handler, $widget_types)) {
+				echo elgg_view_entity($widget, array('show_access' => $show_access));
+			}
 		}
 	}
 	echo '</div>';
diff --git a/views/default/page/layouts/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
index 0304c50a0..c33a45f99 100644
--- a/views/default/page/layouts/widgets/add_button.php
+++ b/views/default/page/layouts/widgets/add_button.php
@@ -4,7 +4,13 @@
  */
 ?>
 <div class="elgg-widget-add-control">
-	<a class="elgg-button-action elgg-toggle" id="elgg-toggler-add-widgets">
-		<?php echo elgg_echo('widgets:add'); ?>
-	</a>
+<?php
+	echo elgg_view('output/url', array(
+		'href' => '#widgets-add-panel',
+		'text' => elgg_echo('widgets:add'),
+		'class' => 'elgg-button elgg-button-action',
+		'rel' => 'toggle',
+		'is_trusted' => true,
+	));
+?>
 </div>
diff --git a/views/default/page/layouts/widgets/add_panel.php b/views/default/page/layouts/widgets/add_panel.php
index 38c133c4a..d9b11342a 100644
--- a/views/default/page/layouts/widgets/add_panel.php
+++ b/views/default/page/layouts/widgets/add_panel.php
@@ -12,6 +12,7 @@ $context = $vars['context'];
 $exact = elgg_extract('exact_match', $vars, false);
 
 $widget_types = elgg_get_widget_types($context, $exact);
+uasort($widget_types, create_function('$a,$b', 'return strcmp($a->name,$b->name);'));
 
 $current_handlers = array();
 foreach ($widgets as $column_widgets) {
@@ -21,7 +22,7 @@ foreach ($widgets as $column_widgets) {
 }
 
 ?>
-<div class="elgg-widgets-add-panel hidden clearfix" id="elgg-togglee-add-widgets">
+<div class="elgg-widgets-add-panel hidden clearfix" id="widgets-add-panel">
 	<p>
 		<?php echo elgg_echo('widgets:add:description'); ?>
 	</p>
@@ -49,10 +50,13 @@ foreach ($widgets as $column_widgets) {
 ?>
 	</ul>
 <?php
-	$params = array(
+	echo elgg_view('input/hidden', array(
 		'name' => 'widget_context',
 		'value' => $context
-	);
-	echo elgg_view('input/hidden', $params);
+	));
+	echo elgg_view('input/hidden', array(
+		'name' => 'show_access',
+		'value' => (int)$vars['show_access']
+	));
 ?>
 </div>