From 22bb75ea6cd36fc3f6b0f6be608aa4637063d29a Mon Sep 17 00:00:00 2001 From: ewinslow Date: Sat, 12 Feb 2011 02:29:23 +0000 Subject: 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 --- mod/groups/views/default/discussion/group_module.php | 8 +------- mod/groups/views/default/groups/profile/activity_module.php | 9 ++------- mod/groups/views/default/groups/sidebar/featured.php | 6 +----- mod/groups/views/default/groups/sidebar/find.php | 6 +----- mod/groups/views/default/groups/sidebar/members.php | 6 +----- 5 files changed, 6 insertions(+), 29 deletions(-) (limited to 'mod/groups/views') diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php index dd3a3e1cb..afe47ab68 100644 --- 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 .= "$new_link"; - -$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 18bfbd596..58bf25095 100644 --- 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 = '

' . elgg_echo('groups:activity:none') . '

'; } -$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 46dc53abf..695782783 100644 --- 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 de2a6e740..0d31ee711 100644 --- 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 597ddc07c..711b99f34 100644 --- 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 .= ''; $body .= "
$all_link
"; -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 -- cgit v1.2.3