aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-18 18:37:32 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-18 18:37:32 +0000
commitdd09373e0cefa8d33d0e9faa741593802d53c2a7 (patch)
treeebf986bfabd17bfd5adb3b560e762b83f0a8b825
parent067c53f2575b96573b3c6966747bb0426669ae02 (diff)
downloadelgg-dd09373e0cefa8d33d0e9faa741593802d53c2a7.tar.gz
elgg-dd09373e0cefa8d33d0e9faa741593802d53c2a7.tar.bz2
Refs #2950: layout/objects => page/components
git-svn-id: http://code.elgg.org/elgg/trunk@8288 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/deprecated-1.8.php4
-rw-r--r--engine/lib/river.php2
-rw-r--r--engine/lib/views.php16
-rw-r--r--mod/developers/views/default/theme_preview/objects.php2
-rw-r--r--views/default/core/river/body.php2
-rw-r--r--views/default/object/widget.php2
-rw-r--r--views/default/page/components/gallery.php (renamed from views/default/layout/objects/gallery.php)0
-rw-r--r--views/default/page/components/image_block.php (renamed from views/default/layout/objects/image_block.php)0
-rw-r--r--views/default/page/components/list.php (renamed from views/default/layout/objects/list.php)0
-rw-r--r--views/default/page/components/module.php (renamed from views/default/layout/objects/module.php)0
-rw-r--r--views/default/page/components/widget.php (renamed from views/default/layout/objects/widget.php)0
-rw-r--r--views/default/page/elements/owner_block.php2
-rw-r--r--views/default/river/item.php2
13 files changed, 16 insertions, 16 deletions
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index 3f65fb58e..4562f5b4d 100644
--- 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 4cb9c30f4..3a351805e 100644
--- 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 5ea93de7c..918ca6446 100644
--- 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 446258115..c67348c0d 100644
--- 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 66fe45f3d..e3c34acda 100644
--- 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 1da5897c3..efc8ef9ae 100644
--- 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
index f57cc99ba..f57cc99ba 100644
--- a/views/default/layout/objects/gallery.php
+++ b/views/default/page/components/gallery.php
diff --git a/views/default/layout/objects/image_block.php b/views/default/page/components/image_block.php
index a7f480aef..a7f480aef 100644
--- a/views/default/layout/objects/image_block.php
+++ b/views/default/page/components/image_block.php
diff --git a/views/default/layout/objects/list.php b/views/default/page/components/list.php
index 374922ecd..374922ecd 100644
--- a/views/default/layout/objects/list.php
+++ b/views/default/page/components/list.php
diff --git a/views/default/layout/objects/module.php b/views/default/page/components/module.php
index f7b9da59c..f7b9da59c 100644
--- a/views/default/layout/objects/module.php
+++ b/views/default/page/components/module.php
diff --git a/views/default/layout/objects/widget.php b/views/default/page/components/widget.php
index d5e2c4ca2..d5e2c4ca2 100644
--- a/views/default/layout/objects/widget.php
+++ b/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 8cfa2d683..2f9fc8603 100644
--- 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 388c0a79b..1f28bcb76 100644
--- 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