[TASK] Remove usage of deprecated CSS class bgColor6

Releases: master
Resolves: #75491
Change-Id: Ie1daec9744b89d9082d8bd3820fe023b3e540991
Reviewed-on: https://review.typo3.org/47559
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>

diff --git a/Build/Resources/Public/Less/TYPO3/_deprecated.less b/Build/Resources/Public/Less/TYPO3/_deprecated.less
index 1dcacd7..a1c0276 100644 (file)
--- a/Build/Resources/Public/Less/TYPO3/_deprecated.less
+++ b/Build/Resources/Public/Less/TYPO3/_deprecated.less
@@ -40,9 +40,6 @@
 .bgColor5 {
        background-color: #9b9b9b;
 }
-.bgColor6 {
-       background-color: #f7f7f7;
-}
 
 
 //

diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/tree.js b/typo3/sysext/backend/Resources/Public/JavaScript/tree.js
index 2b41b3a..864ae8e 100644 (file)
--- a/typo3/sysext/backend/Resources/Public/JavaScript/tree.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/tree.js
@@ -69,7 +69,6 @@ Ext.extend(TYPO3.Components.Tree.StandardTree, Ext.tree.TreePanel, {
                var text = filterText.getValue();
                Ext.each(this.hiddenNodes, function(node) {
                        node.ui.show();
-                       node.ui.removeClass('bgColor6');
                });
                if (!text) {
                        this.filter.clear();
@@ -87,8 +86,6 @@ Ext.extend(TYPO3.Components.Tree.StandardTree, Ext.tree.TreePanel, {
                                if (!re.test(node.text)) {
                                        node.ui.hide();
                                        me.hiddenNodes.push(node);
-                               } else {
-                                       node.ui.addClass('bgColor6');
                                }
                        }
                }, this);

diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index e8418c9..19cf3a1 100644 (file)
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -697,19 +697,19 @@ class ExtendedTemplateService extends TemplateService
                 $A_B = '';
                 $A_E = '';
             }
-            $HTML .= ($first ? '' : '<span class="treeline-icon treeline-icon-join' . $BTM . '"></span>') . $icon . $A_B
+            $HTML .= ($first ? '' : '<span class="treeline-icon treeline-icon-join' . $BTM . '"></span>') . $icon . ' ' . $A_B
                 . htmlspecialchars(GeneralUtility::fixed_lgd_cs($row['title'], $GLOBALS['BE_USER']->uc['titleLen']))
                 . $A_E . '&nbsp;&nbsp;';
             $RL = $this->ext_getRootlineNumber($row['pid']);
             $statusCheckedIcon = $iconFactory->getIcon('status-status-checked', Icon::SIZE_SMALL)->render();
-            $keyArray[] = '<tr class="' . ($i++ % 2 == 0 ? 'bgColor4' : 'bgColor6') . '">
+            $keyArray[] = '<tr>
                                                        <td nowrap="nowrap">' . $HTML . '</td>
-                                                       <td align="center">' . ($row['root'] ? $statusCheckedIcon : '') . '&nbsp;&nbsp;</td>
-                                                       <td align="center">' . ($row['clConf'] ? $statusCheckedIcon : '') . '&nbsp;&nbsp;' . '</td>
-                                                       <td align="center">' . ($row['clConst'] ? $statusCheckedIcon : '') . '&nbsp;&nbsp;' . '</td>
+                                                       <td align="center">' . ($row['root'] ? $statusCheckedIcon : '') . '</td>
+                                                       <td align="center">' . ($row['clConf'] ? $statusCheckedIcon : '') . '</td>
+                                                       <td align="center">' . ($row['clConst'] ? $statusCheckedIcon : '') . '</td>
                                                        <td align="center">' . ($row['pid'] ?: '') . '</td>
                                                        <td align="center">' . ($RL >= 0 ? $RL : '') . '</td>
-                                                       <td>' . ($row['next'] ? '&nbsp;' . $row['next'] . '&nbsp;&nbsp;' : '') . '</td>
+                                                       <td>' . ($row['next'] ? $row['next'] : '') . '</td>
                                                </tr>';
             if ($deeper) {
                 $keyArray = $this->ext_getTemplateHierarchyArr($arr[$key . '.'], $depthData . ($first ? '' : '<span class="treeline-icon treeline-icon-' . $LN . '"></span>'), $keyArray);

diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
index 4f04454..f09f8ef 100644 (file)
--- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
@@ -8354,9 +8354,6 @@ button.close {
 .bgColor5 {
   background-color: #9b9b9b;
 }
-.bgColor6 {
-  background-color: #f7f7f7;
-}
 div#typo3-docbody {
   bottom: 0;
   overflow: auto;

diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index f89083c..629105b 100755 (executable)
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -242,7 +242,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
                     '</table></div>';
 
             $this->content = $this->moduleTemplate->header($lang->getLL('moduleTitle'));
-            $this->content .= '<div><p class="lead">' . $lang->getLL('overview') . '</p>' . $table . '</div>';
+            $this->content .= '<p class="lead">' . $lang->getLL('overview') . '</p>' . $table;
 
             // RENDER LIST of pages with templates, END
             // Setting up the buttons and markers for docheader
@@ -620,8 +620,6 @@ page.10.value = HELLO WORLD!
      */
     public function renderList($pArray, $lines = array(), $c = 0)
     {
-        static $i;
-
         if (!is_array($pArray)) {
             return $lines;
         }
@@ -630,14 +628,14 @@ page.10.value = HELLO WORLD!
         foreach ($pArray as $k => $v) {
             if (MathUtility::canBeInterpretedAsInteger($k)) {
                 if (isset($pArray[$k . '_'])) {
-                    $lines[] = '<tr class="' . ($i++ % 2 == 0 ? 'bgColor4' : 'bgColor6') . '">
-                                               <td nowrap><span style="width: 1px; height: 1px; display:inline-block; margin-left: ' . $c * 20 . 'px"></span>' . '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('id' => $k))) . '" title="' . htmlspecialchars('ID: ' . $k) . '">' . $this->moduleTemplate->getIconFactory()->getIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k), Icon::SIZE_SMALL)->render() . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</a></td>
+                    $lines[] = '<tr>
+                                               <td nowrap><span style="width: 1px; height: 1px; display:inline-block; margin-left: ' . $c * 20 . 'px"></span>' . '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('id' => $k))) . '" title="' . htmlspecialchars('ID: ' . $k) . '">' . $this->moduleTemplate->getIconFactory()->getIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k), Icon::SIZE_SMALL)->render() . ' ' . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</a></td>
                                                <td>' . $pArray[$k . '_']['count'] . '</td>
-                                               <td>' . ($pArray[$k . '_']['root_max_val'] > 0 ? $statusCheckedIcon : '&nbsp;') . '</td>
-                                               <td>' . ($pArray[$k . '_']['root_min_val'] == 0 ? $statusCheckedIcon : '&nbsp;') . '</td>
+                                               <td>' . ($pArray[$k . '_']['root_max_val'] > 0 ? $statusCheckedIcon : '') . '</td>
+                                               <td>' . ($pArray[$k . '_']['root_min_val'] == 0 ? $statusCheckedIcon : '') . '</td>
                                                </tr>';
                 } else {
-                    $lines[] = '<tr class="' . ($i++ % 2 == 0 ? 'bgColor4' : 'bgColor6') . '">
+                    $lines[] = '<tr>
                                                <td nowrap><span style="width: 1px; height: 1px; display:inline-block; margin-left: ' . $c * 20 . 'px"></span>' . $this->moduleTemplate->getIconFactory()->getIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $k), Icon::SIZE_SMALL)->render() . GeneralUtility::fixed_lgd_cs($pArray[$k], 30) . '</td>
                                                <td></td>
                                                <td></td>