Skip to content
Browse files

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

git-svn-id: http://code.elgg.org/elgg/trunk@8288 36083f99-b078-4883-b0ff-0f9b5a30f544
  • Loading branch information...
1 parent 067c53f commit dd09373e0cefa8d33d0e9faa741593802d53c2a7 @ewinslow ewinslow committed Feb 18, 2011
View
4 engine/lib/deprecated-1.8.php
@@ -2222,7 +2222,7 @@ function elgg_view_river_items($subject_guid = 0, $object_guid = 0, $subject_rel
'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));
}
/**
View
2 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);
}
/**
View
16 engine/lib/views.php
@@ -950,9 +950,9 @@ function elgg_view_entity_list($entities, $count, $offset = 0, $limit = 10, $ful
}
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,15 +1158,15 @@ 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);
}
/**
* Wrapper function for the module display pattern.
*
* 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);
}
/**
View
2 mod/developers/views/default/theme_preview/objects.php
@@ -47,7 +47,7 @@
$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>
View
2 views/default/core/river/body.php
@@ -23,7 +23,7 @@
// 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,
View
2 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);
View
0 views/default/layout/objects/gallery.php → views/default/page/components/gallery.php
File renamed without changes.
View
0 views/default/layout/objects/image_block.php → ...s/default/page/components/image_block.php
File renamed without changes.
View
0 views/default/layout/objects/list.php → views/default/page/components/list.php
File renamed without changes.
View
0 views/default/layout/objects/module.php → views/default/page/components/module.php
File renamed without changes.
View
0 views/default/layout/objects/widget.php → views/default/page/components/widget.php
File renamed without changes.
View
2 views/default/page/elements/owner_block.php
@@ -25,7 +25,7 @@
$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',
View
2 views/default/river/item.php
@@ -8,4 +8,4 @@
'class' => 'elgg-river-item',
);
-echo elgg_view('layout/objects/image_block', $vars);
+echo elgg_view('page/components/image_block', $vars);

0 comments on commit dd09373

Please sign in to comment.
Something went wrong with that request. Please try again.