From df837c1e16bab93f41696902f99c0d6e4bd6b7c8 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Tue, 14 Jul 2015 14:21:07 +0200
Subject: [PATCH] [TASK] Drop blinkarrow icons
Resolves: #68121
Releases: master
Change-Id: I7822981c26d8ceae1ea51cf11aa75e2a8b94731d
Reviewed-on: http://review.typo3.org/41189
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Public/Less/TYPO3/_element_rte.less | 4 ---
typo3/gfx/blinkarrow_left.gif | Bin 95 -> 0 bytes
typo3/gfx/blinkarrow_right.gif | Bin 95 -> 0 bytes
.../Tree/View/ElementBrowserPageTreeView.php | 7 ++---
.../Classes/Browser/ElementBrowser.php | 28 +++++++-----------
typo3/sysext/rtehtmlarea/Classes/PageTree.php | 7 ++---
.../Resources/Public/Css/visual/t3skin.css | 3 --
.../version/Classes/View/VersionView.php | 2 +-
8 files changed, 18 insertions(+), 33 deletions(-)
delete mode 100644 typo3/gfx/blinkarrow_left.gif
delete mode 100644 typo3/gfx/blinkarrow_right.gif
diff --git a/Build/Resources/Public/Less/TYPO3/_element_rte.less b/Build/Resources/Public/Less/TYPO3/_element_rte.less
index 014e72449543..430d8ef5f059 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_rte.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_rte.less
@@ -111,10 +111,6 @@ body#ext-rte-app-rte-select-image-php img {
vertical-align: middle;
}
-body#typo3-browse-links-php img.c-blinkArrowL {
- margin: 0 3px;
-}
-
table#typo3-linkMail,
table#typo3-linkURL,
table#typo3-linkTarget {
diff --git a/typo3/gfx/blinkarrow_left.gif b/typo3/gfx/blinkarrow_left.gif
deleted file mode 100644
index 4e8f6ccacc897812d95c2e17306137625d26169c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 95
zcmZ?wbhEHbWM$xF_`t~U-`M#7|Nn~rx&2&2f}I@$T#fV$m>C%u7!-f9aHcRYGUx!=
o3?Ri0Ogt`fZ3oU?U*L5yFa)fCH3cXKR=@~U$-u<q!pL9^0Iu5=6#xJL
diff --git a/typo3/gfx/blinkarrow_right.gif b/typo3/gfx/blinkarrow_right.gif
deleted file mode 100644
index 193f60a96e9d16a3e26286430d75ce1b968247b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 95
zcmZ?wbhEHbWM$xF_`t~U-`M#7|Nn~rx&2&2f}I@$T#fV$m>C%u7!-f9aHcRYGUx!=
o3?Ri0Ogufz?FVxH#>A{!8Ua?ongWyqD_{hwWME=)VPvod0IgmX3jhEB
diff --git a/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php
index dc3de44ad6e2..7f0a4d487582 100644
--- a/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/ElementBrowserPageTreeView.php
@@ -82,14 +82,13 @@ class ElementBrowserPageTreeView extends BrowseTreeView {
$classAttr .= ' list-tree-control-open';
}
+ $selected = '';
if ($GLOBALS['SOBE']->browser->curUrlInfo['act'] == 'page' && $GLOBALS['SOBE']->browser->curUrlInfo['pageid'] == $treeItem['row']['uid'] && $GLOBALS['SOBE']->browser->curUrlInfo['pageid']) {
- $arrCol = '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_right.gif', 'width="5" height="9"') . ' class="c-blinkArrowR pull-right" alt="" />';
- } else {
- $arrCol = '';
+ $selected = ' bg-success';
}
$aOnClick = 'return jumpToUrl(' . \TYPO3\CMS\Core\Utility\GeneralUtility::quoteJSvalue($this->getThisScript() . 'act=' . $GLOBALS['SOBE']->browser->act . '&mode=' . $GLOBALS['SOBE']->browser->mode . '&expandPage=' . $treeItem['row']['uid']) . ');';
$cEbullet = $this->ext_isLinkable($treeItem['row']['doktype'], $treeItem['row']['uid']) ? '<a href="#" class="pull-right" onclick="' . htmlspecialchars($aOnClick) . '"><img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/arrowbullet.gif', 'width="18" height="16"') . ' alt="" /></a>' : '';
- $out .= '<li' . ($classAttr ? ' class="' . trim($classAttr) . '"' : '') . '><span class="list-tree-group">' . $treeItem['HTML'] . $this->wrapTitle($this->getTitleStr($treeItem['row'], $titleLen), $treeItem['row'], $this->ext_pArrPages) . $cEbullet . $arrCol . '</span>';
+ $out .= '<li' . ($classAttr ? ' class="' . trim($classAttr) . '"' : '') . '><span class="list-tree-group' . $selected . '">' . $cEbullet . $treeItem['HTML'] . $this->wrapTitle($this->getTitleStr($treeItem['row'], $titleLen), $treeItem['row'], $this->ext_pArrPages) . '</span>';
if (!$treeItem['hasSub']) {
$out .= '</li>';
diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index ed0b4522978b..468fb6b4dcf0 100644
--- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
@@ -1611,16 +1611,14 @@ class ElementBrowser {
while ($row = $db->sql_fetch_assoc($res)) {
$c++;
$icon = IconUtility::getSpriteIconForRecord('tt_content', $row);
+ $selected = '';
if ($this->curUrlInfo['act'] == 'page' && $this->curUrlInfo['cElement'] == $row['uid']) {
- $arrCol = '<img' . IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif', 'width="5" height="9"')
- . ' class="c-blinkArrowL" alt="" />';
- } else {
- $arrCol = '';
+ $selected = ' class="bg-success"';
}
// Putting list element HTML together:
$out .= '<img' . IconUtility::skinImg($GLOBALS['BACK_PATH'], ('gfx/ol/join' . ($c == $cc ? 'bottom' : '')
. '.gif'), 'width="18" height="16"') . ' alt="" />' . $arrCol
- . '<a href="#" onclick="return link_typo3Page(\'' . $expPageId . '\',\'#' . $row['uid'] . '\');">'
+ . '<a href="#"' . $selected . ' onclick="return link_typo3Page(\'' . $expPageId . '\',\'#' . $row['uid'] . '\');">'
. $icon . BackendUtility::getRecordTitle('tt_content', $row, TRUE) . '</a><br />';
// Finding internal anchor points:
if (GeneralUtility::inList('text,textpic', $row['CType'])) {
@@ -1784,14 +1782,13 @@ class ElementBrowser {
$titleLen = (int)$this->getBackendUserAuthentication()->uc['titleLen'];
$folderIcon = IconUtility::getSpriteIconForResource($folder);
$folderIcon .= htmlspecialchars(GeneralUtility::fixed_lgd_cs($folder->getIdentifier(), $titleLen));
- $picon = '<a href="#" title="' . htmlspecialchars($folder->getIdentifier()) . '" onclick="return link_folder(\'file:' . $folder->getCombinedIdentifier() . '\');">'
- . $folderIcon . '</a>';
+ $selected = '';
if ($this->curUrlInfo['act'] == 'folder' && $currentIdentifier == $folder->getCombinedIdentifier()) {
- $out .= '<img'
- . IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif', 'width="5" height="9"')
- . ' class="c-blinkArrowL" alt="" />';
+ $selected = ' class="bg-success"';
}
- $out .= $picon . '<br />';
+ $out .= '<a href="#"' . $selected . ' title="' . htmlspecialchars($folder->getIdentifier()) . '" onclick="return link_folder(\'file:' . $folder->getCombinedIdentifier() . '\');">'
+ . $folderIcon . '</a><br />';
+
// Get files from the folder:
if ($renderFolders) {
$items = $folder->getSubfolders();
@@ -1820,14 +1817,11 @@ class ElementBrowser {
$icon = IconUtility::getSpriteIconForResource($fileOrFolderObject, array('title' => $fileOrFolderObject->getName() . $size));
$itemUid = 'file:' . $fileIdentifier;
}
- // If the listed file turns out to be the CURRENT file, then show blinking arrow:
+ $selected = '';
if (($this->curUrlInfo['act'] == 'file' || $this->curUrlInfo['act'] == 'folder')
&& $currentIdentifier == $fileIdentifier
) {
- $arrCol = '<img' . IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif',
- 'width="5" height="9"') . ' class="c-blinkArrowL" alt="" />';
- } else {
- $arrCol = '';
+ $selected = ' class="bg-success"';
}
// Put it all together for the file element:
$out .=
@@ -1837,7 +1831,7 @@ class ElementBrowser {
('gfx/ol/join' . ($c == $totalItems ? 'bottom' : '') . '.gif'),
'width="18" height="16"'
) . ' alt="" />' . $arrCol .
- '<a href="#" title="' . htmlspecialchars($fileOrFolderObject->getName()) . '" onclick="return link_folder(\'' . $itemUid . '\');">' .
+ '<a href="#"' . $selected . ' title="' . htmlspecialchars($fileOrFolderObject->getName()) . '" onclick="return link_folder(\'' . $itemUid . '\');">' .
$icon .
htmlspecialchars(GeneralUtility::fixed_lgd_cs($fileOrFolderObject->getName(), $titleLen)) .
'</a><br />';
diff --git a/typo3/sysext/rtehtmlarea/Classes/PageTree.php b/typo3/sysext/rtehtmlarea/Classes/PageTree.php
index 3a09267086d5..bd2b0a3da362 100644
--- a/typo3/sysext/rtehtmlarea/Classes/PageTree.php
+++ b/typo3/sysext/rtehtmlarea/Classes/PageTree.php
@@ -58,14 +58,13 @@ class PageTree extends \TYPO3\CMS\Backend\Tree\View\ElementBrowserPageTreeView {
$classAttr .= ' list-tree-control-open';
}
+ $selected = '';
if ($GLOBALS['SOBE']->browser->curUrlInfo['act'] == 'page' && $GLOBALS['SOBE']->browser->curUrlInfo['pageid'] == $treeItem['row']['uid'] && $GLOBALS['SOBE']->browser->curUrlInfo['pageid']) {
- $arrCol = '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_right.gif', 'width="5" height="9"') . ' class="c-blinkArrowR pull-right" alt="" />';
- } else {
- $arrCol = '';
+ $selected = ' bg-success';
}
$aOnClick = 'return jumpToUrl(' . GeneralUtility::quoteJSvalue($this->getThisScript() . 'act=' . $GLOBALS['SOBE']->browser->act . '&editorNo=' . $GLOBALS['SOBE']->browser->editorNo . '&contentTypo3Language=' . $GLOBALS['SOBE']->browser->contentTypo3Language . '&mode=' . $GLOBALS['SOBE']->browser->mode . '&expandPage=' . $treeItem['row']['uid']) . ');';
$cEbullet = $this->ext_isLinkable($treeItem['row']['doktype'], $treeItem['row']['uid']) ? '<a href="#" class="pull-right" onclick="' . htmlspecialchars($aOnClick) . '"><img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/arrowbullet.gif', 'width="18" height="16"') . ' alt="" /></a>' : '';
- $out .= '<li' . ($classAttr ? ' class="' . trim($classAttr) . '"' : '') . '><span class="list-tree-group">' . $cEbullet . $treeItem['HTML'] . $this->wrapTitle($this->getTitleStr($treeItem['row'], $titleLen), $treeItem['row'], $this->ext_pArrPages) . $arrCol . '</span>';
+ $out .= '<li' . ($classAttr ? ' class="' . trim($classAttr) . '"' : '') . '><span class="list-tree-group' . $selected . '">' . $cEbullet . $treeItem['HTML'] . $this->wrapTitle($this->getTitleStr($treeItem['row'], $titleLen), $treeItem['row'], $this->ext_pArrPages) . '</span>';
if (!$treeItem['hasSub']) {
$out .= '</li>';
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
index 9ec8d0a49774..9758dba8139a 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css
@@ -9747,9 +9747,6 @@ body#typo3-browse-links-php img,
body#ext-rte-app-rte-select-image-php img {
vertical-align: middle;
}
-body#typo3-browse-links-php img.c-blinkArrowL {
- margin: 0 3px;
-}
table#typo3-linkMail,
table#typo3-linkURL,
table#typo3-linkTarget {
diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index 0f46d2974387..1f65db7d651f 100644
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -61,7 +61,7 @@ class VersionView {
$onChange = 'window.location.href=this.options[this.selectedIndex].value;';
// Controls:
if ($id == $onlineId) {
- $controls = '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_left.gif', 'width="5" height="9"') . ' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.online', TRUE) . '</strong>';
+ $controls = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:ver.online', TRUE) . '</strong>';
} elseif (!$noAction) {
$href = $GLOBALS['TBE_TEMPLATE']->issueCommand(
'&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id . '&cmd[pages][' . $onlineId . '][version][action]=swap',
--
GitLab