aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/default/css/screen.php2
-rw-r--r--views/default/layout_elements/media.php1
-rw-r--r--views/default/layout_elements/module.php49
3 files changed, 36 insertions, 16 deletions
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 558971d3f..a41736190 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -333,6 +333,7 @@ h2 {
.elgg-module {
+ margin-top: 20px;
}
.elgg_inner {
@@ -341,7 +342,6 @@ h2 {
.elgg-header {
border-bottom: 1px solid #CCCCCC;
margin-bottom: 5px;
- margin-top: 20px;
padding-bottom: 5px;
}
diff --git a/views/default/layout_elements/media.php b/views/default/layout_elements/media.php
index fcf0fba77..232acc8f1 100644
--- a/views/default/layout_elements/media.php
+++ b/views/default/layout_elements/media.php
@@ -31,6 +31,7 @@ if (isset($vars['id'])) {
$id = "id=\"{$vars['id']}\"";
}
+
$body_class = 'elgg-body';
$additional_class = elgg_get_array_value('body_class', $vars, '');
if ($additional_class) {
diff --git a/views/default/layout_elements/module.php b/views/default/layout_elements/module.php
index b0ac82f8e..ffce583ff 100644
--- a/views/default/layout_elements/module.php
+++ b/views/default/layout_elements/module.php
@@ -7,14 +7,18 @@
* @uses $vars['body'] HTML content of the body
* @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
*/
$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);
$class = 'elgg-module';
$additional_class = elgg_get_array_value('class', $vars, '');
@@ -22,15 +26,25 @@ if ($additional_class) {
$class = "$class $additional_class";
}
+$id = '';
+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";
}
-$header = "<div class=\"$header_class\"><h3>$title</h3></div>";
-//if ($header) {
-// $header = "<div class=\"$header_class\">$header</div>";
-//}
+
+if (isset($vars['header'])) {
+ if ($vars['header']) {
+ $header = "<div class=\"$header_class\">$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, '');
@@ -40,16 +54,21 @@ if ($additional_class) {
$body = "<div class=\"$body_class\">$body</div>";
-if ($footer) {
- $footer = "<div class=\"elgg-footer\">$footer</div>";
+$footer_class = 'elgg-footer';
+$additional_class = elgg_get_array_value('footer_class', $vars, '');
+if ($additional_class) {
+ $body_class = "$footer_class $additional_class";
+}
+
+if (isset($vars['footer'])) {
+ if ($vars['footer']) {
+ $header = "<div class=\"$footer_class\">$footer</div>";
+ }
+}
+
+$contents = $header . $body . $footer;
+if (!$skip_inner) {
+ $contents = "<div class=\"elgg-inner\">$contents</div>";
}
-echo <<<HTML
-<div class="$class">
- <div class="elgg-inner">
- $header
- $body
- $footer
- </div>
-</div>
-HTML;
+echo "<div class=\"$class\" $id>$contents</div>";