]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd5f551)
Fixes #2950: All files that were calling into layout/* now use the up-to-date locations
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 22 Feb 2011 02:19:34 +0000 (02:19 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 22 Feb 2011 02:19:34 +0000 (02:19 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8411 36083f99-b078-4883-b0ff-0f9b5a30f544

mod/blog/views/default/object/blog.php patch | blob | history
mod/bookmarks/views/default/object/bookmarks.php patch | blob | history
mod/file/views/default/object/file.php patch | blob | history
mod/groups/views/default/group/default.php patch | blob | history
mod/groups/views/default/object/groupforumtopic.php patch | blob | history
mod/pages/views/default/object/page_top.php patch | blob | history
mod/thewire/views/default/object/thewire.php patch | blob | history
views/default/object/default.php patch | blob | history
views/default/page/layouts/content.php patch | blob | history
views/default/user/default.php patch | blob | history

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index a1d28ae1daac4ccce6d7d59d3d12df1c33f344d9..61db0aa6ba3c41144dea3d42b385ca9fab645092 100644 (file)
--- 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 dc1ae795d3f9eeb15f40dfd7bab824bc045bd785..11828dc4dd7337b30dfd9e64c54149b31879952d 100644 (file)
--- 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 eb489581dd18331ed5e4dcda3b1ccabf52a67908..d3a5c7e41c77669bc2455a49c951ebfcfc0b36e3 100644 (file)
--- 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 63e1e4226006a4f4c838e6fc7476da2407d67a7b..69c1e6c6dfc8d25416a9e35cfb6482b76223d12e 100644 (file)
--- 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 6ac6d5eda0985515fde2342e28cccf69d51c130f..20fd6eebb64bf1d9f4c0d0d6ca3240d123c199ab 100644 (file)
--- 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 1e1e5251dcc86bf29ddcb10e82a20074ad41fa85..fce7f3e4393f7e6beda7cf9cb68ee754f54c5148 100644 (file)
--- 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 49202d6e8f2bb6f946778ca748513476201017d8..5c05d9b19eec4e23bc23db8a6ff83bd2e30f9428 100644 (file)
--- 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 bcb1b04fda3d34dd0a3c78d77fe2442d18677b5d..9c5bbe1082b900ac1b56bef3d0ad253e87c1d350 100644 (file)
--- 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 6c47da2b9ecf620087be388b88a0dadf55789a52..454fbd73f3998cecec96d9927d1d66807cbee9bf 100644 (file)
--- 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 2abc19991f07a57fa7334e51e22da636e5e966a0..96dac52ce9ad4c223286dcf61ecddf64b5cd6558 100644 (file)
--- 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);
Social Networking Engine