Fixes #2904: Converted most elgg_view('layout/objects/module') instances to elgg_view...

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

diff --git a/documentation/theming/preview/objects.php b/documentation/theming/preview/objects.php
index 179178c5ad015a80e6d125962eebfabe7848b884..0dc08cd984706170835441d0f41d010c7f874461 100644 (file)
--- a/documentation/theming/preview/objects.php
+++ b/documentation/theming/preview/objects.php
@@ -23,36 +23,16 @@ $url = current_page_url();
                        <div class="elgg-col elgg-col-1of2">
                                <div class="pam">
                                <?php
-                                       echo elgg_view('layout/objects/module', array(
-                                               'title' => 'elgg-module-aside',
-                                               'body' => $ipsum,
-                                               'class' => 'elgg-module-aside',
-                                       ));
-                               ?>
-                               <?php
-                                       echo elgg_view('layout/objects/module', array(
-                                               'title' => 'elgg-module-popup',
-                                               'body' => $ipsum,
-                                               'class' => 'elgg-module-popup',
-                                       ));
+                                       echo elgg_view_module('aside', 'elgg-module-aside', $ipsum);
+                                       echo elgg_view_module('popup', 'elgg-module-popup', $ipsum);
                                ?>
                                </div>
                        </div>
                        <div class="elgg-col elgg-col-1of2">
                                <div class="pam">
                                <?php
-                                       echo elgg_view('layout/objects/module', array(
-                                               'title' => 'elgg-module-info',
-                                               'body' => $ipsum,
-                                               'class' => 'elgg-module-info',
-                                       ));
-                               ?>
-                               <?php
-                                       echo elgg_view('layout/objects/module', array(
-                                               'title' => 'elgg-module-featured',
-                                               'body' => $ipsum,
-                                               'class' => 'elgg-module-featured',
-                                       ));
+                                       echo elgg_view_module('info', 'elgg-module-info', $ipsum);
+                                       echo elgg_view_module('featured', 'elgg-module-featured', $ipsum);
                                ?>
                                </div>
                        </div>

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 144a346f54a3df9040a074f6ab4fea04a0bb38c6..21d606e013835c34ceb858b2036c1b7cf2f27d91 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1094,12 +1094,8 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
                'pagination' => false,
                'list_class' => 'elgg-latest-comments',
        ));
