From 0d9a541edb04521e36aa5542a026d353c5836efc Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@wfp2.com>
Date: Tue, 12 Apr 2016 21:08:27 +0200
Subject: [PATCH] [TASK] Remove usage of deprecated CSS classes bgColorX
Releases: master
Resolves: #75554
Change-Id: Id9f971a36b3b8d91e7e80ec072370276551b1891
Reviewed-on: https://review.typo3.org/47631
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
---
.../Public/Less/TYPO3/_deprecated.less | 28 -------------------
.../Public/Less/TYPO3/_element_rte.less | 4 ---
.../backend/Classes/Clipboard/Clipboard.php | 3 +-
.../TypoScript/ExtendedTemplateService.php | 2 --
.../Classes/Controller/ModuleController.php | 8 +++---
typo3/sysext/impexp/Classes/ImportExport.php | 14 +++-------
.../Resources/Private/Partials/Page.html | 7 ++---
.../Classes/Browser/FolderBrowser.php | 2 +-
.../Controller/UserElementsController.php | 8 +++---
.../t3skin/Resources/Public/Css/backend.css | 26 -----------------
10 files changed, 17 insertions(+), 85 deletions(-)
diff --git a/Build/Resources/Public/Less/TYPO3/_deprecated.less b/Build/Resources/Public/Less/TYPO3/_deprecated.less
index a1c0276ecc86..610d6abb9e73 100644
--- a/Build/Resources/Public/Less/TYPO3/_deprecated.less
+++ b/Build/Resources/Public/Less/TYPO3/_deprecated.less
@@ -14,34 +14,6 @@
}
-//
-// Background color classes
-//
-.bgColor-20 {
- background-color: #e3dfdb;
-}
-.bgColor2 {
- background-color: #585858;
- color: #ffffff;
-}
-.bgColor3 {
- background-color: #f6f2e6;
-}
-.bgColor3-20 {
- background-color: #f7f7f7;
-}
-.bgColor4 {
- background-color: #f1f1f1;
- color: #212424;
-}
-.bgColor4-20 {
- background-color: #f8f9fa;
-}
-.bgColor5 {
- background-color: #9b9b9b;
-}
-
-
//
// Docheader
//
diff --git a/Build/Resources/Public/Less/TYPO3/_element_rte.less b/Build/Resources/Public/Less/TYPO3/_element_rte.less
index 5e2633faa46f..09e939c08528 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_rte.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_rte.less
@@ -135,8 +135,4 @@ body#ext-rte-app-rte-select-image-php {
a {
text-decoration: none;
}
-
- table tr td table tr.bgColor4 td a {
- text-decoration: underline;
- }
}
diff --git a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
index 1cf074e585f7..f27dad4eb6cc 100644
--- a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
+++ b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
@@ -402,7 +402,6 @@ class Clipboard
foreach ($this->clipData[$pad]['el'] as $k => $v) {
if ($v) {
list($table, $uid) = explode('|', $k);
- $bgColClass = $table == '_FILE' && $this->fileMode || $table != '_FILE' && !$this->fileMode ? 'bgColor4-20' : 'bgColor4';
// Rendering files/directories on the clipboard
if ($table == '_FILE') {
$fileObject = ResourceFactory::getInstance()->retrieveFileOrFolderObject($v);
@@ -450,7 +449,7 @@ class Clipboard
</div>
</td>
</tr>';
- $localizationData = $this->getLocalizations($table, $rec, $bgColClass, $pad);
+ $localizationData = $this->getLocalizations($table, $rec, '', $pad);
if ($localizationData) {
$lines[] = $localizationData;
}
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 19cf3a164bdc..540836e29faf 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -733,8 +733,6 @@ class ExtendedTemplateService extends TemplateService
$pointer--;
$row = $this->hierarchyInfo[$pointer];
$depthDataArr[$row['templateID']] = $row;
- $depthDataArr[$row['templateID']]['bgcolor_setup'] = isset($this->clearList_setup_temp[$row['templateID']]) ? ' class="bgColor5"' : '';
- $depthDataArr[$row['templateID']]['bgcolor_const'] = isset($this->clearList_const_temp[$row['templateID']]) ? ' class="bgColor5"' : '';
unset($this->clearList_setup_temp[$row['templateID']]);
unset($this->clearList_const_temp[$row['templateID']]);
$this->templateTitles[$row['templateID']] = $row['title'];
diff --git a/typo3/sysext/dbal/Classes/Controller/ModuleController.php b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
index f8d2afb038de..2ac19336c99c 100644
--- a/typo3/sysext/dbal/Classes/Controller/ModuleController.php
+++ b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
@@ -211,7 +211,7 @@ function updateQryForm(s) {
/*]]>*/
</script>
<table>
- <tr class="tableheader bgColor5"><th colspan="2">Easy SQL check</th></tr>
+ <tr class="tableheader"><th colspan="2">Easy SQL check</th></tr>
<tr><td colspan="2">
<select name="tx_dbal[QUERY]"size="1" onchange="updateQryForm(this.options[this.selectedIndex].value)">
<option value="SELECT" ' . ($input['QUERY'] === 'SELECT' ? 'selected="selected"' : '') . '>SELECT</option>
@@ -242,7 +242,7 @@ updateQryForm(\'' . $input['QUERY'] . '\');
/*]]>*/
</script>
';
- $out .= '<tr id="tx-dbal-result" class="bgColor4"><th>Result:</th><td>';
+ $out .= '<tr id="tx-dbal-result"><th>Result:</th><td>';
switch ($input['QUERY']) {
case 'SELECT':
$qry = $this->getDatabaseConnection()->SELECTquery($input['FIELDS'], $input['FROM'], $input['WHERE'], $input['GROUP'], $input['ORDER'], $input['LIMIT']);
@@ -259,7 +259,7 @@ updateQryForm(\'' . $input['QUERY'] . '\');
}
$out .= '<pre>' . htmlspecialchars($qry) . '</pre></td></tr>';
$out .= '
- <tr class="tableheader bgColor5">
+ <tr class="tableheader">
<th colspan="2">RAW SQL check</th>
</tr>
<tr>
@@ -270,7 +270,7 @@ updateQryForm(\'' . $input['QUERY'] . '\');
</td>
</tr>';
if (!empty($input['RAWSQL'])) {
- $out .= '<tr class="bgColor4">';
+ $out .= '<tr>';
$parseResult = $GLOBALS['TYPO3_DB']->SQLparser->parseSQL($input['RAWSQL']);
if (is_array($parseResult)) {
$newQuery = $GLOBALS['TYPO3_DB']->SQLparser->compileSQL($parseResult);
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index 9b04a2a7f160..462a7459e1e2 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -610,7 +610,6 @@ abstract class ImportExport
}
}
}
- $pInfo['class'] = $table == 'pages' ? 'bgColor4-20' : 'bgColor4';
$pInfo['type'] = 'record';
$pInfo['size'] = $record['size'];
$lines[] = $pInfo;
@@ -641,7 +640,6 @@ abstract class ImportExport
}
$pInfo['ref'] = 'SOFTREF';
$pInfo['size'] = '';
- $pInfo['class'] = 'bgColor3';
$pInfo['type'] = 'softref';
$pInfo['_softRefInfo'] = $info;
$pInfo['type'] = 'softref';
@@ -718,12 +716,11 @@ abstract class ImportExport
$icon = '<span class="' . $iconClass . '" title="' . htmlspecialchars($pInfo['ref']) . '">' . $this->iconFactory->getIcon($iconName, Icon::SIZE_SMALL)->render() . '</span>';
$pInfo['preCode'] = $preCode . ' ' . $icon;
- $pInfo['class'] = $htmlColorClass ?: 'bgColor3';
$pInfo['type'] = 'rel';
if (!$staticFixed || $this->showStaticRelations) {
$lines[] = $pInfo;
if (is_array($record) && is_array($record['rels'])) {
- $this->addRelations($record['rels'], $lines, $preCode . ' ', array_merge($recurCheck, array($pInfo['ref'])), $htmlColorClass);
+ $this->addRelations($record['rels'], $lines, $preCode . ' ', array_merge($recurCheck, array($pInfo['ref'])));
}
}
}
@@ -759,7 +756,6 @@ abstract class ImportExport
$pInfo['title'] = htmlspecialchars($fI['filename']);
$pInfo['ref'] = 'FILE';
$pInfo['size'] = $fI['filesize'];
- $pInfo['class'] = $htmlColorClass ?: 'bgColor3';
$pInfo['type'] = 'file';
// If import mode and there is a non-RTE softreference, check the destination directory:
if ($this->mode === 'import' && $tokenID && !$fI['RTE_ORIG_ID']) {
@@ -810,7 +806,6 @@ abstract class ImportExport
$pInfo['title'] = htmlspecialchars($fI['filename']) . ' <em>(Original)</em>';
$pInfo['ref'] = 'FILE';
$pInfo['size'] = $fI['filesize'];
- $pInfo['class'] = $htmlColorClass ?: 'bgColor3';
$pInfo['type'] = 'file';
$lines[] = $pInfo;
unset($this->remainHeader['files'][$ID]);
@@ -831,7 +826,6 @@ abstract class ImportExport
$pInfo['title'] = htmlspecialchars($fI['filename']) . ' <em>(Resource)</em>';
$pInfo['ref'] = 'FILE';
$pInfo['size'] = $fI['filesize'];
- $pInfo['class'] = $htmlColorClass ?: 'bgColor3';
$pInfo['type'] = 'file';
$lines[] = $pInfo;
unset($this->remainHeader['files'][$extID]);
@@ -1181,12 +1175,12 @@ abstract class ImportExport
foreach ($output as $fN => $state) {
$tRows[] = '
<tr>
- <td class="bgColor5">' . $this->getLanguageService()->sL($GLOBALS['TCA'][$table]['columns'][$fN]['label'], true) . ' (' . htmlspecialchars($fN) . ')</td>
- <td class="bgColor4">' . $state . '</td>
+ <td>' . $this->getLanguageService()->sL($GLOBALS['TCA'][$table]['columns'][$fN]['label'], true) . ' (' . htmlspecialchars($fN) . ')</td>
+ <td>' . $state . '</td>
</tr>
';
}
- $output = '<table border="0" cellpadding="0" cellspacing="1">' . implode('', $tRows) . '</table>';
+ $output = '<table class="table table-striped table-hover">' . implode('', $tRows) . '</table>';
} else {
$output = 'Match';
}
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
index cf7c156ef453..df961b985cb9 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
+++ b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
@@ -4,9 +4,9 @@
<f:if condition="{tsconfParts99}">
<f:then>
<div>
- <table border="0" cellpadding="0" cellspacing="1">
+ <table class="table table-striped table-hover">
<f:for each="{lines}" as="line">
- <tr><td nowrap="nowrap" class="bgColor5">
+ <tr><td nowrap="nowrap">
<f:if condition="{line.defaultPageTSconfig}">
<f:then>
<strong>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_default')}</strong>
@@ -15,8 +15,7 @@
<f:format.raw>{line.title}</f:format.raw>
</f:else>
</f:if></td></tr>
- <tr><td nowrap="nowrap" class="bgColor4"><f:format.raw>{line.content}</f:format.raw><f:render partial="EditIcon" arguments="{editIcon: line.editIcon, editTitle: line.editTitle}" /></td></tr>
- <tr><td> </td></tr>
+ <tr><td nowrap="nowrap"><f:format.raw>{line.content}</f:format.raw><f:render partial="EditIcon" arguments="{editIcon: line.editIcon, editTitle: line.editTitle}" /></td></tr>
</f:for>
</table><br />
<f:render partial="EditIcon" arguments="{editIcon: editIcon, editTitle: editTitle, editAll: 1}" />
diff --git a/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php
index 74467c2faefb..0383c089ac6c 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php
@@ -169,7 +169,7 @@ class FolderBrowser extends AbstractElementBrowser implements ElementBrowserInte
// Combine icon and folderpath:
$foldernameAndIcon = $aTag_alt . $icon . htmlspecialchars(GeneralUtility::fixed_lgd_cs($subFolder->getName(), $titleLength)) . $aTag_e;
$lines[] = '
- <tr class="bgColor4">
+ <tr>
<td nowrap="nowrap">' . $foldernameAndIcon . ' </td>
<td>' . $aTag . '<span title="' . $lang->getLL('addToList', true) . '">' . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . '</span>' . $aTag_e . '</td>
<td> </td>
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php
index efad84d41ac1..c449061c6cb7 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/UserElementsController.php
@@ -252,8 +252,8 @@ class UserElementsController
$A = array('<a href="#" onClick="' . $onClickEvent . 'return false;">', '</a>');
$subcats[$k2i] = '<tr>
<td></td>
- <td class="bgColor4" valign="top">' . $A[0] . $logo . $A[1] . '</td>
- <td class="bgColor4" valign="top">' . $A[0] . '<strong>' . $title . '</strong><br />' . $description . $A[1] . '</td>
+ <td>' . $A[0] . $logo . $A[1] . '</td>
+ <td>' . $A[0] . '<strong>' . $title . '</strong><br />' . $description . $A[1] . '</td>
</tr>';
}
}
@@ -277,10 +277,10 @@ class UserElementsController
$uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
$url = (string)$uriBuilder->buildUriFromRoute('rtehtmlarea_wizard_user_elements', array('OC_key' => ($openKeys[$openK] ? 'C|' : 'O|') . $openK));
- $lines[] = '<tr><td colspan="3" class="bgColor5"><a href="#" title="' . $GLOBALS['LANG']->getLL('expand', true) . '" onClick="jumpToUrl(' . GeneralUtility::quoteJSvalue($url) . ');return false;"><i class="fa fa-caret-square-o-' . ($openKeys[$openK] ? 'left' : 'right') . '" title="' . $GLOBALS['LANG']->getLL('expand', true) . '"></i><strong>' . $title . '</strong></a></td></tr>';
+ $lines[] = '<tr><td colspan="3"><a href="#" title="' . $GLOBALS['LANG']->getLL('expand', true) . '" onClick="jumpToUrl(' . GeneralUtility::quoteJSvalue($url) . ');return false;"><i class="fa fa-caret-square-o-' . ($openKeys[$openK] ? 'left' : 'right') . '" title="' . $GLOBALS['LANG']->getLL('expand', true) . '"></i><strong>' . $title . '</strong></a></td></tr>';
$lines[] = $v;
}
- $content .= '<table border="0" cellpadding="1" cellspacing="1">' . implode('', $lines) . '</table>';
+ $content .= '<table class="table table-striped table-hover">' . implode('', $lines) . '</table>';
}
$content .= $this->doc->endPage();
return $content;
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
index 6bfcd9895283..c917ff4790e5 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
@@ -8501,29 +8501,6 @@ button.close {
.typo3-tstemplate-ceditor-control {
cursor: pointer;
}
-.bgColor-20 {
- background-color: #e3dfdb;
-}
-.bgColor2 {
- background-color: #585858;
- color: #ffffff;
-}
-.bgColor3 {
- background-color: #f6f2e6;
-}
-.bgColor3-20 {
- background-color: #f7f7f7;
-}
-.bgColor4 {
- background-color: #f1f1f1;
- color: #212424;
-}
-.bgColor4-20 {
- background-color: #f8f9fa;
-}
-.bgColor5 {
- background-color: #9b9b9b;
-}
div#typo3-docbody {
bottom: 0;
overflow: auto;
@@ -9592,9 +9569,6 @@ table#typo3-EBfiles tr td.c-wCell {
body#ext-rte-app-rte-select-image-php a {
text-decoration: none;
}
-body#ext-rte-app-rte-select-image-php table tr td table tr.bgColor4 td a {
- text-decoration: underline;
-}
.slider {
display: inline-block;
position: relative;
--
GitLab