5 files changed, 107 insertions, 4 deletions
diff --git a/views/default/layout/shells/content.php b/views/default/layout/shells/content.php
index 908197a39..b46f09ac1 100644
--- a/views/default/layout/shells/content.php
+++ b/views/default/layout/shells/content.php
@@ -18,7 +18,7 @@
 $sidebar_content = elgg_get_array_value('sidebar', $vars, '');
 $params = $vars;
 $params['content'] = $sidebar_content;
-$sidebar = elgg_view('content/sidebar', $params);
+$sidebar = elgg_view('layout/shells/content/sidebar', $params);
 
 // navigation defaults to breadcrumbs
 $nav = elgg_get_array_value('nav', $vars, elgg_view('navigation/breadcrumbs'));
@@ -27,13 +27,13 @@ $nav = elgg_get_array_value('nav', $vars, elgg_view('navigation/breadcrumbs'));
 if (isset($vars['header'])) {
 	$vars['header_override'] = $vars['header'];
 }
-$header = elgg_view('content/header', $vars);
+$header = elgg_view('layout/shells/content/header', $vars);
 
 // allow page handlers to override the default filter
 if (isset($vars['filter'])) {
 	$vars['filter_override'] = $vars['filter'];
 }
-$filter = elgg_view('content/filter', $vars);
+$filter = elgg_view('layout/shells/content/filter', $vars);
 
 // the all important content
 $content = elgg_get_array_value('content', $vars, '');
@@ -42,7 +42,7 @@ $content = elgg_get_array_value('content', $vars, '');
 $footer_content = elgg_get_array_value('footer', $vars, '');
 $params = $vars;
 $params['content'] = $footer_content;
-$footer = elgg_view('content/footer', $params);
+$footer = elgg_view('layout/shells/content/footer', $params);
 
 $body = $nav . $header . $filter . $content . $footer;
 
diff --git a/views/default/layout/shells/content/filter.php b/views/default/layout/shells/content/filter.php
new file mode 100644
index 000000000..0b2562450
--- /dev/null
+++ b/views/default/layout/shells/content/filter.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Main content filter
+ *
+ * Select between user, friends, and all content
+ *
+ * @uses $vars['filter_context'] Filter context: everyone, friends, mine
+ * @uses $vars['filter_override'] HTML for overriding the default filter (override)
+ * @uses $vars['context']         Page context (override)
+ */
+
+if (isset($vars['filter_override'])) {
+	echo $vars['filter_override'];
+	return true;
+}
+
+$context = elgg_get_array_value('context', $vars, elgg_get_context());
+
+if (isloggedin() && $context) {
+	$username = get_loggedin_user()->username;
+	$filter_context = elgg_get_array_value('filter_context', $vars, 'everyone');
+
+	// 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/",
+			'selected' => ($filter_context == 'everyone'),
+		),
+		'mine' => array(
+			'title' => elgg_echo('mine'),
+			'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$context/owner/$username/",
+			'selected' => ($filter_context == 'mine'),
+		),
+		'friend' => array(
+			'title' => elgg_echo('friends'),
+			'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$context/friends/$username/",
+			'selected' => ($filter_context == 'friends'),
+		),
+	);
+
+	echo elgg_view('navigation/tabs', array('tabs' => $tabs));
+}
diff --git a/views/default/layout/shells/content/footer.php b/views/default/layout/shells/content/footer.php
new file mode 100644
index 000000000..66f5d3ff8
--- /dev/null
+++ b/views/default/layout/shells/content/footer.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Main content footer
+ *
+ * @uses $vars['content'] The content for the footer
+ */
+
+echo $vars['content'];
diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php
new file mode 100644
index 000000000..a7c0d1389
--- /dev/null
+++ b/views/default/layout/shells/content/header.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Main content header
+ *
+ * This includes a title and a new content button by default
+ *
+ * @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['header_override'])) {
+	echo $vars['header_override'];
+	return true;
+}
+
+$context = elgg_get_array_value('context', $vars, elgg_get_context());
+if ($context) {
+	$title = elgg_get_array_value('title', $vars, '');
+	if (!$title) {
+		$title = elgg_echo($context);
+	}
+
+	if (isset($vars['buttons'])) {
+		$buttons = $vars['buttons'];
+	} else {
+		if (isloggedin() && $context) {
+			$username = get_loggedin_user()->username;
+			$new_link = elgg_get_array_value('new_link', $vars, "pg/$context/new/$username/");
+			$params = array(
+				'href' => $new_link = elgg_normalize_url($new_link),
+				'text' => elgg_echo("$context:new"),
+				'class' => 'action-button right',
+			);
+			$buttons = elgg_view('output/url', $params);
+		}
+	}
+	echo <<<HTML
+<div class="elgg-main-header clearfix">
+	<h2 class="elgg-main-heading">$title</h2>$buttons
+</div>
+HTML;
+}
diff --git a/views/default/layout/shells/content/sidebar.php b/views/default/layout/shells/content/sidebar.php
new file mode 100644
index 000000000..86ca8435f
--- /dev/null
+++ b/views/default/layout/shells/content/sidebar.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Main content sidebar
+ *
+ * @uses $vars['content] The content for the sidebar
+ */
+
+echo $vars['content'];