aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-22 02:19:34 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-22 02:19:34 +0000
commitef2c8f0f0d548779901c7119e47cb46c59ef4fb6 (patch)
treed0f6e743e183da41dc2ab537a661a3d6f5b53866
parentdd5f5518d83e46c13232e0fa82118539aae0faa7 (diff)
downloadelgg-ef2c8f0f0d548779901c7119e47cb46c59ef4fb6.tar.gz
elgg-ef2c8f0f0d548779901c7119e47cb46c59ef4fb6.tar.bz2
Fixes #2950: All files that were calling into layout/* now use the up-to-date locations
git-svn-id: http://code.elgg.org/elgg/trunk@8411 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat
-rw-r--r--mod/blog/views/default/object/blog.php6
-rw-r--r--mod/bookmarks/views/default/object/bookmarks.php6
-rw-r--r--mod/file/views/default/object/file.php6
-rw-r--r--mod/groups/views/default/group/default.php2
-rw-r--r--mod/groups/views/default/object/groupforumtopic.php6
-rw-r--r--mod/pages/views/default/object/page_top.php6
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--views/default/object/default.php4
-rw-r--r--views/default/page/layouts/content.php2
-rw-r--r--views/default/user/default.php2
10 files changed, 21 insertions, 21 deletions
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index a1d28ae1d..61db0aa6b 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -49,7 +49,7 @@ if ($blog->canEdit() && $blog->status != 'published') {
$extra_links = array($status_text);
}
-$metadata = elgg_view('layout/objects/list/metadata', array(
+$metadata = elgg_view('navigation/menu/metadata', array(
'entity' => $blog,
'handler' => 'blog',
'links' => $extra_links,
@@ -78,7 +78,7 @@ if ($full) {
'subtitle' => $subtitle,
'tags' => $tags,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
$blog_info = elgg_view_image_block($owner_icon, $list_body);
@@ -98,7 +98,7 @@ HTML;
'tags' => $tags,
'content' => $excerpt,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($owner_icon, $list_body);
}
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index dc1ae795d..11828dc4d 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -40,7 +40,7 @@ if ($comments_count != 0) {
$comments_link = '';
}
-$metadata = elgg_view('layout/objects/list/metadata', array(
+$metadata = elgg_view('navigation/menu/metadata', array(
'entity' => $bookmark,
'handler' => 'bookmarks',
));
@@ -62,7 +62,7 @@ if ($full && !elgg_in_context('gallery')) {
'subtitle' => $subtitle,
'tags' => $tags,
);
- $bookmark_info = elgg_view('layout/objects/list/body', $params);
+ $bookmark_info = elgg_view('object/elements/list_body', $params);
$bookmark_icon = elgg_view_icon('bookmark');
echo <<<HTML
$header
@@ -113,5 +113,5 @@ HTML;
'content' => $content,
);
- echo elgg_view('layout/objects/list/body', $params);
+ echo elgg_view('object/elements/list_body', $params);
} \ No newline at end of file
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index eb489581d..d3a5c7e41 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -44,7 +44,7 @@ if ($comments_count != 0) {
$comments_link = '';
}
-$metadata = elgg_view('layout/objects/list/metadata', array(
+$metadata = elgg_view('navigation/menu/metadata', array(
'entity' => $file,
'handler' => 'file',
));
@@ -80,7 +80,7 @@ if ($full && !elgg_in_context('gallery')) {
'subtitle' => $subtitle,
'tags' => $tags,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
$file_info = elgg_view_image_block($file_icon, $list_body);
@@ -110,7 +110,7 @@ HTML;
'tags' => $tags,
'content' => $excerpt,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($file_icon, $list_body);
}
diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php
index 63e1e4226..69c1e6c6d 100644
--- a/mod/groups/views/default/group/default.php
+++ b/mod/groups/views/default/group/default.php
@@ -60,7 +60,7 @@ if ($vars['full']) {
'metadata' => $metadata,
'subtitle' => $group->briefdescription,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($icon, $list_body);
}
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 6ac6d5eda..20fd6eebb 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -41,7 +41,7 @@ if ($num_comments != 0) {
));
}
-$metadata = elgg_view('layout/objects/list/metadata', array(
+$metadata = elgg_view('navigation/menu/metadata', array(
'entity' => $topic,
'handler' => 'discussion',
));
@@ -61,7 +61,7 @@ if ($full) {
'subtitle' => $subtitle,
'tags' => $tags,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
$info = elgg_view_image_block($poster_icon, $list_body);
echo <<<HTML
@@ -81,7 +81,7 @@ HTML;
'tags' => $tags,
'content' => $excerpt,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($poster_icon, $list_body);
}
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 1e1e5251d..fce7f3e43 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -56,7 +56,7 @@ $history_link = elgg_view('output/url', array(
'text' => elgg_echo('pages:history'),
));
-$metadata = elgg_view('layout/objects/list/metadata', array(
+$metadata = elgg_view('navigation/menu/metadata', array(
'entity' => $page,
'handler' => 'pages',
'links' => array($history_link),
@@ -79,7 +79,7 @@ if ($full) {
'subtitle' => $subtitle,
'tags' => $tags,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
$info = elgg_view_image_block($page_icon, $list_body);
@@ -100,7 +100,7 @@ HTML;
'tags' => $tags,
'content' => $excerpt,
);
- $list_body = elgg_view('layout/objects/list/body', $params);
+ $list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($page_icon, $list_body);
}
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 49202d6e8..5c05d9b19 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -48,6 +48,6 @@ $params = array(
'content' => thewire_filter($post->description),
'tags' => false,
);
-$list_body = elgg_view('layout/objects/list/body', $params);
+$list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($owner_icon, $list_body);
diff --git a/views/default/object/default.php b/views/default/object/default.php
index bcb1b04fd..9c5bbe108 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -19,7 +19,7 @@ if (!$title) {
}
if (elgg_instanceof($vars['entity'], 'object')) {
- $metadata = elgg_view('layout/objects/list/metadata', $vars);
+ $metadata = elgg_view('navigation/menu/metadata', $vars);
}
$owner_link = '';
@@ -42,6 +42,6 @@ $params = array(
'subtitle' => $subtitle,
'tags' => $vars['entity']->tags,
);
-$body = elgg_view('layout/objects/list/body', $params);
+$body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($icon, $body);
diff --git a/views/default/page/layouts/content.php b/views/default/page/layouts/content.php
index 6c47da2b9..454fbd73f 100644
--- a/views/default/page/layouts/content.php
+++ b/views/default/page/layouts/content.php
@@ -19,7 +19,7 @@
$sidebar_content = elgg_extract('sidebar', $vars, '');
$params = $vars;
$params['content'] = $sidebar_content;
-$sidebar = elgg_view('layout/shells/content/sidebar', $params);
+$sidebar = elgg_view('page/layouts/content/sidebar', $params);
// navigation defaults to breadcrumbs
$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 2abc19991..96dac52ce 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -45,6 +45,6 @@ if ($user->isBanned()) {
);
}
-$list_body = elgg_view('layout/objects/list/body', $params);
+$list_body = elgg_view('object/elements/list_body', $params);
echo elgg_view_image_block($icon, $list_body);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 06:48:28 +0000