Refs #2950: update locations of layout elements + moved page/components/list/body into object/elements/list_body -- not sure if this will be the final location

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

3 files changed, 5 insertions, 58 deletions

diff --git a/views/default/page/components/list/body.php b/views/default/page/components/list/body.php
deleted file mode 100644
index ef62df198..000000000
--- a/views/default/page/components/list/body.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * List body
- *
- * Sample output
- * <ul class="elgg-list-metadata"><li>Public</li><li>Like this</li></ul>
- * <h3><a href="">Title</a></h3>
- * <p class="elgg-subtext">Posted 3 hours ago by George</p>
- * <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
- * <div class="elgg-list-content">Excerpt text</div>
- *
- * @uses $vars['entity']    ElggEntity
- * @uses $vars['title']     Title link (optional) false = no title, '' = default
- * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
- * @uses $vars['subtitle']  HTML for the subtitle (optional)
- * @uses $vars['tags']      HTML for the tags (optional)
- * @uses $vars['content']   HTML for the entity content (optional)
- */
-
-$entity = $vars['entity'];
-
-$title_link = elgg_extract('title', $vars, '');
-if ($title_link === '') {
-	if (isset($entity->title)) {
-		$text = $entity->title;
-	} else {
-		$text = $entity->name;
-	}
-	$params = array(
-		'text' => $text,
-		'href' => $entity->getURL(),
-	);
-	$title_link = elgg_view('output/url', $params);
-}
-
-$metadata = elgg_extract('metadata', $vars, '');
-$subtitle = elgg_extract('subtitle', $vars, '');
-$content = elgg_extract('content', $vars, '');
-
-$tags = elgg_extract('tags', $vars, '');
-if ($tags !== false) {
-	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
-}
-
-if ($metadata) {
-	echo $metadata;
-}
-echo "<h3>$title_link</h3>";
-echo "<p class=\"elgg-subtext\">$subtitle</p>";
-echo $tags;
-if ($content) {
-	echo "<div class=\"elgg-list-content\">$content</div>";
-}
diff --git a/views/default/page/layouts/content.php b/views/default/page/layouts/content.php
index 69772985a..6c47da2b9 100644
--- a/views/default/page/layouts/content.php
+++ b/views/default/page/layouts/content.php
@@ -28,13 +28,13 @@ $nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
 if (isset($vars['header'])) {
 	$vars['header_override'] = $vars['header'];
 }
-$header = elgg_view('layout/shells/content/header', $vars);
+$header = elgg_view('page/layouts/content/header', $vars);
 
 // allow page handlers to override the default filter
 if (isset($vars['filter'])) {
 	$vars['filter_override'] = $vars['filter'];
 }
-$filter = elgg_view('layout/shells/content/filter', $vars);
+$filter = elgg_view('page/layouts/content/filter', $vars);
 
 // the all important content
 $content = elgg_extract('content', $vars, '');
@@ -43,7 +43,7 @@ $content = elgg_extract('content', $vars, '');
 $footer_content = elgg_extract('footer', $vars, '');
 $params = $vars;
 $params['content'] = $footer_content;
-$footer = elgg_view('layout/shells/content/footer', $params);
+$footer = elgg_view('page/layouts/content/footer', $params);
 
 $body = $nav . $header . $filter . $content . $footer;
 
diff --git a/views/default/page/layouts/widgets.php b/views/default/page/layouts/widgets.php
index eac9d43fc..342150f70 100644
--- a/views/default/page/layouts/widgets.php
+++ b/views/default/page/layouts/widgets.php
@@ -23,14 +23,14 @@ $widgets = elgg_get_widgets($owner->guid, $context);
 
 if (elgg_can_edit_widget_layout($context)) {
 	if ($show_add_widgets) {
-		echo elgg_view('layout/shells/widgets/add_button');
+		echo elgg_view('page/layouts/widgets/add_button');
 	}
 	$params = array(
 		'widgets' => $widgets,
 		'context' => $context,
 		'exact_match' => $exact_match,
 	);
-	echo elgg_view('layout/shells/widgets/add_panel', $params);
+	echo elgg_view('page/layouts/widgets/add_panel', $params);
 }
 
 echo $vars['content'];