[TASK] Rebrush Page > Language
authorFelix Kopp <felix-source@phorax.com>
Mon, 26 Nov 2012 23:35:35 +0000 (00:35 +0100)
committerHelmut Hummel <helmut.hummel@typo3.org>
Tue, 27 Nov 2012 00:18:19 +0000 (01:18 +0100)
Consolidate Page>Language mode with Page>Columns.

Change-Id: I3cb92a44451a8e4ed94ad9aa7d2c3e3f55dd99a6
Resolves: #43318
Releases: 6.0
Reviewed-on: http://review.typo3.org/16766
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/backend/Classes/View/PageLayoutView.php
typo3/sysext/t3skin/stylesheets/structure/module_web_page.css
typo3/sysext/t3skin/stylesheets/visual/module_web_page.css

index fd655c9..d76526e 100644 (file)
@@ -582,18 +582,16 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                $languageSelector = $this->languageSelector($id);
                                // Reset out - we will make new content here:
                                $out = '';
-                               // Separator between language columns (black thin line)
-                               $midSep = '
-                                               <td><img src="clear.gif" width="4" height="1" alt="" /></td>
-                                               <td class="t3-page-border"><img src="clear.gif" width="1" height="1" alt="" /></td>
-                                               <td><img src="clear.gif" width="4" height="1" alt="" /></td>';
                                // Traverse languages found on the page and build up the table displaying them side by side:
                                $cCont = array();
                                $sCont = array();
                                foreach ($langListArr as $lP) {
                                        // Header:
                                        $cCont[$lP] = '
-                                               <td valign="top" align="center" class="bgColor6"><strong>' . htmlspecialchars($this->tt_contentConfig['languageCols'][$lP]) . '</strong></td>';
+                                               <td valign="top" class="t3-page-lang-column">
+                                                       <h3>' . htmlspecialchars($this->tt_contentConfig['languageCols'][$lP]) . '</h3>
+                                               </td>';
+
                                        // "View page" icon is added:
                                        $viewLink = '<a href="#" onclick="' . htmlspecialchars(\TYPO3\CMS\Backend\Utility\BackendUtility::viewOnClick($this->id, $this->backPath, \TYPO3\CMS\Backend\Utility\BackendUtility::BEgetRootLine($this->id), '', '', ('&L=' . $lP))) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                                        // Language overlay page header:
@@ -606,17 +604,17 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                                $lPLabel = $viewLink;
                                        }
                                        $sCont[$lP] = '
-                                               <td nowrap="nowrap">' . $lPLabel . '</td>';
+                                               <td nowrap="nowrap" class="t3-page-lang-column t3-page-lang-label">' . $lPLabel . '</td>';
                                }
                                // Add headers:
-                               $out .= '<tr>' . implode($midSep, $cCont) . '</tr>';
-                               $out .= '<tr class="bgColor5">' . implode($midSep, $sCont) . '</tr>';
+                               $out .= '<tr>' . implode($cCont) . '</tr>';
+                               $out .= '<tr>' . implode($sCont) . '</tr>';
                                // Traverse previously built content for the columns:
                                foreach ($languageColumn as $cKey => $cCont) {
                                        $out .= '
                                        <tr>
-                                               <td valign="top" class="t3-gridCell">' . implode(('</td>' . $midSep . '
-                                               <td valign="top">'), $cCont) . '</td>
+                                               <td valign="top" class="t3-gridCell t3-page-lang-column"">' . implode(('</td>' . '
+                                               <td valign="top" class="t3-gridCell t3-page-lang-column">'), $cCont) . '</td>
                                        </tr>';
                                        if ($this->defLangBinding) {
                                                // "defLangBinding" mode
@@ -627,8 +625,8 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                                        }
                                                        $out .= '
                                                        <tr>
-                                                               <td valign="top">' . implode(('</td>' . $midSep . '
-                                                               <td valign="top">'), $cCont) . '</td>
+                                                               <td valign="top" class="t3-page-lang-column">' . implode(('</td>' . '
+                                                               <td valign="top" class="t3-page-lang-column">'), $cCont) . '</td>
                                                        </tr>';
                                                }
                                                // Create spacer:
@@ -638,16 +636,18 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                                }
                                                $out .= '
                                                <tr>
-                                                       <td valign="top">' . implode(('</td>' . $midSep . '
-                                                       <td valign="top">'), $cCont) . '</td>
+                                                       <td valign="top" class="t3-page-lang-column">' . implode(('</td>' . '
+                                                       <td valign="top" class="t3-page-lang-column">'), $cCont) . '</td>
                                                </tr>';
                                        }
                                }
                                // Finally, wrap it all in a table and add the language selector on top of it:
                                $out = $languageSelector . '
-                                       <table cellpadding="0" cellspacing="0" class="t3-page-langMode">
-                                               ' . $out . '
-                                       </table>';
+                                       <div class="t3-lang-gridContainer">
+                                               <table cellpadding="0" cellspacing="0" class="t3-page-langMode">
+                                                       ' . $out . '
+                                               </table>
+                                       </div>';
                                // CSH:
                                $out .= \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem($this->descrTable, 'language_list', $GLOBALS['BACK_PATH']);
                        }
@@ -1943,5 +1943,4 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 
 }
 
-
-?>
+?>
\ No newline at end of file
index 73a207b..300b754 100644 (file)
@@ -3,7 +3,13 @@ Web > Page
 
 - - - - - - - - - - - - - - - - - - - - - */
 
-td.t3-page-column {
+.t3-gridContainer,
+.t3-lang-gridContainer {
+       margin: 0 -12px;
+}
+
+td.t3-page-column,
+td.t3-page-lang-column {
        min-width: 150px;
        max-width: 300px;
        border-left: 12px solid #F8F8F8;
@@ -17,6 +23,10 @@ td.t3-page-column {
        position: relative;
 }
 
+td.t3-page-lang-column.t3-page-lang-label {
+       padding-bottom: 12px;
+}
+
 .t3-page-colHeader a {
        position: relative;
 }
index 403a1c3..771d5f4 100644 (file)
@@ -158,7 +158,7 @@ td.t3-gridCell-unassigned {
        background: url('../../images/backgrounds/layout-not-assigned.png') repeat;
 }
 
-.t3-gridContainer .t3-page-ce-wrapper .t3-row-header {
+.t3-page-ce-wrapper .t3-row-header {
        background-image: none;
        background-color: #cacaca;
 }