Revert "[TASK] Page module styling"

This reverts commit ac000cec

Change-Id: Ibe0972321b91a2ccf0e9270fcf17105c0c181caa
Reviewed-on: http://review.typo3.org/16759
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel

typo3/sysext/backend/Classes/View/PageLayoutView.php

@@ -545,8 +545,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 						if (!isset($rowConfig)) {
 							continue;
 						}
-
-						// grid header
 						$grid .= '<tr>';
 						for ($col = 1; $col <= $colCount; $col++) {
 							$columnConfig = $rowConfig['columns.'][$col . '.'];
@@ -558,12 +556,11 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 							// Render the grid cell
 							$colSpan = intval($columnConfig['colspan']);
 							$rowSpan = intval($columnConfig['rowspan']);
-
-							$grid .= '<td valign="top"' . ($colSpan > 0 ? ' colspan="' . $colSpan . '"' : '') . ($rowSpan > 0 ? ' rowspan="' . $rowSpan . '"' : '') . ' class="t3-gridCell t3-gridCell-header t3-page-column t3-page-column-' . $columnKey . (!isset($columnConfig['colPos']) ? ' t3-gridCell-unassigned' : '') . (isset($columnConfig['colPos']) && !$head[$columnKey] ? ' t3-gridCell-restricted' : '') . ($colSpan > 0 ? ' t3-gridCell-width' . $colSpan : '') . ($rowSpan > 0 ? ' t3-gridCell-height' . $rowSpan : '') . '">';
+							$grid .= '<td valign="top"' . ($colSpan > 0 ? ' colspan="' . $colSpan . '"' : '') . ($rowSpan > 0 ? ' rowspan="' . $rowSpan . '"' : '') . ' class="t3-gridCell t3-page-column t3-page-column-' . $columnKey . (!isset($columnConfig['colPos']) ? ' t3-gridCell-unassigned' : '') . (isset($columnConfig['colPos']) && !$head[$columnKey] ? ' t3-gridCell-restricted' : '') . ($colSpan > 0 ? ' t3-gridCell-width' . $colSpan : '') . ($rowSpan > 0 ? ' t3-gridCell-height' . $rowSpan : '') . '">';
 							// Draw the pre-generated header with edit and new buttons if a colPos is assigned.
 							// If not, a new header without any buttons will be generated.
 							if (isset($columnConfig['colPos']) && $head[$columnKey]) {
-								$grid .= $head[$columnKey];
+								$grid .= $head[$columnKey] . $content[$columnKey];
 							} elseif ($columnConfig['colPos']) {
 								$grid .= $this->tt_content_drawColHeader($GLOBALS['LANG']->getLL('noAccess'), '', '');
 							} else {
@@ -572,28 +569,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 							$grid .= '</td>';
 						}
 						$grid .= '</tr>';
-
-						// grid content
-						$grid .= '<tr>';
-						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
-							$colSpan = intval($columnConfig['colspan']);
-							$rowSpan = intval($columnConfig['rowspan']);
-							// grid content
-							$grid .= '<td valign="top"' . ($colSpan > 0 ? ' colspan="' . $colSpan . '"' : '') . ($rowSpan > 0 ? ' rowspan="' . $rowSpan . '"' : '') . ' class="t3-gridCell t3-gridCell-content t3-page-column t3-page-column-' . $columnKey . (!isset($columnConfig['colPos']) ? ' t3-gridCell-unassigned' : '') . (isset($columnConfig['colPos']) && !$head[$columnKey] ? ' t3-gridCell-restricted' : '') . ($colSpan > 0 ? ' t3-gridCell-width' . $colSpan : '') . ($rowSpan > 0 ? ' t3-gridCell-height' . $rowSpan : '') . '">';
-							if (isset($columnConfig['colPos']) && $head[$columnKey]) {
-								$grid .=  $content[$columnKey];
-							}
-							$grid .= '</td>';
-						}
-						$grid .= '</tr>';
-
 					}
 					$out .= $grid . '</table></div>';
 				}

typo3/sysext/extensionmanager/Resources/Private/Templates/Configuration/ShowConfigurationForm.html

@@ -36,13 +36,7 @@
 											<span style="background:red; padding:1px 2px; color:#fff; font-weight:bold;">{item.highlight}</span>
 										</f:if>
 										<em:form.typoScriptConstants configuration="{item}" />
-										<f:alias map="{label: '{f:translate(key: \'extConfTemplate.type.{item.type}\')}'}">
-											<f:if condition="{label}">
-												<f:then>
-													<span class="info">({label})</span>
-												</f:then>
-											</f:if>
-										</f:alias>
+										<span class="info">(<f:translate key="extConfTemplate.type.{item.type}" />)</span>
 									</div>
 								</f:for>
 								<f:form.submit value="{f:translate(key:'extConfTemplate.submitButton')}" />

typo3/sysext/t3skin/stylesheets/structure/module_web_page.css

@@ -6,16 +6,7 @@ Web > Page
 td.t3-page-column {
 	min-width: 150px;
 	max-width: 300px;
-	border-left: 12px solid #F8F8F8;
-	border-right: 12px solid #F8F8F8;
-}
-
-td.t3-page-column:first-child {
-	border-left: none;
-}
-
-td.t3-page-column:last-child {
-	border-right: none;
+	padding: 0 12px;
 }
 
 .t3-page-colHeader {
@@ -114,11 +105,4 @@ td.t3-gridCell div.t3-page-ce {
 
 .t3-page-ce.active .t3-page-ce-body {
 	margin: 0;
-}
-
-#ext-cms-layout-db-layout-php h2 {
-	margin-bottom: 0px;
-}
-td.t3-page-column.t3-gridCell-header {
-	padding-top: 36px;
 }
\ No newline at end of file

typo3/sysext/t3skin/stylesheets/visual/module_web_page.css

@@ -138,8 +138,8 @@ td.t3-gridCell-restricted {
 	background-color: #e8e0e0;
 }
 
-td.t3-gridCell-content.t3-gridCell-unassigned {
-	background: url('../../images/backgrounds/layout-not-assigned.png') repeat;
+td.t3-gridCell-unassigned {
+	background-color: #e5e5e5;
 }
 
 .t3-gridContainer .t3-page-ce-wrapper .t3-row-header {
@@ -147,6 +147,20 @@ td.t3-gridCell-content.t3-gridCell-unassigned {
 	background-color: #cacaca;
 }
 
+td.t3-gridCell-restricted div.t3-row-header,
+td.t3-gridCell-unassigned div.t3-row-header {
+	-moz-opacity: 0.4;
+	opacity: .40;
+	filter: alpha(opacity = 40);
+}
+
+td.t3-gridCell-restricted div.t3-row-header div,
+td.t3-gridCell-unassigned div.t3-row-header div {
+	-moz-opacity: 0.6;
+	opacity: .60;
+	filter: alpha(opacity = 60);
+}
+
 .t3-page-ce .t3-row-header .ce-icons,
 .t3-page-ce .t3-row-header .ce-icons-left{
 	visibility: hidden;