Add the custom layout sections positions "top" and "bottom" (see #2885)

contao · Oct 1, 2013 · 37d2684 · 37d2684
1 parent 5421af9
commit 37d2684
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.2.RC1 (2013-10-XX)
 ----------------------------
 
+### New
+Added the custom layout sections positions "top" and "bottom" (see #2885).
+
 ### Fixed
 Use serialized arrays to store order field data (see #6255).
 

diff --git a/system/modules/core/classes/FrontendTemplate.php b/system/modules/core/classes/FrontendTemplate.php
@@ -217,7 +217,7 @@ public function output($blnCheckRequest=false)
 	 */
 	public function getCustomSection($strKey)
 	{
-		return sprintf("\n<div id=\"%s\">\n%s\n</div>\n", $strKey, $this->sections[$strKey] ?: '&nbsp;');
+		return '<div id="' . $strKey . '">' . $this->sections[$strKey] . '</div>' . "\n";
 	}
 
 
@@ -259,6 +259,6 @@ public function getCustomSections($strKey=null)
 			return '';
 		}
 
-		return "\n" . '<div class="custom">' . "\n" . $sections . "\n" . '</div>' . "\n";
+		return '<div class="custom">' . "\n" . $sections . "\n" . '</div>' . "\n";
 	}
 }
diff --git a/system/modules/core/dca/tl_layout.php b/system/modules/core/dca/tl_layout.php
@@ -218,7 +218,7 @@
 			'default'                 => 'main',
 			'exclude'                 => true,
 			'inputType'               => 'select',
-			'options'                 => array('before', 'main', 'after'),
+			'options'                 => array('top', 'before', 'main', 'after', 'bottom'),
 			'reference'               => &$GLOBALS['TL_LANG']['tl_layout'],
 			'sql'                     => "varchar(32) NOT NULL default ''"
 		),

diff --git a/system/modules/core/languages/en/tl_layout.xlf b/system/modules/core/languages/en/tl_layout.xlf
@@ -347,6 +347,9 @@
       <trans-unit id="tl_layout.xhtml_trans">
         <source>XHTML Transitional</source>
       </trans-unit>
+      <trans-unit id="tl_layout.top">
+        <source>Before the wrapper</source>
+      </trans-unit>
       <trans-unit id="tl_layout.before">
         <source>After the page header</source>
       </trans-unit>
@@ -356,6 +359,9 @@
       <trans-unit id="tl_layout.after">
         <source>Before the page footer</source>
       </trans-unit>
+      <trans-unit id="tl_layout.bottom">
+        <source>After the wrapper</source>
+      </trans-unit>
       <trans-unit id="tl_layout.edit_styles">
         <source>Edit the style sheets</source>
       </trans-unit>

diff --git a/system/modules/core/templates/frontend/fe_page.html5 b/system/modules/core/templates/frontend/fe_page.html5
@@ -21,6 +21,8 @@
 </head>
 <body id="top" class="{{ua::class}}<?php if ($this->class): ?> <?php echo $this->class; ?><?php endif; ?>"<?php if ($this->onload): ?> onload="<?php echo $this->onload; ?>"<?php endif; ?>>
 
+  <?php echo $this->getCustomSections('top'); ?>
+
   <div id="wrapper">
 
     <?php if ($this->header): ?>
@@ -70,6 +72,8 @@
 
   </div>
 
+  <?php echo $this->getCustomSections('bottom'); ?>
+
   <?php echo $this->mootools; ?>
 
   <?php if (!$this->disableCron): ?>

diff --git a/system/modules/core/templates/frontend/fe_page.xhtml b/system/modules/core/templates/frontend/fe_page.xhtml
@@ -22,6 +22,8 @@
 </head>
 <body id="top" class="{{ua::class}}<?php if ($this->class): ?> <?php echo $this->class; ?><?php endif; ?>"<?php if ($this->onload): ?> onload="<?php echo $this->onload; ?>"<?php endif; ?>>
 
+  <?php echo $this->getCustomSections('top'); ?>
+
   <div id="wrapper">
 
     <?php if ($this->header): ?>
@@ -71,6 +73,8 @@
 
   </div>
 
+  <?php echo $this->getCustomSections('bottom'); ?>
+
   <?php echo $this->mootools; ?>
 
   <?php if (!$this->disableCron): ?>