Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php (Revision 9420)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php (Arbeitskopie)
@@ -518,10 +518,7 @@
// Add new-icon link, header:
$newP = $this->newContentElementOnClick($id,$key,$lP);
$colTitle = t3lib_BEfunc::getProcessedValue('tt_content','colPos',$key);
- /**
- * @mficzel
- * @todo get complete title from tca inclusive ts config manipulations by user func and tsConfig
- */
+
$tcaItems = t3lib_div::callUserFunction( 'EXT:cms/class.tx_cms_be_layout.php:tx_cms_be_layout->getColPosListItemsParsed' , $id, $this );
foreach( $tcaItems as $item) {
if ( $item[1] == $key) {
@@ -586,6 +583,8 @@
// add colgroups
$colCount = intval($parser->setup['be_layout.']['colCount']);
+ $rowCount = intval($parser->setup['be_layout.']['rowCount']);
+
$grid .= '
';
for ($i = 0; $i < $colCount; $i++) {
$grid .= '';
@@ -593,29 +592,32 @@
$grid .= '';
// cycle through rows
- if(count($parser->setup['be_layout.']['rows.'])) {
- foreach ($parser->setup['be_layout.']['rows.'] as $rowConfig) {
- $grid .= '';
+ for ($row = 1; $row <= $rowCount; $row++) {
+ $rowConfig = $parser->setup['be_layout.']['rows.'][$row.'.'];
+ if (!isset($rowConfig)) continue;
- // and colummns
- if(count($rowConfig['columns.'])) {
- foreach ($rowConfig['columns.'] as $columnConfig) {
+ $grid .= '
';
+
+ for ($col = 1; $col <= $colCount; $col++) {
+ $columnConfig = $rowConfig['columns.'][$col.'.'];
+
+ if (!isset($columnConfig)) continue;
- // which tt_content colPos should be displayed inside this cell
- $columnKey = intval($columnConfig['colPos']);
-
- // render the grid cell
- $grid .= '';
- $grid .= $head[$columnKey] . $content[$columnKey] . ' | ';
- }
- }
- $grid .= '
';
+ // which tt_content colPos should be displayed inside this cell
+ $columnKey = intval($columnConfig['colPos']);
+
+ // render the grid cell
+ $grid .= '';
+ $grid .= $head[$columnKey] . $content[$columnKey] . ' | ';
+
}
+ $grid .= '';
}
$out .= $grid.'';
}