]> 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: 67d692b)
Fixes #4047 header and footer optional for the module view
authorCash Costello <cash.costello@gmail.com>
Fri, 4 Nov 2011 10:31:11 +0000 (06:31 -0400)
committerCash Costello <cash.costello@gmail.com>
Fri, 4 Nov 2011 10:31:11 +0000 (06:31 -0400)
views/default/core/walled_garden/login.php patch | blob | history
views/default/core/walled_garden/lost_password.php patch | blob | history
views/default/core/walled_garden/register.php patch | blob | history
views/default/page/components/module.php patch | blob | history

diff --git a/views/default/core/walled_garden/login.php b/views/default/core/walled_garden/login.php
index 069422bfaee429580a784f35cfed5d31c66ebb70..0a8b4a90881c122267036408e47e8c7e59794e50 100644 (file)
--- a/views/default/core/walled_garden/login.php
+++ b/views/default/core/walled_garden/login.php
@@ -30,4 +30,8 @@ $content = <<<HTML
 </div>
 HTML;
 
-echo elgg_view_module('walledgarden', '', $content, array('class' => 'elgg-walledgarden-double'));
+echo elgg_view_module('walledgarden', '', $content, array(
+       'class' => 'elgg-walledgarden-double',
+       'header' => ' ',
+       'footer' => ' ',
+));
diff --git a/views/default/core/walled_garden/lost_password.php b/views/default/core/walled_garden/lost_password.php
index 60356aaf0ff3ed88828ee874dc5c37a037a007ce..ce75b558b5c3fb4f5a9e6e46a1278606ff1dbe1a 100644 (file)
--- a/views/default/core/walled_garden/lost_password.php
+++ b/views/default/core/walled_garden/lost_password.php
@@ -14,4 +14,6 @@ HTML;
 
 echo elgg_view_module('walledgarden', '', $lost, array(
        'class' => 'elgg-walledgarden-single elgg-walledgarden-password hidden',
+       'header' => ' ',
+       'footer' => ' ',
 ));
diff --git a/views/default/core/walled_garden/register.php b/views/default/core/walled_garden/register.php
index 951bd7295083ec4fe338ea0409fb7a2b5dbf0404..7f6aac99b932fd4a2e700eb619d2feb6da40d9e8 100644 (file)
--- a/views/default/core/walled_garden/register.php
+++ b/views/default/core/walled_garden/register.php
@@ -18,4 +18,6 @@ __HTML;
 
 echo elgg_view_module('walledgarden', '', $content, array(
        'class' => 'elgg-walledgarden-single elgg-walledgarden-register hidden',
+       'header' => ' ',
+       'footer' => ' ',
 ));
\ No newline at end of file
diff --git a/views/default/page/components/module.php b/views/default/page/components/module.php
index b1198ee9a34db600c1d88ef57bc3bbf795dde542..0a2f1c35a8f6c42310c743c66d1538d7a13455be 100644 (file)
--- a/views/default/page/components/module.php
+++ b/views/default/page/components/module.php
@@ -2,10 +2,10 @@
 /**
  * Elgg module element
  *
- * @uses $vars['title']        Title text
- * @uses $vars['header']       HTML content of the header
+ * @uses $vars['title']        Optional title text (do not pass header with this option)
+ * @uses $vars['header']       Optional HTML content of the header
  * @uses $vars['body']         HTML content of the body
- * @uses $vars['footer']       HTML content of the footer
+ * @uses $vars['footer']       Optional HTML content of the footer
  * @uses $vars['class']        Optional additional class for module
  * @uses $vars['id']           Optional id for module
  * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
@@ -28,22 +28,16 @@ if (isset($vars['id'])) {
        $id = "id=\"{$vars['id']}\"";
 }
 
-if (isset($vars['header'])) {
-       if ($vars['header']) {
-               $header = "<div class=\"elgg-head\">$header</div>";
-       }
-} else {
+if ($vars['header']) {
+       $header = "<div class=\"elgg-head\">$header</div>";
+} elseif ($title) {
        $header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
 }
 
 $body = "<div class=\"elgg-body\">$body</div>";
 
-if (isset($vars['footer'])) {
-       if ($vars['footer']) {
-               $footer = "<div class=\"elgg-foot\">$footer</div>";
-       }
-} else {
-       $footer = "<div class=\"elgg-foot\"></div>";
+if ($footer) {
+       $footer = "<div class=\"elgg-foot\">$footer</div>";
 }
 
 $contents = $header . $body . $footer;
Social Networking Engine