Commit aa0907a0 authored by Jan Helke's avatar Jan Helke Committed by Frank Nägler
Browse files

[TASK] Replace icon by IconFactory: actions-system-list-open

Releases: master
Resolves: #69566
Change-Id: I20563cfcbe5c09629bc9813bef797b0a133d801e
Reviewed-on: http://review.typo3.org/43073

Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Nägler's avatarFrank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler's avatarFrank Nägler <frank.naegler@typo3.org>
parent a4180e00
......@@ -78,6 +78,11 @@ class SystemInformationToolbarItem implements ToolbarItemInterface {
*/
protected $signalSlotDispatcher = NULL;
/**
* @var IconFactory
*/
protected $iconFactory;
/**
* Constructor
*/
......@@ -85,6 +90,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface {
if (!$this->checkAccess()) {
return;
}
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$extPath = ExtensionManagementUtility::extPath('backend');
/* @var $view StandaloneView */
......@@ -276,9 +282,8 @@ class SystemInformationToolbarItem implements ToolbarItemInterface {
* @return string Icon HTML
*/
public function getItem() {
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo', TRUE);
$icon = $iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL);
$icon = $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL);
return '<span title="' . $title . '">' . $icon . '<span id="t3js-systeminformation-counter" class="badge"></span></span>';
}
......@@ -379,4 +384,4 @@ class SystemInformationToolbarItem implements ToolbarItemInterface {
}
return $this->signalSlotDispatcher;
}
}
\ No newline at end of file
}
......@@ -613,7 +613,7 @@ class ClickMenu {
$url = BackendUtility::getModuleUrl('web_list', $urlParams, '', TRUE);
return $this->linkItem(
$this->languageService->makeEntities($this->languageService->getLL('CM_db_list')),
IconUtility::getSpriteIcon('actions-system-list-open'), 'top.nextLoadModuleUrl=' . GeneralUtility::quoteJSvalue($url) . ';top.goToModule(\'web_list\', 1);',
$this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL), 'top.nextLoadModuleUrl=' . GeneralUtility::quoteJSvalue($url) . ';top.goToModule(\'web_list\', 1);',
0
);
}
......
......@@ -611,7 +611,7 @@ class ElementInformationController implements \TYPO3\CMS\Core\Http\ControllerInt
$url = BackendUtility::getModuleUrl('web_list', array('id' => $uid, 'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')));
$pageActionIcons .= '
<a class="btn btn-default btn-sm" href="' . htmlspecialchars($url) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showList') . '">
' . IconUtility::getSpriteIcon('actions-system-list-open') . '
' . $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL) . '
</a>';
// View page button
......
......@@ -21,8 +21,6 @@ use TYPO3\CMS\Backend\View\PageTreeView;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
......
......@@ -3353,7 +3353,9 @@ class BackendUtility {
* @return string A complete <a href=""> tag
*/
static public function getListViewLink($urlParameters = array(), $linkTitle = '', $linkText = '') {
return '<a href="' . htmlspecialchars(self::getModuleUrl('web_list', $urlParameters)) . '" title="' . htmlspecialchars($linkTitle) . '">' . IconUtility::getSpriteIcon('actions-system-list-open') . htmlspecialchars($linkText) . '</a>';
/** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
return '<a href="' . htmlspecialchars(self::getModuleUrl('web_list', $urlParameters)) . '" title="' . htmlspecialchars($linkTitle) . '">' . $iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL) . htmlspecialchars($linkText) . '</a>';
}
/**
......
......@@ -676,7 +676,7 @@ class AdminPanelView {
'id' => $id,
'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
);
$icon = IconUtility::getSpriteIcon('actions-system-list-open', array('title' => $this->extGetLL('edit_db_list', FALSE)));
$icon = '<span title="' . $this->extGetLL('edit_db_list', FALSE) . '">' . $this->iconFactory->getIcon('actions-system-list-open', Icon::SIZE_SMALL)->render() . '</span>';
$toolBar .= '<a class="t3-icon btn btn-default" href="' . htmlspecialchars(BackendUtility::getModuleUrl('web_list', $urlParams)) . '">' . $icon . '</a>';
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment