From dd09373e0cefa8d33d0e9faa741593802d53c2a7 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 18 Feb 2011 18:37:32 +0000
Subject: Refs #2950: layout/objects => page/components

git-svn-id: http://code.elgg.org/elgg/trunk@8288 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/deprecated-1.8.php                      |  4 +-
 engine/lib/river.php                               |  2 +-
 engine/lib/views.php                               | 16 ++---
 .../views/default/theme_preview/objects.php        |  2 +-
 views/default/core/river/body.php                  |  2 +-
 views/default/layout/objects/gallery.php           | 75 ----------------------
 views/default/layout/objects/image_block.php       | 52 ---------------
 views/default/layout/objects/list.php              | 75 ----------------------
 views/default/layout/objects/module.php            | 52 ---------------
 views/default/layout/objects/widget.php            | 67 -------------------
 views/default/object/widget.php                    |  2 +-
 views/default/page/components/gallery.php          | 75 ++++++++++++++++++++++
 views/default/page/components/image_block.php      | 52 +++++++++++++++
 views/default/page/components/list.php             | 75 ++++++++++++++++++++++
 views/default/page/components/module.php           | 52 +++++++++++++++
 views/default/page/components/widget.php           | 67 +++++++++++++++++++
 views/default/page/elements/owner_block.php        |  2 +-
 views/default/river/item.php                       |  2 +-
 18 files changed, 337 insertions(+), 337 deletions(-)
 delete mode 100644 views/default/layout/objects/gallery.php
 delete mode 100644 views/default/layout/objects/image_block.php
 delete mode 100644 views/default/layout/objects/list.php
 delete mode 100644 views/default/layout/objects/module.php
 delete mode 100644 views/default/layout/objects/widget.php
 create mode 100644 views/default/page/components/gallery.php
 create mode 100644 views/default/page/components/image_block.php
 create mode 100644 views/default/page/components/list.php
 create mode 100644 views/default/page/components/module.php
 create mode 100644 views/default/page/components/widget.php

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index 3f65fb58e..4562f5b4d 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -2222,7 +2222,7 @@ $posted_max = 0, $pagination = true) {
 		'list-class' => 'elgg-river-list',
 	);
 