-       $params = array(
-               'title' => $title,
-               'body' => $body,
-               'class' => 'elgg-module-aside',
-       );
-       return elgg_view('layout/objects/module', $params);
+       
+       return elgg_view_module('aside', $title, $body);
 }
 
 /**

diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index e56670316627eb6f3c321fa8a109f209f713234e..8c3fc373fd741373d0955b84ce4d6346b993495c 100644 (file)
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -40,10 +40,4 @@ $new_link = elgg_view('output/url', array(
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
 
-
-$params = array(
-       'header' => $header,
-       'body' => $content,
-       'class' => 'elgg-module-info',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view_module('info', '', $content, array('header' => $header));

diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php
index bd74500ca939ab215e5920bcd91f23b84e828ed6..a761938313b9de123a1d947c28e6863842936e7f 100644 (file)
--- a/mod/blog/views/default/blog/sidebar/archives.php
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -25,10 +25,6 @@ if ($page_owner && $vars['page'] != 'friends') {
                }
                $content .= '</ul>';
 
-               echo elgg_view('layout/objects/module', array(
-                       'title' => $title,
-                       'body' => $content,
-                       'class' => 'elgg-module-aside',
-               ));
+               echo elgg_view_module('aside', $title, $content);
        }
 }
\ No newline at end of file

diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
index 1baf0003743e59b23cd3b649c4d5a8619b6e7408..b78eb681615877bbfba5cb8c51334f8a9897052a 100644 (file)
--- a/mod/blog/views/default/blog/sidebar/revisions.php
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -72,10 +72,6 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 
                $body .= '</ul>';
 
-               echo elgg_view('layout/objects/module', array(
-                       'title' => $title,
-                       'body' => $body,
-                       'class' => 'elgg-module-aside',
-               ));
+               echo elgg_view_module('aside', $title, $body);
        }
 }
\ No newline at end of file

diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index ebd07c2b2801458efa1e68168bdaafb4eda786d9..8c80f297c120b9f0783c155971d82419974c4f0a 100644 (file)
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -40,10 +40,4 @@ $new_link = elgg_view('output/url', array(
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
 
-
-$params = array(
-       'header' => $header,
-       'body' => $content,
-       'class' => 'elgg-module-info',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view_module('info', '', $content, array('header' => $header));

diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php
index dd3a3e1cb957ec47419bcff7287dccd61d29b1b2..afe47ab68f80e0fa1a57e0220c7f4aef749ab41a 100644 (file)
--- a/mod/groups/views/default/discussion/group_module.php
+++ b/mod/groups/views/default/discussion/group_module.php
@@ -43,10 +43,4 @@ $new_link = elgg_view('output/url', array(
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
 
-
-$params = array(
-       'header' => $header,
-       'body' => $content,
-       'class' => 'elgg-module-info',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view_module('info', '', $content, array('header' => $header));

diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
index 18bfbd5967384895ed2c940724d9cdf66c2b4de7..58bf25095500856ac038eab030c80f5809317a1d 100644 (file)
--- a/mod/groups/views/default/groups/profile/activity_module.php
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -36,12 +36,7 @@ if (!$content) {
        $content = '<p>' . elgg_echo('groups:activity:none') . '</p>';
 }
 
-$params = array(
-       'header' => $header,
-       'body' => $content,
-       'class' => 'elgg-module-info',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view_module('info', '', $content, array('header' => $header));
 
 return true;
 ?>
@@ -63,7 +58,7 @@ return true;
 
        $items = get_data($sql);
 
-    if (count($items) > 0) {
+       if (count($items) > 0) {
                $river_items = elgg_view('river/item/list',array(
                                                                'limit' => $limit,
                                                                'offset' => $offset,

diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index 46dc53abffe20afc004727b6e8e07687f0140707..69578278323f90d21d1a092e370dbe312fdda1ab 100644 (file)
--- a/mod/groups/views/default/groups/sidebar/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -21,9 +21,5 @@ if ($featured_groups) {
        }
        elgg_pop_context();
 
-       echo elgg_view('layout/objects/module', array(
-               'title' => elgg_echo("groups:featured"),
-               'body' => $body,
-               'class' => 'elgg-module-aside',
-       ));
+       echo elgg_view_module('aside', elgg_echo("groups:featured"), $body);
 }

diff --git a/mod/groups/views/default/groups/sidebar/find.php b/mod/groups/views/default/groups/sidebar/find.php
index de2a6e740dbcb036a593ee9e2ce1c168f064fc70..0d31ee711724324c1a24043ad25a70cbf012c69c 100644 (file)
--- a/mod/groups/views/default/groups/sidebar/find.php
+++ b/mod/groups/views/default/groups/sidebar/find.php
@@ -7,8 +7,4 @@
 $url = elgg_get_site_url() . 'pg/groups/world';
 $body = elgg_view_form('groups/search', array('action' => $url, 'method' => 'get'));
 
-echo elgg_view('layout/objects/module', array(
-       'title' => elgg_echo('groups:searchtag'),
-       'body' => $body,
-       'class' => 'elgg-module-aside',
-));
+echo elgg_view_module('aside', elgg_echo('groups:searchtag'), $body);

diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 597ddc07c12bbee5b5d688036b937088d5405291..711b99f34af93c56a5f6aad475f46f1f3f2b2757 100644 (file)
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -18,8 +18,4 @@ foreach ($members as $mem) {
 $body .= '</div>';
 $body .= "<div class='center mts'>$all_link</div>";
 
-echo elgg_view('layout/objects/module', array(
-       'title' => elgg_echo("groups:members"),
-       'body' => $body,
-       'class' => 'elgg-module-aside',
-));
+echo elgg_view_module('aside', elgg_echo('groups:members'), $body);
\ No newline at end of file

diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index 1cf36067ed83355a19120e61cc01fed5b0dec62d..c41de043d66892d8d9becb60e8d3be4ae3dbf9c2 100644 (file)
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -43,10 +43,4 @@ $new_link = elgg_view('output/url', array(
 ));
 $content .= "<span class='elgg-widget-more'>$new_link</span>";
 
-
-$params = array(
-       'header' => $header,
-       'body' => $content,
-       'class' => 'elgg-module-info',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view_module('info', '', $content, array('header' => $header));

diff --git a/mod/pages/views/default/pages/sidebar/history.php b/mod/pages/views/default/pages/sidebar/history.php
index 3c0b7bc142009ccf5c72b6486be4b476fb670fde..dad06ab4f7ba27ca015dbab0d0d2ef210dc3cbfb 100644 (file)
--- a/mod/pages/views/default/pages/sidebar/history.php
+++ b/mod/pages/views/default/pages/sidebar/history.php
@@ -11,9 +11,4 @@ if ($vars['page']) {
        $content = $content = list_annotations($vars['page']->guid, 'page', 20, false);
 }
 
-echo elgg_view('layout/objects/module', array(
-       'title' => $title,
-       'body' => $content,
-       'class' => 'elgg-module-aside',
-));
-
+echo elgg_view_module('aside', $title, $content);
\ No newline at end of file

diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php
index cbf21c058e79a598bdd456f8ad127009bb934348..43790a97641fed4e05a5c827c4fceb5465661382 100644 (file)
--- a/mod/pages/views/default/pages/sidebar/navigation.php
+++ b/mod/pages/views/default/pages/sidebar/navigation.php
@@ -19,11 +19,7 @@ if (!$content) {
        $content = '<p>' . elgg_echo('pages:none') . '</p>';
 }
 
-echo elgg_view('layout/objects/module', array(
-       'title' => $title,
-       'body' => $content,
-       'class' => 'elgg-module-aside',
-));
+echo elgg_view_module('aside', $title, $content);
 
 ?><?php //@todo JS 1.8: no ?>
 <script type="text/javascript">

diff --git a/views/default/core/members/sidebar.php b/views/default/core/members/sidebar.php
index 21700350488b51815d8752e1f943f3cac64e4350..3a00bf70028f59c713f34be71cf00122bcaebe5a 100644 (file)
--- a/views/default/core/members/sidebar.php
+++ b/views/default/core/members/sidebar.php
@@ -9,15 +9,10 @@ $params = array(
        'action' => elgg_get_site_url() . 'pg/members/search/tag/',
        'disable_security' => true,
 );
-$body = elgg_view_form('members/tag_search', $params);
 
-$params = array(
-       'title' => elgg_echo('members:searchtag'),
-       'body' => $body,
-       'class' => 'elgg-module-aside',
-);
-echo elgg_view('layout/objects/module', $params);
+$body = elgg_view_form('members/tag_search', $params);
 
+echo elgg_view_module('aside', elgg_echo('members:searchtag'), $body);
 
 // name search
 $params = array(
@@ -27,9 +22,4 @@ $params = array(
 );
 $body = elgg_view_form('members/name_search', $params);
 
-$params = array(
-       'title' => elgg_echo('members:searchname'),
-       'body' => $body,
-       'class' => 'elgg-module-aside',
-);
-echo elgg_view('layout/objects/module', $params);
+echo elgg_view_module('aside', elgg_echo('members:searchname'), $body);
\ No newline at end of file

diff --git a/views/default/core/river/body.php b/views/default/core/river/body.php
index 192e83fe94edac4c7c2c46fbd0c3bc8480a7d523..66fe45f3d7db1c7486a1864cb51dd58f44d18a4c 100644 (file)
--- a/views/default/core/river/body.php
+++ b/views/default/core/river/body.php
@@ -23,10 +23,9 @@ $body = elgg_view($item->getView(), array('item' => $item));
 // footer
 $footer = elgg_view('core/river/footer', $vars);
 
-$params = array(
+echo elgg_view('layout/objects/module', array(
        'header' => $header,
        'body' => $body,
        'footer' => $footer,
        'show_inner' => false,
-);
-echo elgg_view('layout/objects/module', $params);
+));
\ No newline at end of file

diff --git a/views/default/layout/elements/owner_block.php b/views/default/layout/elements/owner_block.php
index dce4c1632fd9d8ba21c2ee7f6e2bf11a33e4ac25..66bd3047266d4b6414bb0545ee507101694a57da 100644 (file)
--- a/views/default/layout/elements/owner_block.php
+++ b/views/default/layout/elements/owner_block.php
@@ -24,6 +24,7 @@ if ($owner instanceof ElggGroup ||
 
        $body .= elgg_view('layout/elements/owner_block/extend', $vars);
 
+       //@todo elgg-module-owner-block?
        echo elgg_view('layout/objects/module', array(
                'header' => $header,
                'body' => $body,

diff --git a/views/default/layout/shells/admin/menu.php b/views/default/layout/shells/admin/menu.php
index db55649785d027c936fd046fdcd245fe5974c047..b0e0d00638a5167e4c5dfe9861858f0c97d9da9c 100644 (file)
--- a/views/default/layout/shells/admin/menu.php
+++ b/views/default/layout/shells/admin/menu.php
@@ -5,8 +5,4 @@
 
 $content = elgg_view_menu('page', array('sort_by' => 'name'));
 
-echo elgg_view('layout/objects/module', array(
-       'title' => elgg_echo('admin:menu'),
-       'body' => $content,
-       'class' => 'elgg-module-main',
-));
+echo elgg_view_module('main', elgg_echo('admin:menu'), $content);
\ No newline at end of file

diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index 1ea527419e9d078071aa51accb476e68d7a74835..d61914d5c0d44de54aa2bd26b6bfdd5814e7c53f 100644 (file)
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -28,7 +28,7 @@ if (isset($vars['class'])) {
                        //$params = $vars;
                        //$params['sidebar'] = $vars['sidebar_alt'];
                        $params = array(
-                               'sidebar' => elgg_view('layout/objects/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
+                               'sidebar' => elgg_view_module('test', 'Testing', 'Hello, world!'),
                        );
                        echo elgg_view('layout/elements/sidebar', $params);
                ?>

diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 442244d8d82d42a98b0bf3f44a1da54e580f20e1..d9397faabaf5366743cf7a21ae5804fac0409f43 100644 (file)
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -64,12 +64,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
        $cloud .= elgg_view('tagcloud/extend');
 
        if ($context != 'tags') {
-               $params = array(
-                       'title' => elgg_echo('tagcloud'),
-                       'body' => $cloud,
-                       'class' => 'elgg-tagcloud elgg-module-aside',
-               );
-               echo elgg_view('layout/objects/module', $params);
+               echo elgg_view_module('aside', elgg_echo('tagcloud'), $cloud, array('class' => 'elgg-tagcloud'));
        } else {
                echo "<div class=\"elgg-tagcloud\">$cloud</div>";
        }