moved a few elements to layout from page

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

diff --git a/views/default/page_elements/owner_block.php b/views/default/layout/elements/owner_block.php
similarity index 100%
rename from views/default/page_elements/owner_block.php
rename to views/default/layout/elements/owner_block.php

diff --git a/views/default/page_elements/sidebar.php b/views/default/layout/elements/sidebar.php
similarity index 91%
rename from views/default/page_elements/sidebar.php
rename to views/default/layout/elements/sidebar.php
index 8a5574da60c708eb2b661fe4e624a70b632cbf1d..d1323f2cd29ffa468a85797db6dc5a331e1865b0 100644 (file)
--- 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
similarity index 100%
rename from views/default/page_elements/title.php
rename to views/default/layout/elements/title.php

diff --git a/views/default/layout/shells/administration.php b/views/default/layout/shells/administration.php
index f7ed849355d8a760ac03626bf5141cff0fac488e..f9f5e3caa3166f7215370ba233a965580df7964e 100644 (file)
--- 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 e408c6c1ca289f640bec06db28a467aec393ecdd..6698b73723d2a3d60bb314dbc477d0b684ef1b93 100644 (file)
--- 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 d0bb3879f106c6674bcc0077914d9879cca88350..2e78b0de6442b62a44d5879771657e511094fac7 100644 (file)
--- 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 26fb64920ebae9c02f5dd4780ccad13e74c9bed6..d0a6825c93d38a95d8a961c9f64308ce4593daf9 100644 (file)
--- 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>