Refs #2950: layout/objects => page/components

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

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index 3f65fb58e66b7c4d06ebf56e09a8215df8ea0db9..4562f5b4dc16f62cc5adc4eb65917d85643d4973 100644 (file)
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -2222,7 +2222,7 @@ $posted_max = 0, $pagination = true) {
                'list-class' => 'elgg-river-list',
        );
 
-       return elgg_view('layout/objects/list', $params);
+       return elgg_view('page/components/list', $params);
 }
 
 /**
@@ -2820,7 +2820,7 @@ function page_draw($title, $body, $sidebar = "") {
  */
 function elgg_view_listing($icon, $info) {
        elgg_deprecated_notice('elgg_view_listing deprecated by elgg_view_image_block', 1.8);
-       return elgg_view('layout/objects/image_block', array('image' => $icon, 'body' => $info));
+       return elgg_view('page/components/image_block', array('image' => $icon, 'body' => $info));
 }
 
 /**

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 4cb9c30f4fcf90f3c297e54233a743fa19ad5193..3a351805e25b73779b02a370273ede5bad615eaf 100644 (file)
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -343,7 +343,7 @@ function elgg_list_river(array $options = array()) {
 
        $options['count'] = $count;
        $options['items'] = $items;
-       return elgg_view('layout/objects/list', $options);
+       return elgg_view('page/components/list', $options);
 }
 
 /**

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 5ea93de7ca4c1f7797dfdd5242c230dc92fb5881..918ca6446b8d8fee13767cc55a41f8c8d370c8f4 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -950,9 +950,9 @@ $list_type_toggle = true, $pagination = true) {
        }
 
        if ($vars['gallery']) {
-               return elgg_view('layout/objects/gallery', $vars);
+               return elgg_view('page/components/gallery', $vars);
        } else {
-               return elgg_view('layout/objects/list', $vars);
+               return elgg_view('page/components/list', $vars);
        }
 }
 
@@ -982,7 +982,7 @@ function elgg_view_annotation_list($annotations, array $vars = array()) {
 
        $vars = array_merge($defaults, $vars);
 
-       return elgg_view('layout/objects/list', $vars);
+       return elgg_view('page/components/list', $vars);
 }
 
 /**
@@ -1111,7 +1111,7 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
        );
        $comments = elgg_get_annotations($options);
 
-       $body = elgg_view('layout/objects/list', array(
+       $body = elgg_view('page/components/list', array(
                'items' => $comments,
                'pagination' => false,
                'list_class' => 'elgg-latest-comments',
@@ -1146,7 +1146,7 @@ function elgg_view_likes($entity) {
  * Fixed width media on the side (image, icon, flash, etc.).
  * Descriptive content filling the rest of the column.
  *
- * This is a shortcut for {@elgg_view layout/objects/image_block}.
+ * This is a shortcut for {@elgg_view page/components/image_block}.
  *
  * @param string $image   The icon and other information
  * @param string $body    Description content
@@ -1158,7 +1158,7 @@ function elgg_view_likes($entity) {
 function elgg_view_image_block($image, $body, $vars = array()) {
        $vars['image'] = $image;
        $vars['body'] = $body;
-       return elgg_view('layout/objects/image_block', $vars);
+       return elgg_view('page/components/image_block', $vars);
 }
 
 /**
@@ -1166,7 +1166,7 @@ function elgg_view_image_block($image, $body, $vars = array()) {
  *
  * Box with header, body, footer
  *
- * This is a shortcut for {@elgg_view layout/objects/module}.
+ * This is a shortcut for {@elgg_view page/components/module}.
  *
  * @param string $type  The type of module (main, info, popup, aside, etc.)
  * @param string $title A title to put in the header
@@ -1180,7 +1180,7 @@ function elgg_view_module($type, $title, $body, $vars = array()) {
        $vars['class'] .= " elgg-module-$type"; //@todo this will probably cause errors?
        $vars['title'] = $title;
        $vars['body'] = $body;
-       return elgg_view('layout/objects/module', $vars);
+       return elgg_view('page/components/module', $vars);
 }
 
 /**

diff --git a/mod/developers/views/default/theme_preview/objects.php b/mod/developers/views/default/theme_preview/objects.php
index 44625811556eb9913d7dba481c13b41454323f68..c67348c0d3ebdbf3e52b63aceb0dd77dc19f000b 100644 (file)
--- a/mod/developers/views/default/theme_preview/objects.php
+++ b/mod/developers/views/default/theme_preview/objects.php
@@ -47,7 +47,7 @@ $ipsum = elgg_view('developers/ipsum');
                $obj2 = new ElggObject();
                $obj2->title = "Object 2";
                $obj2->description = $ipsum;
-               echo elgg_view('layout/objects/list', array('items' => array($obj1, $obj2)));
+               echo elgg_view('page/components/list', array('items' => array($obj1, $obj2)));
        ?>
        </div>
        <h2>Table</h2>

diff --git a/views/default/core/river/body.php b/views/default/core/river/body.php
index 66fe45f3d7db1c7486a1864cb51dd58f44d18a4c..e3c34acda4f82df0a31d28726602f21b31c7c3e9 100644 (file)
--- a/views/default/core/river/body.php
+++ b/views/default/core/river/body.php
@@ -23,7 +23,7 @@ $body = elgg_view($item->getView(), array('item' => $item));
 // footer
 $footer = elgg_view('core/river/footer', $vars);
 
-echo elgg_view('layout/objects/module', array(
+echo elgg_view('page/components/module', array(
        'header' => $header,
        'body' => $body,
        'footer' => $footer,

diff --git a/views/default/object/widget.php b/views/default/object/widget.php
index 1da5897c396358836baee9af2e9a2a0693870a7e..efc8ef9ae7889a8b21a411f194433e5e394f136a 100644 (file)
--- a/views/default/object/widget.php
+++ b/views/default/object/widget.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view('layout/objects/widget', $vars);
+echo elgg_view('page/components/widget', $vars);

diff --git a/views/default/layout/objects/gallery.php b/views/default/page/components/gallery.php
similarity index 100%
rename from views/default/layout/objects/gallery.php
rename to views/default/page/components/gallery.php

diff --git a/views/default/layout/objects/image_block.php b/views/default/page/components/image_block.php
similarity index 100%
rename from views/default/layout/objects/image_block.php
rename to views/default/page/components/image_block.php

diff --git a/views/default/layout/objects/list.php b/views/default/page/components/list.php
similarity index 100%
rename from views/default/layout/objects/list.php
rename to views/default/page/components/list.php

diff --git a/views/default/layout/objects/module.php b/views/default/page/components/module.php
similarity index 100%
rename from views/default/layout/objects/module.php
rename to views/default/page/components/module.php

diff --git a/views/default/layout/objects/widget.php b/views/default/page/components/widget.php
similarity index 100%
rename from views/default/layout/objects/widget.php
rename to views/default/page/components/widget.php

diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
index 8cfa2d683e7589b3914783914cf5474cacb4dc52..2f9fc8603baec6742072194395304d285aec37af 100644 (file)
--- a/views/default/page/elements/owner_block.php
+++ b/views/default/page/elements/owner_block.php
@@ -25,7 +25,7 @@ if ($owner instanceof ElggGroup ||
        $body .= elgg_view('page/elements/owner_block/extend', $vars);
 
        //@todo elgg-module-owner-block?
-       echo elgg_view('layout/objects/module', array(
+       echo elgg_view('page/components/module', array(
                'header' => $header,
                'body' => $body,
                'class' => 'elgg-owner-block',

diff --git a/views/default/river/item.php b/views/default/river/item.php
index 388c0a79b11f2447954db577fcf3e256b5c1290e..1f28bcb76ee6e2627a4b65bf1abf3e2463af5328 100644 (file)
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -8,4 +8,4 @@ $vars = array(
        'class' => 'elgg-river-item',
 );
 
-echo elgg_view('layout/objects/image_block', $vars);
\ No newline at end of file
+echo elgg_view('page/components/image_block', $vars);
\ No newline at end of file