aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-08 00:55:39 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-08 00:55:39 +0000
commitca5c2911327cdbffb5bee1d44d1f673025fcdbce (patch)
tree364f26a2ed327013dbfd1e018ba93adab26c4182 /views
parentec1e46e01818b8226d651dd589f373d75f9f8411 (diff)
downloadelgg-ca5c2911327cdbffb5bee1d44d1f673025fcdbce.tar.gz
elgg-ca5c2911327cdbffb5bee1d44d1f673025fcdbce.tar.bz2
moved a few elements to layout from page
git-svn-id: http://code.elgg.org/elgg/trunk@7556 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/layout/elements/owner_block.php (renamed from views/default/page_elements/owner_block.php)0
-rw-r--r--views/default/layout/elements/sidebar.php (renamed from views/default/page_elements/sidebar.php)4
-rw-r--r--views/default/layout/elements/title.php (renamed from views/default/page_elements/title.php)0
-rw-r--r--views/default/layout/shells/administration.php2
-rw-r--r--views/default/layout/shells/one_column_with_sidebar.php2
-rw-r--r--views/default/layout/shells/one_sidebar.php2
-rw-r--r--views/default/layout/shells/two_sidebar.php4
7 files changed, 7 insertions, 7 deletions
diff --git a/views/default/page_elements/owner_block.php b/views/default/layout/elements/owner_block.php
index 66fc180dd..66fc180dd 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/layout/elements/owner_block.php
diff --git a/views/default/page_elements/sidebar.php b/views/default/layout/elements/sidebar.php
index 8a5574da6..d1323f2cd 100644
--- a/views/default/page_elements/sidebar.php
+++ b/views/default/layout/elements/sidebar.php
@@ -3,9 +3,9 @@
* Elgg sidebar contents
*
* @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
- **/
+ */
-echo elgg_view('page_elements/owner_block');
+echo elgg_view('layout/elements/owner_block');
echo elgg_view('navigation/sidebar_menu');
diff --git a/views/default/page_elements/title.php b/views/default/layout/elements/title.php
index c5eeb9e0e..c5eeb9e0e 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/layout/elements/title.php
diff --git a/views/default/layout/shells/administration.php b/views/default/layout/shells/administration.php
index f7ed84935..f9f5e3caa 100644
--- a/views/default/layout/shells/administration.php
+++ b/views/default/layout/shells/administration.php
@@ -29,7 +29,7 @@
</div>
<div id="elgg-sidebar" class="clearfix">
<?php
- echo elgg_view('page_elements/sidebar', $vars);
+ echo elgg_view('layout/elements/sidebar', $vars);
?>
</div>
</div>
diff --git a/views/default/layout/shells/one_column_with_sidebar.php b/views/default/layout/shells/one_column_with_sidebar.php
index e408c6c1c..6698b7372 100644
--- a/views/default/layout/shells/one_column_with_sidebar.php
+++ b/views/default/layout/shells/one_column_with_sidebar.php
@@ -13,7 +13,7 @@
<div class="elgg-layout-sidebar elgg-center elgg-width-classic clearfix">
<div class="elgg-sidebar elgg-aside">
<?php
- echo elgg_view('page_elements/sidebar', $vars);
+ echo elgg_view('layout/elements/sidebar', $vars);
?>
</div>
diff --git a/views/default/layout/shells/one_sidebar.php b/views/default/layout/shells/one_sidebar.php
index d0bb3879f..2e78b0de6 100644
--- a/views/default/layout/shells/one_sidebar.php
+++ b/views/default/layout/shells/one_sidebar.php
@@ -13,7 +13,7 @@
<div class="elgg-layout-sidebar elgg-center elgg-width-classic clearfix">
<div class="elgg-sidebar elgg-aside">
<?php
- echo elgg_view('page_elements/sidebar', $vars);
+ echo elgg_view('layout/elements/sidebar', $vars);
?>
</div>
diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index 26fb64920..d0a6825c9 100644
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -14,7 +14,7 @@
<div class="elgg-layout-two-sidebar elgg-center elgg-width-classic clearfix">
<div class="elgg-sidebar elgg-aside">
<?php
- echo elgg_view('page_elements/sidebar', $vars);
+ echo elgg_view('layout/elements/sidebar', $vars);
?>
</div>
<div class="elgg-sidebar-alt elgg-aside">
@@ -24,7 +24,7 @@
$params = array(
'sidebar' => elgg_view('layout_elements/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
);
- echo elgg_view('page_elements/sidebar', $params);
+ echo elgg_view('layout/elements/sidebar', $params);
?>
</div>