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

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

6 files changed, 9 insertions, 28 deletions

diff --git a/views/default/core/members/sidebar.php b/views/default/core/members/sidebar.php
index 217003504..3a00bf700 100644
--- 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 192e83fe9..66fe45f3d 100644
--- 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 dce4c1632..66bd30472 100644
--- 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 db5564978..b0e0d0063 100644
--- 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 1ea527419..d61914d5c 100644
--- 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 442244d8d..d9397faab 100644
--- 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>";
 	}