-	return elgg_view('layout/objects/list', $params);
+	return elgg_view('page/components/list', $params);
 }
 
 /**
@@ -2820,7 +2820,7 @@ function page_draw($title, $body, $sidebar = "") {
  */
 function elgg_view_listing($icon, $info) {
 	elgg_deprecated_notice('elgg_view_listing deprecated by elgg_view_image_block', 1.8);
-	return elgg_view('layout/objects/image_block', array('image' => $icon, 'body' => $info));
+	return elgg_view('page/components/image_block', array('image' => $icon, 'body' => $info));
 }
 
 /**
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 4cb9c30f4..3a351805e 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -343,7 +343,7 @@ function elgg_list_river(array $options = array()) {
 
 	$options['count'] = $count;
 	$options['items'] = $items;
-	return elgg_view('layout/objects/list', $options);
+	return elgg_view('page/components/list', $options);
 }
 
 /**
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 5ea93de7c..918ca6446 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -950,9 +950,9 @@ $list_type_toggle = true, $pagination = true) {
 	}
 
 	if ($vars['gallery']) {
-		return elgg_view('layout/objects/gallery', $vars);
+		return elgg_view('page/components/gallery', $vars);
 	} else {
-		return elgg_view('layout/objects/list', $vars);
+		return elgg_view('page/components/list', $vars);
 	}
 }
 
@@ -982,7 +982,7 @@ function elgg_view_annotation_list($annotations, array $vars = array()) {
 
 	$vars = array_merge($defaults, $vars);
 
-	return elgg_view('layout/objects/list', $vars);
+	return elgg_view('page/components/list', $vars);
 }
 
 /**
@@ -1111,7 +1111,7 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
 	);
 	$comments = elgg_get_annotations($options);
 
-	$body = elgg_view('layout/objects/list', array(
+	$body = elgg_view('page/components/list', array(
 		'items' => $comments,
 		'pagination' => false,
 		'list_class' => 'elgg-latest-comments',
@@ -1146,7 +1146,7 @@ function elgg_view_likes($entity) {
  * Fixed width media on the side (image, icon, flash, etc.).
  * Descriptive content filling the rest of the column.
  *
- * This is a shortcut for {@elgg_view layout/objects/image_block}.
+ * This is a shortcut for {@elgg_view page/components/image_block}.
  *
  * @param string $image   The icon and other information
  * @param string $body    Description content
@@ -1158,7 +1158,7 @@ function elgg_view_likes($entity) {
 function elgg_view_image_block($image, $body, $vars = array()) {
 	$vars['image'] = $image;
 	$vars['body'] = $body;
-	return elgg_view('layout/objects/image_block', $vars);
+	return elgg_view('page/components/image_block', $vars);
 }
 
 /**
@@ -1166,7 +1166,7 @@ function elgg_view_image_block($image, $body, $vars = array()) {
  *
  * Box with header, body, footer
  *
- * This is a shortcut for {@elgg_view layout/objects/module}.
+ * This is a shortcut for {@elgg_view page/components/module}.
  *
  * @param string $type  The type of module (main, info, popup, aside, etc.)
  * @param string $title A title to put in the header
@@ -1180,7 +1180,7 @@ function elgg_view_module($type, $title, $body, $vars = array()) {
 	$vars['class'] .= " elgg-module-$type"; //@todo this will probably cause errors?
 	$vars['title'] = $title;
 	$vars['body'] = $body;
-	return elgg_view('layout/objects/module', $vars);
+	return elgg_view('page/components/module', $vars);
 }
 
 /**
diff --git a/mod/developers/views/default/theme_preview/objects.php b/mod/developers/views/default/theme_preview/objects.php
index 446258115..c67348c0d 100644
--- a/mod/developers/views/default/theme_preview/objects.php
+++ b/mod/developers/views/default/theme_preview/objects.php
@@ -47,7 +47,7 @@ $ipsum = elgg_view('developers/ipsum');
 		$obj2 = new ElggObject();
 		$obj2->title = "Object 2";
 		$obj2->description = $ipsum;
-		echo elgg_view('layout/objects/list', array('items' => array($obj1, $obj2)));
+		echo elgg_view('page/components/list', array('items' => array($obj1, $obj2)));
 	?>
 	</div>
 	<h2>Table</h2>
diff --git a/views/default/core/river/body.php b/views/default/core/river/body.php
index 66fe45f3d..e3c34acda 100644
--- a/views/default/core/river/body.php
+++ b/views/default/core/river/body.php
@@ -23,7 +23,7 @@ $body = elgg_view($item->getView(), array('item' => $item));
 // footer
 $footer = elgg_view('core/river/footer', $vars);
 
-echo elgg_view('layout/objects/module', array(
+echo elgg_view('page/components/module', array(
 	'header' => $header,
 	'body' => $body,
 	'footer' => $footer,
diff --git a/views/default/layout/objects/gallery.php b/views/default/layout/objects/gallery.php
deleted file mode 100644
index f57cc99ba..000000000
--- a/views/default/layout/objects/gallery.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Gallery view
- *
- * @uses $vars['items']
- *
- * @todo not complete - number of columns
- */
-
-$items = $vars['items'];
-if (!is_array($items) && sizeof($items) == 0) {
-	return true;
-}
-
-elgg_push_context('gallery');
-
-$offset = $vars['offset'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$pagination = elgg_extract('pagination', $vars, true);
-$full_view = elgg_extract('full_view', $vars, false);
-$offset_key = elgg_extract('offset_key', $vars, 'offset');
-$position = elgg_extract('position', $vars, 'after');
-
-$num_columns = 4;
-
-
-if ($pagination && $count) {
-	$nav .= elgg_view('navigation/pagination', array(
-		'offset' => $offset,
-		'count' => $count,
-		'limit' => $limit,
-		'offset_key' => $offset_key,
-	));
-}
-
-if ($position == 'before' || $position == 'both') {
-	echo $nav;
-}
-
-?>
-<table class="elgg-gallery">
-<?php
-
-$col = 0;
-foreach ($items as $item) {
-	if ($col == 0) {
-		echo '<tr>';
-	}
-	$col++;
-
-	echo '<td>';
-	echo elgg_view_list_item($item, $full_view, $vars);
-	echo "</td>";
-
-	if ($col == $num_columns) {
-		echo '</tr>';
-		$col = 0;
-	}
-}
-
-if ($col > 0) {
-	echo '</tr>';
-}
-
-?>
-
-</table>
-
-<?php
-if ($position == 'after' || $position == 'both') {
-	echo $nav;
-}
-
-elgg_pop_context();
diff --git a/views/default/layout/objects/image_block.php b/views/default/layout/objects/image_block.php
deleted file mode 100644
index a7f480aef..000000000
--- a/views/default/layout/objects/image_block.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Elgg image block pattern
- *
- * Common pattern where there is an image, icon, media object to the left
- * and a descriptive block of text to the right.
- * 
- * ---------------------------------------------------------------
- * |          |                                      |    alt    |
- * |  image   |               body                   |   image   |
- * |  block   |               block                  |   block   |
- * |          |                                      | (optional)|
- * ---------------------------------------------------------------
- *
- * @uses $vars['body']        HTML content of the body block
- * @uses $vars['image']       HTML content of the image block
- * @uses $vars['image_alt']   HTML content of the alternate image block
- * @uses $vars['class']       Optional additional class for media element
- * @uses $vars['id']          Optional id for the media element
- */
-
-$body = elgg_extract('body', $vars, '');
-$image = elgg_extract('image', $vars, '');
-$alt_image = elgg_extract('image_alt', $vars, '');
-
-$class = 'elgg-image-block';
-$additional_class = elgg_extract('class', $vars, '');
-if ($additional_class) {
-	$class = "$class $additional_class";
-}
-
-$id = '';
-if (isset($vars['id'])) {
-	$id = "id=\"{$vars['id']}\"";
-}
-
-
-$body = "<div class=\"elgg-body\">$body</div>";
-
-if ($image) {
-	$image = "<div class=\"elgg-image\">$image</div>";
-}
-
-if ($alt_image) {
-	$alt_image = "<div class=\"elgg-image-alt\">$alt_image</div>";
-}
-
-echo <<<HTML
-<div class="$class clearfix" $id>
-	$image$alt_image$body
-</div>
-HTML;
diff --git a/views/default/layout/objects/list.php b/views/default/layout/objects/list.php
deleted file mode 100644
index 374922ecd..000000000
--- a/views/default/layout/objects/list.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * View a list of items
- *
- * @package Elgg
- *
- * @uses $vars['items']       Array of ElggEntity or ElggAnnotation objects
- * @uses $vars['offset']      Index of the first list item in complete list
- * @uses $vars['limit']       Number of items per page
- * @uses $vars['count']       Number of items in the complete list
- * @uses $vars['base_url']    Base URL of list (optional)
- * @uses $vars['pagination']  Show pagination? (default: true)
- * @uses $vars['position']    Position of the pagination: before, after, or both
- * @uses $vars['full_view']   Show the full view of the items (default: false)
- * @uses $vars['list_class']  Additional CSS class for the <ul> element
- * @uses $vars['item_class']  Additional CSS class for the <li> elements
- */
-
-$items = $vars['items'];
-$offset = $vars['offset'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$base_url = $vars['base_url'];
-$pagination = elgg_extract('pagination', $vars, true);
-$full_view = elgg_extract('full_view', $vars, false);
-$offset_key = elgg_extract('offset_key', $vars, 'offset');
-$position = elgg_extract('position', $vars, 'after');
-
-$list_class = 'elgg-list';
-if (isset($vars['list_class'])) {
-	$list_class = "{$vars['list_class']} $list_class";
-}
-
-$item_class = 'elgg-list-item';
-if (isset($vars['item_class'])) {
-	$item_class = "{$vars['item_class']} $item_class";
-}
-
-$html = "";
-$nav = "";
-
-if ($pagination && $count) {
-	$nav .= elgg_view('navigation/pagination', array(
-		'baseurl' => $base_url,
-		'offset' => $offset,
-		'count' => $count,
-		'limit' => $limit,
-		'offset_key' => $offset_key,
-	));
-}
-
-if (is_array($items) && count($items) > 0) {
-	$html .= "<ul class=\"$list_class\">";
-	foreach ($items as $item) {
-		if (elgg_instanceof($item)) {
-			$id = "elgg-{$item->getType()}-{$item->getGUID()}";
-		} else {
-			$id = "item-{$item->getType()}-{$item->id}";
-		}
-		$html .= "<li id=\"$id\" class=\"$item_class\">";
-		$html .= elgg_view_list_item($item, $full_view, $vars);
-		$html .= '</li>';
-	}
-	$html .= '</ul>';
-}
-
-if ($position == 'before' || $position == 'both') {
-	$html = $nav . $html;
-}
-
-if ($position == 'after' || $position == 'both') {
-	$html .= $nav;
-}
-
-echo $html;
diff --git a/views/default/layout/objects/module.php b/views/default/layout/objects/module.php
deleted file mode 100644
index f7b9da59c..000000000
--- a/views/default/layout/objects/module.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Elgg module element
- *
- * @uses $vars['title']        Title text
- * @uses $vars['header']       HTML content of the header
- * @uses $vars['body']         HTML content of the body
- * @uses $vars['footer']       HTML content of the footer
- * @uses $vars['class']        Optional additional class for module
- * @uses $vars['id']           Optional id for module
- * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
- */
-
-$title = elgg_extract('title', $vars, '');
-$header = elgg_extract('header', $vars, '');
-$body = elgg_extract('body', $vars, '');
-$footer = elgg_extract('footer', $vars, '');
-$show_inner = elgg_extract('show_inner', $vars, false);
-
-$class = 'elgg-module';
-$additional_class = elgg_extract('class', $vars, '');
-if ($additional_class) {
-	$class = "$class $additional_class";
-}
-
-$id = '';
-if (isset($vars['id'])) {
-	$id = "id=\"{$vars['id']}\"";
-}
-
-if (isset($vars['header'])) {
-	if ($vars['header']) {
-		$header = "<div class=\"elgg-head\">$header</div>";
-	}
-} else {
-	$header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
-}
-
-$body = "<div class=\"elgg-body\">$body</div>";
-
-if (isset($vars['footer'])) {
-	if ($vars['footer']) {
-		$footer = "<div class=\"elgg-foot\">$footer</div>";
-	}
-}
-
-$contents = $header . $body . $footer;
-if ($show_inner) {
-	$contents = "<div class=\"elgg-inner\">$contents</div>";
-}
-
-echo "<div class=\"$class\" $id>$contents</div>";
diff --git a/views/default/layout/objects/widget.php b/views/default/layout/objects/widget.php
deleted file mode 100644
index d5e2c4ca2..000000000
--- a/views/default/layout/objects/widget.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Widget object
- *
- * @uses $vars['entity']      ElggWidget
- * @uses $vars['show_access'] Show the access control in edit area? (true)
- */
-
-$widget = $vars['entity'];
-if (!elgg_instanceof($widget, 'object', 'widget')) {
-	return true;
-}
-
-$show_access = elgg_extract('show_access', $vars, true);
-
-// @todo catch for disabled plugins
-$widget_types = elgg_get_widget_types('all');
-
-$handler = $widget->handler;
-
-$title = $widget->getTitle();
-
-$edit_area = '';
-$can_edit = $widget->canEdit();
-if ($can_edit) {
-	$edit_area = elgg_view('layout/objects/widget/settings', array(
-		'widget' => $widget,
-		'show_access' => $show_access,
-	));
-}
-$controls = elgg_view('layout/objects/widget/controls', array(
-	'widget' => $widget,
-	'show_edit' => $edit_area != '',
-));
-
-
-if (elgg_view_exists("widgets/$handler/content")) {
-	$content = elgg_view("widgets/$handler/content", $vars);
-} else {
-	elgg_deprecated_notice("widgets use content as the display view", 1.8);
-	$content = elgg_view("widgets/$handler/view", $vars);
-}
-
-
-$widget_id = "elgg-widget-$widget->guid";
-$widget_instance = "elgg-widget-instance-$handler";
-$widget_class = "elgg-module elgg-module-widget";
-if ($can_edit) {
-	$widget_class .= " elgg-state-draggable $widget_instance";
-} else {
-	$widget_class .= " elgg-state-fixed $widget_instance";
-}
-
-echo <<<HTML
-<div class="$widget_class" id="$widget_id">
-	<div class="elgg-head">
-		<h3>$title</h3>
-		$controls
-	</div>
-	<div class="elgg-body">
-		$edit_area
-		<div class="elgg-widget-content">
-			$content
-		</div>
-	</div>
-</div>
-HTML;
diff --git a/views/default/object/widget.php b/views/default/object/widget.php
index 1da5897c3..efc8ef9ae 100644
--- a/views/default/object/widget.php
+++ b/views/default/object/widget.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view('layout/objects/widget', $vars);
+echo elgg_view('page/components/widget', $vars);
diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
new file mode 100644
index 000000000..f57cc99ba
--- /dev/null
+++ b/views/default/page/components/gallery.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Gallery view
+ *
+ * @uses $vars['items']
+ *
+ * @todo not complete - number of columns
+ */
+
+$items = $vars['items'];
+if (!is_array($items) && sizeof($items) == 0) {
+	return true;
+}
+
+elgg_push_context('gallery');
+
+$offset = $vars['offset'];
+$limit = $vars['limit'];
+$count = $vars['count'];
+$pagination = elgg_extract('pagination', $vars, true);
+$full_view = elgg_extract('full_view', $vars, false);
+$offset_key = elgg_extract('offset_key', $vars, 'offset');
+$position = elgg_extract('position', $vars, 'after');
+
+$num_columns = 4;
+
+
+if ($pagination && $count) {
+	$nav .= elgg_view('navigation/pagination', array(
+		'offset' => $offset,
+		'count' => $count,
+		'limit' => $limit,
+		'offset_key' => $offset_key,
+	));
+}
+
+if ($position == 'before' || $position == 'both') {
+	echo $nav;
+}
+
+?>
+<table class="elgg-gallery">
+<?php
+
+$col = 0;
+foreach ($items as $item) {
+	if ($col == 0) {
+		echo '<tr>';
+	}
+	$col++;
+
+	echo '<td>';
+	echo elgg_view_list_item($item, $full_view, $vars);
+	echo "</td>";
+
+	if ($col == $num_columns) {
+		echo '</tr>';
+		$col = 0;
+	}
+}
+
+if ($col > 0) {
+	echo '</tr>';
+}
+
+?>
+
+</table>
+
+<?php
+if ($position == 'after' || $position == 'both') {
+	echo $nav;
+}
+
+elgg_pop_context();
diff --git a/views/default/page/components/image_block.php b/views/default/page/components/image_block.php
new file mode 100644
index 000000000..a7f480aef
--- /dev/null
+++ b/views/default/page/components/image_block.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Elgg image block pattern
+ *
+ * Common pattern where there is an image, icon, media object to the left
+ * and a descriptive block of text to the right.
+ * 
+ * ---------------------------------------------------------------
+ * |          |                                      |    alt    |
+ * |  image   |               body                   |   image   |
+ * |  block   |               block                  |   block   |
+ * |          |                                      | (optional)|
+ * ---------------------------------------------------------------
+ *
+ * @uses $vars['body']        HTML content of the body block
+ * @uses $vars['image']       HTML content of the image block
+ * @uses $vars['image_alt']   HTML content of the alternate image block
+ * @uses $vars['class']       Optional additional class for media element
+ * @uses $vars['id']          Optional id for the media element
+ */
+
+$body = elgg_extract('body', $vars, '');
+$image = elgg_extract('image', $vars, '');
+$alt_image = elgg_extract('image_alt', $vars, '');
+
+$class = 'elgg-image-block';
+$additional_class = elgg_extract('class', $vars, '');
+if ($additional_class) {
+	$class = "$class $additional_class";
+}
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+}
+
+
+$body = "<div class=\"elgg-body\">$body</div>";
+
+if ($image) {
+	$image = "<div class=\"elgg-image\">$image</div>";
+}
+
+if ($alt_image) {
+	$alt_image = "<div class=\"elgg-image-alt\">$alt_image</div>";
+}
+
+echo <<<HTML
+<div class="$class clearfix" $id>
+	$image$alt_image$body
+</div>
+HTML;
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
new file mode 100644
index 000000000..374922ecd
--- /dev/null
+++ b/views/default/page/components/list.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * View a list of items
+ *
+ * @package Elgg
+ *
+ * @uses $vars['items']       Array of ElggEntity or ElggAnnotation objects
+ * @uses $vars['offset']      Index of the first list item in complete list
+ * @uses $vars['limit']       Number of items per page
+ * @uses $vars['count']       Number of items in the complete list
+ * @uses $vars['base_url']    Base URL of list (optional)
+ * @uses $vars['pagination']  Show pagination? (default: true)
+ * @uses $vars['position']    Position of the pagination: before, after, or both
+ * @uses $vars['full_view']   Show the full view of the items (default: false)
+ * @uses $vars['list_class']  Additional CSS class for the <ul> element
+ * @uses $vars['item_class']  Additional CSS class for the <li> elements
+ */
+
+$items = $vars['items'];
+$offset = $vars['offset'];
+$limit = $vars['limit'];
+$count = $vars['count'];
+$base_url = $vars['base_url'];
+$pagination = elgg_extract('pagination', $vars, true);
+$full_view = elgg_extract('full_view', $vars, false);
+$offset_key = elgg_extract('offset_key', $vars, 'offset');
+$position = elgg_extract('position', $vars, 'after');
+
+$list_class = 'elgg-list';
+if (isset($vars['list_class'])) {
+	$list_class = "{$vars['list_class']} $list_class";
+}
+
+$item_class = 'elgg-list-item';
+if (isset($vars['item_class'])) {
+	$item_class = "{$vars['item_class']} $item_class";
+}
+
+$html = "";
+$nav = "";
+
+if ($pagination && $count) {
+	$nav .= elgg_view('navigation/pagination', array(
+		'baseurl' => $base_url,
+		'offset' => $offset,
+		'count' => $count,
+		'limit' => $limit,
+		'offset_key' => $offset_key,
+	));
+}
+
+if (is_array($items) && count($items) > 0) {
+	$html .= "<ul class=\"$list_class\">";
+	foreach ($items as $item) {
+		if (elgg_instanceof($item)) {
+			$id = "elgg-{$item->getType()}-{$item->getGUID()}";
+		} else {
+			$id = "item-{$item->getType()}-{$item->id}";
+		}
+		$html .= "<li id=\"$id\" class=\"$item_class\">";
+		$html .= elgg_view_list_item($item, $full_view, $vars);
+		$html .= '</li>';
+	}
+	$html .= '</ul>';
+}
+
+if ($position == 'before' || $position == 'both') {
+	$html = $nav . $html;
+}
+
+if ($position == 'after' || $position == 'both') {
+	$html .= $nav;
+}
+
+echo $html;
diff --git a/views/default/page/components/module.php b/views/default/page/components/module.php
new file mode 100644
index 000000000..f7b9da59c
--- /dev/null
+++ b/views/default/page/components/module.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Elgg module element
+ *
+ * @uses $vars['title']        Title text
+ * @uses $vars['header']       HTML content of the header
+ * @uses $vars['body']         HTML content of the body
+ * @uses $vars['footer']       HTML content of the footer
+ * @uses $vars['class']        Optional additional class for module
+ * @uses $vars['id']           Optional id for module
+ * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
+ */
+
+$title = elgg_extract('title', $vars, '');
+$header = elgg_extract('header', $vars, '');
+$body = elgg_extract('body', $vars, '');
+$footer = elgg_extract('footer', $vars, '');
+$show_inner = elgg_extract('show_inner', $vars, false);
+
+$class = 'elgg-module';
+$additional_class = elgg_extract('class', $vars, '');
+if ($additional_class) {
+	$class = "$class $additional_class";
+}
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+}
+
+if (isset($vars['header'])) {
+	if ($vars['header']) {
+		$header = "<div class=\"elgg-head\">$header</div>";
+	}
+} else {
+	$header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
+}
+
+$body = "<div class=\"elgg-body\">$body</div>";
+
+if (isset($vars['footer'])) {
+	if ($vars['footer']) {
+		$footer = "<div class=\"elgg-foot\">$footer</div>";
+	}
+}
+
+$contents = $header . $body . $footer;
+if ($show_inner) {
+	$contents = "<div class=\"elgg-inner\">$contents</div>";
+}
+
+echo "<div class=\"$class\" $id>$contents</div>";
diff --git a/views/default/page/components/widget.php b/views/default/page/components/widget.php
new file mode 100644
index 000000000..d5e2c4ca2
--- /dev/null
+++ b/views/default/page/components/widget.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Widget object
+ *
+ * @uses $vars['entity']      ElggWidget
+ * @uses $vars['show_access'] Show the access control in edit area? (true)
+ */
+
+$widget = $vars['entity'];
+if (!elgg_instanceof($widget, 'object', 'widget')) {
+	return true;
+}
+
+$show_access = elgg_extract('show_access', $vars, true);
+
+// @todo catch for disabled plugins
+$widget_types = elgg_get_widget_types('all');
+
+$handler = $widget->handler;
+
+$title = $widget->getTitle();
+
+$edit_area = '';
+$can_edit = $widget->canEdit();
+if ($can_edit) {
+	$edit_area = elgg_view('layout/objects/widget/settings', array(
+		'widget' => $widget,
+		'show_access' => $show_access,
+	));
+}
+$controls = elgg_view('layout/objects/widget/controls', array(
+	'widget' => $widget,
+	'show_edit' => $edit_area != '',
+));
+
+
+if (elgg_view_exists("widgets/$handler/content")) {
+	$content = elgg_view("widgets/$handler/content", $vars);
+} else {
+	elgg_deprecated_notice("widgets use content as the display view", 1.8);
+	$content = elgg_view("widgets/$handler/view", $vars);
+}
+
+
+$widget_id = "elgg-widget-$widget->guid";
+$widget_instance = "elgg-widget-instance-$handler";
+$widget_class = "elgg-module elgg-module-widget";
+if ($can_edit) {
+	$widget_class .= " elgg-state-draggable $widget_instance";
+} else {
+	$widget_class .= " elgg-state-fixed $widget_instance";
+}
+
+echo <<<HTML
+<div class="$widget_class" id="$widget_id">
+	<div class="elgg-head">
+		<h3>$title</h3>
+		$controls
+	</div>
+	<div class="elgg-body">
+		$edit_area
+		<div class="elgg-widget-content">
+			$content
+		</div>
+	</div>
+</div>
+HTML;
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index 8cfa2d683..2f9fc8603 100644
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -25,7 +25,7 @@ if ($owner instanceof ElggGroup ||
 	$body .= elgg_view('page/elements/owner_block/extend', $vars);
 
 	//@todo elgg-module-owner-block?
-	echo elgg_view('layout/objects/module', array(
+	echo elgg_view('page/components/module', array(
 		'header' => $header,
 		'body' => $body,
 		'class' => 'elgg-owner-block',
diff --git a/views/default/river/item.php b/views/default/river/item.php
index 388c0a79b..1f28bcb76 100644
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -8,4 +8,4 @@ $vars = array(
 	'class' => 'elgg-river-item',
 );
 
-echo elgg_view('layout/objects/image_block', $vars);
\ No newline at end of file
+echo elgg_view('page/components/image_block', $vars);
\ No newline at end of file
-- 
cgit v1.2.3