]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 99dc187)
added more options to module view
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 6 Dec 2010 02:11:07 +0000 (02:11 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Mon, 6 Dec 2010 02:11:07 +0000 (02:11 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7546 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/css/screen.php patch | blob | history
views/default/layout_elements/media.php patch | blob | history
views/default/layout_elements/module.php patch | blob | history

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 558971d3f900cbcf8ca358816aa149a83612e376..a41736190aa217e20dc979c64724cbd36aefc619 100644 (file)
--- 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 fcf0fba776eeb2d8c8620c18f9907d955ce9f307..232acc8f1f7a10863afc6af9dc902f9abbdcdcf2 100644 (file)
--- 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 b0ac82f8ed7ce0b3aff5f1b41dd163511cce3bd6..ffce583ffc6e37d42580a490785c86ffd8f4f70d 100644 (file)
--- 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>";
Social Networking Engine