From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 22 Feb 2011 00:59:57 +0000 (+0000)
Subject: Refs #2950: Moved /layout/ views into /page/ dir -- still not satisfied with page... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=434223ef35bd67cdece1ce8cb0fc829a0811daf7;p=lorea%2Felgg.git

Refs #2950: Moved /layout/ views into /page/ dir -- still not satisfied with page/components/list/body, page/layouts/content/* and page/layouts/widgets/add_button

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

diff --git a/views/default/layout/objects/list/metadata.php b/views/default/layout/objects/list/metadata.php
deleted file mode 100644
index 3ce3573b9..000000000
--- a/views/default/layout/objects/list/metadata.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * List metadata for objects
- *
- * @uses $vars['entity']   ElggEntity
- * @uses $vars['handler']  Page handler identifier
- * @uses $vars['links']    Array of extra links
- */
-
-$entity = $vars['entity'];
-$handler = elgg_extract('handler', $vars, '');
-
-?>
-<ul class="elgg-list-metadata">
-	<li>
-		<?php echo elgg_view('output/access', array('entity' => $entity)); ?>
-	</li>
-<?php
-
-if (isset($vars['links']) && is_array($vars['links'])) {
-	foreach ($vars['links'] as $link) {
-		echo "<li>$link</li>";
-	}
-}
-
-// pass <li>your data</li> back from the view
-echo elgg_view('entity/metadata', array('entity' => $entity));
-
-// links to delete or edit.
-if ($entity->canEdit() && $handler) {
-
-	$edit_url = "pg/$handler/edit/{$entity->getGUID()}";
-	$edit_link = elgg_view('output/url', array(
-		'href' => $edit_url,
-		'text' => elgg_echo('edit'),
-	));
-	echo "<li>$edit_link</li>";
-
-	$delete_url = "action/$handler/delete?guid={$entity->getGUID()}";
-	$delete_link = elgg_view('output/confirmlink', array(
-		'href' => $delete_url,
-		'text' => '<span class="elgg-icon elgg-icon-delete"></span>',
-		'title' => elgg_echo('delete'),
-		'confirm' => elgg_echo('deleteconfirm'),
-		'text_encode' => false,
-	));
-	echo "<li>$delete_link</li>";
-}
-
-$likes = elgg_view_likes($entity);
-echo "<li>$likes</li>";
-
-?>
-</ul>
diff --git a/views/default/layout/objects/list/body.php b/views/default/page/components/list/body.php
similarity index 100%
rename from views/default/layout/objects/list/body.php
rename to views/default/page/components/list/body.php
diff --git a/views/default/layout/shells/content/filter.php b/views/default/page/layouts/content/filter.php
similarity index 100%
rename from views/default/layout/shells/content/filter.php
rename to views/default/page/layouts/content/filter.php
diff --git a/views/default/layout/shells/content/footer.php b/views/default/page/layouts/content/footer.php
similarity index 100%
rename from views/default/layout/shells/content/footer.php
rename to views/default/page/layouts/content/footer.php
diff --git a/views/default/layout/shells/content/header.php b/views/default/page/layouts/content/header.php
similarity index 100%
rename from views/default/layout/shells/content/header.php
rename to views/default/page/layouts/content/header.php
diff --git a/views/default/layout/shells/content/sidebar.php b/views/default/page/layouts/content/sidebar.php
similarity index 100%
rename from views/default/layout/shells/content/sidebar.php
rename to views/default/page/layouts/content/sidebar.php
diff --git a/views/default/layout/shells/widgets/add_button.php b/views/default/page/layouts/widgets/add_button.php
similarity index 100%
rename from views/default/layout/shells/widgets/add_button.php
rename to views/default/page/layouts/widgets/add_button.php
diff --git a/views/default/layout/shells/widgets/add_panel.php b/views/default/page/layouts/widgets/add_panel.php
similarity index 100%
rename from views/default/layout/shells/widgets/add_panel.php
rename to views/default/page/layouts/widgets/add_panel.php