aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-11 20:41:54 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-11 20:41:54 +0000
commit124bb94908ff3c6733b891dc77cbddde3fe1f85b (patch)
tree244384f608a858f482ce669b7702ad6bb969c879 /views
parent56e58cd4ee773009ed407a9efb2cf0179f946087 (diff)
downloadelgg-124bb94908ff3c6733b891dc77cbddde3fe1f85b.tar.gz
elgg-124bb94908ff3c6733b891dc77cbddde3fe1f85b.tar.bz2
updated module markup and fixed a bug with its footer code
git-svn-id: http://code.elgg.org/elgg/trunk@7599 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/css/elements/page_layout.php4
-rw-r--r--views/default/layout/objects/module.php36
-rw-r--r--views/default/output/tagcloud.php2
3 files changed, 10 insertions, 32 deletions
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index a1a3a48f0..87a3b38b1 100644
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -37,14 +37,14 @@
-.elgg-module {
+.elgg-sidebar .elgg-module {
margin-top: 20px;
}
.elgg_inner {
}
-.elgg-header {
+.elgg-sidebar .elgg-module .elgg-head {
border-bottom: 1px solid #CCCCCC;
margin-bottom: 5px;
padding-bottom: 5px;
diff --git a/views/default/layout/objects/module.php b/views/default/layout/objects/module.php
index ffce583ff..48fa79553 100644
--- a/views/default/layout/objects/module.php
+++ b/views/default/layout/objects/module.php
@@ -8,17 +8,14 @@
* @uses $vars['footer'] HTML content of the footer
* @uses $vars['class'] Optional additional class for module
* @uses $vars['id'] Optional id for module
- * @uses $vars['header_class'] Optional additional class for header
- * @uses $vars['body_class'] Optional additional class for body
- * @uses $vars['footer_class'] Optional additional class for footer
- * @uses $vars['skip_inner'] Optional flag to leave out inner div
+ * @uses $vars['show_inner'] Optional flag to leave out inner div (true)
*/
$title = elgg_get_array_value('title', $vars, '');
$header = elgg_get_array_value('header', $vars, '');
$body = elgg_get_array_value('body', $vars, '');
$footer = elgg_get_array_value('footer', $vars, '');
-$skip_inner = elgg_get_array_value('skip_inner', $vars, false);
+$show_inner = elgg_get_array_value('show_inner', $vars, true);
$class = 'elgg-module';
$additional_class = elgg_get_array_value('class', $vars, '');
@@ -31,43 +28,24 @@ if (isset($vars['id'])) {
$id = "id=\"{$vars['id']}\"";
}
-
-$header_class = 'elgg-header';
-$additional_class = elgg_get_array_value('header_class', $vars, '');
-if ($additional_class) {
- $header_class = "$header_class $additional_class";
-}
-
if (isset($vars['header'])) {
if ($vars['header']) {
- $header = "<div class=\"$header_class\">$header</div>";
+ $header = "<div class=\"elgg-head\">$header</div>";
}
} else {
- $header = "<div class=\"$header_class\"><h3>$title</h3></div>";
-}
-
-$body_class = 'elgg-body';
-$additional_class = elgg_get_array_value('body_class', $vars, '');
-if ($additional_class) {
- $body_class = "$body_class $additional_class";
+ $header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
}
-$body = "<div class=\"$body_class\">$body</div>";
-
-$footer_class = 'elgg-footer';
-$additional_class = elgg_get_array_value('footer_class', $vars, '');
-if ($additional_class) {
- $body_class = "$footer_class $additional_class";
-}
+$body = "<div class=\"elgg-body\">$body</div>";
if (isset($vars['footer'])) {
if ($vars['footer']) {
- $header = "<div class=\"$footer_class\">$footer</div>";
+ $footer = "<div class=\"elgg-foot\">$footer</div>";
}
}
$contents = $header . $body . $footer;
-if (!$skip_inner) {
+if ($show_inner) {
$contents = "<div class=\"elgg-inner\">$contents</div>";
}
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 5840eabe4..b47b66005 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -66,7 +66,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
$params = array(
'title' => elgg_echo('tagcloud'),
'body' => $cloud,
- 'body_class' => 'elgg-tagcloud',
+ 'class' => 'elgg-tagcloud',
);
echo elgg_view('layout/objects/module', $params);
} else {