Refs #2950: layout/elements => page/elements

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

7 files changed, 3 insertions, 148 deletions

diff --git a/views/default/layout/elements/comments.php b/views/default/layout/elements/comments.php
deleted file mode 100644
index c27a146ab..000000000
--- a/views/default/layout/elements/comments.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * List comments with optional add form
- *
- * @uses $vars['entity']        ElggEntity
- * @uses $vars['show_add_form'] Display add form or not
- * @uses $vars['id']            Optional id for the div
- */
-
-$show_add_form = elgg_extract('show_add_form', $vars, true);
-
-$id = '';
-if (isset($vars['id'])) {
-	$id = "id =\"{$vars['id']}\"";
-}
-
-echo "<div $id class=\"elgg-comments\">";
-
-$options = array(
-	'guid' => $vars['entity']->getGUID(),
-	'annotation_name' => 'generic_comment'
-);
-echo elgg_list_annotations($options);
-
-if ($show_add_form) {
-	$form_vars = array('name' => 'elgg_add_comment');
-	echo elgg_view_form('comments/add', $form_vars, $vars);
-}
-
-echo '</div>';
diff --git a/views/default/layout/elements/owner_block.php b/views/default/layout/elements/owner_block.php
deleted file mode 100644
index 66bd30472..000000000
--- a/views/default/layout/elements/owner_block.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Elgg owner block
- * Displays page ownership information
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-elgg_push_context('owner_block');
-
-// groups and other users get owner block
-$owner = elgg_get_page_owner_entity();
-if ($owner instanceof ElggGroup ||
-	($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
-
-	$header = elgg_view_entity($owner, false);
-
-	$body = elgg_view_menu('owner_block', array(
-		'entity' => $owner,
-		'class' => 'elgg-owner-block-menu',
-	));
-
-	$body .= elgg_view('layout/elements/owner_block/extend', $vars);
-
-	//@todo elgg-module-owner-block?
-	echo elgg_view('layout/objects/module', array(
-		'header' => $header,
-		'body' => $body,
-		'class' => 'elgg-owner-block',
-	));
-}
-
-elgg_pop_context();
\ No newline at end of file
diff --git a/views/default/layout/elements/page_links.php b/views/default/layout/elements/page_links.php
deleted file mode 100644
index fb9acbfb7..000000000
--- a/views/default/layout/elements/page_links.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Page links: RSS link, reported content link, etc.
- */
-
-// Are there feeds to display?
-global $autofeed;
-$rss_link = '';
-if (isset($autofeed) && $autofeed == true) {
-	$url = full_url();
-	if (substr_count($url,'?')) {
-		$url .= "&view=rss";
-	} else {
-		$url .= "?view=rss";
-	}
-	$url = elgg_format_url($url);
-	$label = elgg_echo('feed:rss');
-	
-	$rss_link = elgg_view('output/url', array(
-		'text' => '<span class="elgg-icon elgg-icon-rss"></span>',
-		'href' => $url,
-		'title' => $label,
-		'rel' => 'nofollow',
-		'encode_text' => false,
-		'class' => 'right',
-	));
-}
-
-// view to extend by plugins
-$links = elgg_view('page/links', $vars);
-
-if ($links || $rss_link) {
-	echo '<div class="elgg-page-links clearfix mbm">';
-	echo $rss_link;
-	echo $links;
-	echo '</div>';
-}
diff --git a/views/default/layout/elements/sidebar.php b/views/default/layout/elements/sidebar.php
deleted file mode 100644
index 9a8a08723..000000000
--- a/views/default/layout/elements/sidebar.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Elgg sidebar contents
- *
- * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
- */
-
-echo elgg_view('layout/elements/page_links', $vars);
-
-echo elgg_view('layout/elements/owner_block', $vars);
-
-echo elgg_view_menu('page', array('sort_by' => 'name'));
-
-// optional 'sidebar' parameter
-if (isset($vars['sidebar'])) {
-	echo $vars['sidebar'];
-}
-
-// @todo deprecated so remove in Elgg 2.0
-// optional second parameter of elgg_view_layout
-if (isset($vars['area2'])) {
-	echo $vars['area2'];
-}
-
-// @todo deprecated so remove in Elgg 2.0
-// optional third parameter of elgg_view_layout
-if (isset($vars['area3'])) {
-	echo $vars['area3'];
-}
\ No newline at end of file
diff --git a/views/default/layout/elements/title.php b/views/default/layout/elements/title.php
deleted file mode 100644
index 19f47f4e6..000000000
--- a/views/default/layout/elements/title.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg title element
- *
- * @uses $vars['title'] The page title
- * @uses $vars['class'] Optional class for heading
- */
-
-$class= '';
-if (isset($vars['class'])) {
-	$class = " class=\"{$vars['class']}\"";
-}
-
-echo "<h2{$class}>{$vars['title']}</h2>";
diff --git a/views/default/layout/shells/one_sidebar.php b/views/default/layout/shells/one_sidebar.php
index 00c661e2f..53f065b3e 100644
--- a/views/default/layout/shells/one_sidebar.php
+++ b/views/default/layout/shells/one_sidebar.php
@@ -21,7 +21,7 @@ if (isset($vars['class'])) {
 <div class="<?php echo $class; ?>" id="elgg-layout-sidebar">
 	<div class="elgg-sidebar elgg-aside">
 		<?php
-			echo elgg_view('layout/elements/sidebar', $vars);
+			echo elgg_view('page/elements/sidebar', $vars);
 		?>
 	</div>
 
diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index d61914d5c..1e6c2aae7 100644
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -20,7 +20,7 @@ if (isset($vars['class'])) {
 <div class="<?php echo $class; ?>" id="elgg-layout-two-sidebar">
 	<div class="elgg-sidebar elgg-aside">
 		<?php
-			echo elgg_view('layout/elements/sidebar', $vars);
+			echo elgg_view('page/elements/sidebar', $vars);
 		?>
 	</div>
 	<div class="elgg-sidebar elgg-alt elgg-aside">
@@ -30,7 +30,7 @@ if (isset($vars['class'])) {
 			$params = array(
 				'sidebar' => elgg_view_module('test', 'Testing', 'Hello, world!'),
 			);
-			echo elgg_view('layout/elements/sidebar', $params);
+			echo elgg_view('page/elements/sidebar', $params);
 		?>
 	</div>