From a7e426447b6d544b85acb7218e4dfb84de5ce36f Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 5 Feb 2011 23:31:47 +0000 Subject: using elgg-module- git-svn-id: http://code.elgg.org/elgg/trunk@8041 36083f99-b078-4883-b0ff-0f9b5a30f544 --- documentation/theming/preview/objects.php | 21 ++----- engine/lib/views.php | 2 +- mod/blog/views/default/blog/group_module.php | 2 +- mod/blog/views/default/blog/sidebar/archives.php | 2 +- mod/blog/views/default/blog/sidebar/revisions.php | 2 +- mod/file/views/default/file/group_module.php | 2 +- .../views/default/discussion/group_module.php | 2 +- .../default/groups/profile/activity_module.php | 2 +- .../views/default/groups/sidebar/featured.php | 2 +- mod/groups/views/default/groups/sidebar/find.php | 2 +- .../views/default/groups/sidebar/members.php | 2 +- .../notifications/subscriptions/collections.php | 2 +- .../notifications/subscriptions/forminternals.php | 2 +- .../notifications/subscriptions/groupsform.php | 2 +- .../notifications/subscriptions/personal.php | 2 +- mod/pages/views/default/pages/group_module.php | 2 +- mod/pages/views/default/pages/sidebar/history.php | 2 +- .../views/default/pages/sidebar/navigation.php | 2 +- views/default/core/likes/display.php | 2 +- views/default/core/members/sidebar.php | 4 +- .../core/settings/account/default_access.php | 2 +- views/default/core/settings/account/email.php | 2 +- views/default/core/settings/account/language.php | 2 +- .../core/settings/account/notifications.php | 2 +- views/default/core/settings/account/password.php | 2 +- .../core/settings/statistics/numentities.php | 2 +- views/default/core/settings/statistics/online.php | 2 +- views/default/core/settings/tools/plugin.php | 2 +- views/default/css/elements/chrome.php | 9 ++- views/default/css/elements/grid.php | 2 +- views/default/css/elements/layout_objects.php | 47 ++++----------- views/default/css/elements/page_layout.php | 66 +++++++++------------- views/default/css/elements/reset.php | 3 + views/default/output/tagcloud.php | 2 +- 34 files changed, 87 insertions(+), 119 deletions(-) diff --git a/documentation/theming/preview/objects.php b/documentation/theming/preview/objects.php index f90009cab..fc3d3c532 100644 --- a/documentation/theming/preview/objects.php +++ b/documentation/theming/preview/objects.php @@ -24,16 +24,16 @@ $url = current_page_url();
'elgg-aside-module', + 'title' => 'elgg-module-aside', 'body' => $ipsum, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); ?> 'elgg-popup-module', + 'title' => 'elgg-module-popup', 'body' => $ipsum, - 'class' => 'elgg-popup-module', + 'class' => 'elgg-module-popup', )); ?>
@@ -42,18 +42,9 @@ $url = current_page_url();
'elgg-group-module', + 'title' => 'elgg-module-info', 'body' => $ipsum, - 'class' => 'elgg-group-module', - )); - ?> -
-
- 'elgg-info-module', - 'body' => $ipsum, - 'class' => 'elgg-info-module', + 'class' => 'elgg-module-info', )); ?>
diff --git a/engine/lib/views.php b/engine/lib/views.php index 56325ebda..0010b8808 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1094,7 +1094,7 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '', $params = array( 'title' => $title, 'body' => $body, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', ); return elgg_view('layout/objects/module', $params); } diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php index f082aef12..e56670316 100644 --- a/mod/blog/views/default/blog/group_module.php +++ b/mod/blog/views/default/blog/group_module.php @@ -44,6 +44,6 @@ $content .= "$new_link"; $params = array( 'header' => $header, 'body' => $content, - 'class' => 'elgg-group-module', + 'class' => 'elgg-module-info', ); echo elgg_view('layout/objects/module', $params); diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php index 81cac40fc..477e1261e 100644 --- a/mod/blog/views/default/blog/sidebar/archives.php +++ b/mod/blog/views/default/blog/sidebar/archives.php @@ -28,7 +28,7 @@ if ($page_owner && $vars['page'] != 'friends') { echo elgg_view('layout/objects/module', array( 'title' => $title, 'body' => $content, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); } } \ 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 e8a8748e7..1baf00037 100644 --- a/mod/blog/views/default/blog/sidebar/revisions.php +++ b/mod/blog/views/default/blog/sidebar/revisions.php @@ -75,7 +75,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) { echo elgg_view('layout/objects/module', array( 'title' => $title, 'body' => $body, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); } } \ 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 64806cabc..ebd07c2b2 100644 --- a/mod/file/views/default/file/group_module.php +++ b/mod/file/views/default/file/group_module.php @@ -44,6 +44,6 @@ $content .= "$new_link"; $params = array( 'header' => $header, 'body' => $content, - 'class' => 'elgg-group-module', + 'class' => 'elgg-module-info', ); echo elgg_view('layout/objects/module', $params); diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php index 7071bda8b..dd3a3e1cb 100644 --- a/mod/groups/views/default/discussion/group_module.php +++ b/mod/groups/views/default/discussion/group_module.php @@ -47,6 +47,6 @@ $content .= "$new_link"; $params = array( 'header' => $header, 'body' => $content, - 'class' => 'elgg-group-module', + 'class' => 'elgg-module-info', ); echo elgg_view('layout/objects/module', $params); diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php index 1dce62f71..18bfbd596 100644 --- a/mod/groups/views/default/groups/profile/activity_module.php +++ b/mod/groups/views/default/groups/profile/activity_module.php @@ -39,7 +39,7 @@ if (!$content) { $params = array( 'header' => $header, 'body' => $content, - 'class' => 'elgg-group-module', + 'class' => 'elgg-module-info', ); echo elgg_view('layout/objects/module', $params); diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php index 47cb7f2ab..46dc53abf 100644 --- a/mod/groups/views/default/groups/sidebar/featured.php +++ b/mod/groups/views/default/groups/sidebar/featured.php @@ -24,6 +24,6 @@ if ($featured_groups) { echo elgg_view('layout/objects/module', array( 'title' => elgg_echo("groups:featured"), 'body' => $body, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); } diff --git a/mod/groups/views/default/groups/sidebar/find.php b/mod/groups/views/default/groups/sidebar/find.php index c0c135be2..de2a6e740 100644 --- a/mod/groups/views/default/groups/sidebar/find.php +++ b/mod/groups/views/default/groups/sidebar/find.php @@ -10,5 +10,5 @@ $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-aside-module', + 'class' => 'elgg-module-aside', )); diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php index a8c2ffd3f..597ddc07c 100644 --- a/mod/groups/views/default/groups/sidebar/members.php +++ b/mod/groups/views/default/groups/sidebar/members.php @@ -21,5 +21,5 @@ $body .= "
$all_link
"; echo elgg_view('layout/objects/module', array( 'title' => elgg_echo("groups:members"), 'body' => $body, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php index 2a8802037..55e330cab 100644 --- a/mod/notifications/views/default/notifications/subscriptions/collections.php +++ b/mod/notifications/views/default/notifications/subscriptions/collections.php @@ -13,7 +13,7 @@ } -
+

diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index d24cd2cd1..feed02932 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -1,5 +1,5 @@ -
+

diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php index 17db168c3..b7b43cb66 100644 --- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php +++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php @@ -19,7 +19,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) { ?> -
+
-
+

diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php index 0eadc6669..1cf36067e 100644 --- a/mod/pages/views/default/pages/group_module.php +++ b/mod/pages/views/default/pages/group_module.php @@ -47,6 +47,6 @@ $content .= "$new_link"; $params = array( 'header' => $header, 'body' => $content, - 'class' => 'elgg-group-module', + 'class' => 'elgg-module-info', ); echo elgg_view('layout/objects/module', $params); diff --git a/mod/pages/views/default/pages/sidebar/history.php b/mod/pages/views/default/pages/sidebar/history.php index f9de2c13d..3c0b7bc14 100644 --- a/mod/pages/views/default/pages/sidebar/history.php +++ b/mod/pages/views/default/pages/sidebar/history.php @@ -14,6 +14,6 @@ if ($vars['page']) { echo elgg_view('layout/objects/module', array( 'title' => $title, 'body' => $content, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php index 141cf8a64..d38f4096c 100644 --- a/mod/pages/views/default/pages/sidebar/navigation.php +++ b/mod/pages/views/default/pages/sidebar/navigation.php @@ -22,7 +22,7 @@ if (!$content) { echo elgg_view('layout/objects/module', array( 'title' => $title, 'body' => $content, - 'class' => 'elgg-aside-module', + 'class' => 'elgg-module-aside', )); ?> diff --git a/views/default/core/likes/display.php b/views/default/core/likes/display.php index db194c04d..680486863 100644 --- a/views/default/core/likes/display.php +++ b/views/default/core/likes/display.php @@ -52,7 +52,7 @@ if ($num_of_likes) { 'class' => 'elgg-like-toggle', ); $list = elgg_view('output/url', $params); - $list .= "