Commit a4180e00 authored by Frank Nägler's avatar Frank Nägler Committed by Christian Kuhn
Browse files

[TASK] Remove SpriteManagerIconViewHelper

This patch removes the SpriteManagerIconViewHelper and all
usages within the core.

Resolves: #69531
Releases: master
Change-Id: I75e3c345973a9b51fb26cc1aeb305536e8c77d14
Reviewed-on: http://review.typo3.org/43019


Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 039143d3
...@@ -134,6 +134,21 @@ ...@@ -134,6 +134,21 @@
.icon-actions-edit-copy-release, .icon-actions-edit-copy-release,
.icon-actions-edit-cut-release, .icon-actions-edit-cut-release,
.icon-overlay-read-only, .icon-overlay-read-only,
.icon-status-status-current { .icon-status-status-current,
.icon-status-dialog-error,
.icon-status-status-permission-denied {
color: @brand-danger; color: @brand-danger;
} }
.icon-status-dialog-ok,
.icon-status-status-permission-granted {
color: @brand-success;
}
.icon-status-dialog-notification {
color: @brand-notice;
}
.icon-status-dialog-warning {
color: @brand-warning;
}
...@@ -778,7 +778,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface { ...@@ -778,7 +778,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface {
// @todo: hardcoded width as we don't have a way to address module icons with an API yet. // @todo: hardcoded width as we don't have a way to address module icons with an API yet.
$icon = '<img src="' . htmlspecialchars($icon) . '" alt="' . $titleAttribute . '" width="16">'; $icon = '<img src="' . htmlspecialchars($icon) . '" alt="' . $titleAttribute . '" width="16">';
} else { } else {
$icon = IconUtility::getSpriteIcon('empty-empty', array('title' => $titleAttribute)); $icon = '<span title="' . $titleAttribute . '">' . $this->iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
} }
} }
return $icon; return $icon;
......
...@@ -493,8 +493,8 @@ class InlineRecordContainer extends AbstractContainer { ...@@ -493,8 +493,8 @@ class InlineRecordContainer extends AbstractContainer {
$table = $foreign_table; $table = $foreign_table;
} }
$cells['info'] = ' $cells['info'] = '
<a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($uid) . '); return false;')) . '"> <a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($uid) . '); return false;')) . '" title="' . $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:showInfo', TRUE) . '">
' . IconUtility::getSpriteIcon('status-dialog-information', array('title' => $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:showInfo', TRUE))) . ' ' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '
</a>'; </a>';
} }
// If the table is NOT a read-only table, then show these links: // If the table is NOT a read-only table, then show these links:
...@@ -508,8 +508,8 @@ class InlineRecordContainer extends AbstractContainer { ...@@ -508,8 +508,8 @@ class InlineRecordContainer extends AbstractContainer {
$style = ' style="' . $config['inline']['inlineNewButtonStyle'] . '"'; $style = ' style="' . $config['inline']['inlineNewButtonStyle'] . '"';
} }
$cells['new'] = ' $cells['new'] = '
<a class="btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'] . '" href="#" onclick="' . htmlspecialchars($onClick) . '"' . $style . '> <a class="btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'] . '" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:new' . ($isPagesTable ? 'Page' : 'Record')), TRUE) . '" ' . $style . '>
' . IconUtility::getSpriteIcon(('actions-' . ($isPagesTable ? 'page' : 'document') . '-new'), array('title' => $languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:new' . ($isPagesTable ? 'Page' : 'Record')), TRUE))) . ' ' . $this->iconFactory->getIcon('actions-' . ($isPagesTable ? 'page' : 'document') . '-new', Icon::SIZE_SMALL)->render() . '
</a>'; </a>';
} }
} }
......
...@@ -151,7 +151,7 @@ class SelectCheckBoxElement extends AbstractFormElement { ...@@ -151,7 +151,7 @@ class SelectCheckBoxElement extends AbstractFormElement {
'checked' => $checked, 'checked' => $checked,
'disabled' => $disabled, 'disabled' => $disabled,
'class' => '', 'class' => '',
'icon' => (!empty($p[2]) ? FormEngineUtility::getIconHtml($p[2]) : IconUtility::getSpriteIcon('empty-empty')), 'icon' => (!empty($p[2]) ? FormEngineUtility::getIconHtml($p[2]) : $this->iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render()),
'title' => htmlspecialchars($p[0], ENT_COMPAT, 'UTF-8', FALSE), 'title' => htmlspecialchars($p[0], ENT_COMPAT, 'UTF-8', FALSE),
'help' => $help 'help' => $help
); );
......
...@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Backend\RecordList; ...@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Backend\RecordList;
use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\Utility\IconUtility; use TYPO3\CMS\Backend\Utility\IconUtility;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Recordlist\Browser\ElementBrowser; use TYPO3\CMS\Recordlist\Browser\ElementBrowser;
use TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList; use TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList;
...@@ -110,10 +111,10 @@ class ElementBrowserRecordList extends DatabaseRecordList { ...@@ -110,10 +111,10 @@ class ElementBrowserRecordList extends DatabaseRecordList {
$title = BackendUtility::getRecordTitle($table, $row, FALSE, TRUE); $title = BackendUtility::getRecordTitle($table, $row, FALSE, TRUE);
$ficon = IconUtility::getSpriteIconForRecord($table, $row); $ficon = IconUtility::getSpriteIconForRecord($table, $row);
$aOnClick = 'return insertElement(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($row['uid']) . ', \'db\', ' . GeneralUtility::quoteJSvalue($title) . ', \'\', \'\', ' . GeneralUtility::quoteJSvalue($ficon) . ');'; $aOnClick = 'return insertElement(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($row['uid']) . ', \'db\', ' . GeneralUtility::quoteJSvalue($title) . ', \'\', \'\', ' . GeneralUtility::quoteJSvalue($ficon) . ');';
$ATag = '<a href="#" onclick="' . $aOnClick . '">'; $ATag = '<a href="#" onclick="' . $aOnClick . '" title="' . $this->getLanguageService()->getLL('addToList', TRUE) . '">';
$ATag_alt = substr($ATag, 0, -4) . ',\'\',1);">'; $ATag_alt = substr($ATag, 0, -4) . ',\'\',1);">';
$ATag_e = '</a>'; $ATag_e = '</a>';
return $ATag . IconUtility::getSpriteIcon('actions-edit-add', array('title' => $this->getLanguageService()->getLL('addToList', TRUE))) . $ATag_e . $ATag_alt . $code . $ATag_e; return $ATag . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL) . $ATag_e . $ATag_alt . $code . $ATag_e;
} }
/** /**
......
...@@ -1287,7 +1287,7 @@ function jumpToUrl(URL) { ...@@ -1287,7 +1287,7 @@ function jumpToUrl(URL) {
// Do nothing // Do nothing
} }
if ($icon) { if ($icon) {
return IconUtility::getSpriteIcon($icon); return $this->iconFactory->getIcon($icon, Icon::SIZE_SMALL)->render();
} }
} }
......
...@@ -1226,7 +1226,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe ...@@ -1226,7 +1226,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
. '][' . $hiddenField . ']=' . $value; . '][' . $hiddenField . ']=' . $value;
$out .= '<a class="btn btn-default" href="' . htmlspecialchars($this->getPageLayoutController()->doc->issueCommand($params)) $out .= '<a class="btn btn-default" href="' . htmlspecialchars($this->getPageLayoutController()->doc->issueCommand($params))
. '" title="' . $this->getLanguageService()->getLL($label, TRUE) . '">' . '" title="' . $this->getLanguageService()->getLL($label, TRUE) . '">'
. IconUtility::getSpriteIcon('actions-edit-' . strtolower($label)) . '</a>'; . $this->iconFactory->getIcon('actions-edit-' . strtolower($label), Icon::SIZE_SMALL) . '</a>';
} }
// Delete // Delete
$params = '&cmd[tt_content][' . $row['uid'] . '][delete]=1'; $params = '&cmd[tt_content][' . $row['uid'] . '][delete]=1';
...@@ -1258,7 +1258,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe ...@@ -1258,7 +1258,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
$displayMoveButtons = TRUE; $displayMoveButtons = TRUE;
} }
} else { } else {
$moveButtonContent .= '<span class="btn btn-default disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>'; $moveButtonContent .= '<span class="btn btn-default disabled">' . $this->iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
} }
// Move element down: // Move element down:
if ($this->tt_contentData['next'][$row['uid']]) { if ($this->tt_contentData['next'][$row['uid']]) {
...@@ -1271,7 +1271,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe ...@@ -1271,7 +1271,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
$displayMoveButtons = TRUE; $displayMoveButtons = TRUE;
} }
} else { } else {
$moveButtonContent .= '<span class="btn btn-default disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>'; $moveButtonContent .= '<span class="btn btn-default disabled">' . $this->iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
} }
if ($displayMoveButtons) { if ($displayMoveButtons) {
$out .= '<div class="btn-group btn-group-sm" role="group">' . $moveButtonContent . '</div>'; $out .= '<div class="btn-group btn-group-sm" role="group">' . $moveButtonContent . '</div>';
......
<?php
namespace TYPO3\CMS\Backend\ViewHelpers;
/*
* This file is part of the TYPO3 CMS project.
*
* It is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, either version 2
* of the License, or any later version.
*
* For the full copyright and license information, please read the
* LICENSE.txt file that was distributed with this source code.
*
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Backend\Utility\IconUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Fluid\Core\ViewHelper\Facets\CompilableInterface;
/**
* Displays sprite icon identified by iconName key
* @internal
*/
class SpriteManagerIconViewHelper extends AbstractViewHelper implements CompilableInterface {
/**
* Prints sprite icon html for $iconName key
*
* @param string $iconName
* @param array $options
* @return string
*/
public function render($iconName, $options = array()) {
return static::renderStatic(
array(
'iconName' => $iconName,
'options' => $options
),
$this->buildRenderChildrenClosure(),
$this->renderingContext
);
}
/**
* Print sprite icon html for $iconName key
*
* @param array $arguments
* @param \Closure $renderChildrenClosure
* @param RenderingContextInterface $renderingContext
* @return string
*/
static public function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) {
$iconName = $arguments['iconName'];
$options = $arguments['options'];
return IconUtility::getSpriteIcon($iconName, $options);
}
}
{namespace be = TYPO3\CMS\Backend\ViewHelpers} {namespace core = TYPO3\CMS\Core\ViewHelpers}
<f:switch expression="{item.stateIcon}"> <f:switch expression="{item.stateIcon}">
<f:case value="-1"><be:spriteManagerIcon iconName="status-dialog-ok" /></f:case> <f:case value="-1"><core:icon identifier="status-dialog-ok" /></f:case>
<f:case value="1"><be:spriteManagerIcon iconName="status-dialog-notification" /></f:case> <f:case value="1"><core:icon identifier="status-dialog-notification" /></f:case>
<f:case value="2"><be:spriteManagerIcon iconName="status-dialog-warning" /></f:case> <f:case value="2"><core:icon identifier="status-dialog-warning" /></f:case>
<f:case value="3"><be:spriteManagerIcon iconName="status-dialog-error" /></f:case> <f:case value="3"><core:icon identifier="status-dialog-error" /></f:case>
</f:switch> </f:switch>
...@@ -65,7 +65,7 @@ class RemoveUserViewHelper extends AbstractViewHelper implements CompilableInter ...@@ -65,7 +65,7 @@ class RemoveUserViewHelper extends AbstractViewHelper implements CompilableInter
/** @var IconFactory $iconFactory */ /** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class); $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
if ($backendUser->getUid() === (int)$beUser->user['uid']) { if ($backendUser->getUid() === (int)$beUser->user['uid']) {
return '<span class="btn btn-default disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>'; return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
} }
$urlParameters = [ $urlParameters = [
......
...@@ -16,6 +16,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers; ...@@ -16,6 +16,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
use TYPO3\CMS\Backend\Utility\IconUtility; use TYPO3\CMS\Backend\Utility\IconUtility;
use TYPO3\CMS\Beuser\Domain\Model\BackendUser; use TYPO3\CMS\Beuser\Domain\Model\BackendUser;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility; use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
...@@ -54,7 +56,8 @@ class SwitchUserViewHelper extends AbstractViewHelper implements CompilableInter ...@@ -54,7 +56,8 @@ class SwitchUserViewHelper extends AbstractViewHelper implements CompilableInter
$backendUser = $arguments['backendUser']; $backendUser = $arguments['backendUser'];
if ($backendUser->getUid() == $GLOBALS['BE_USER']->user['uid'] || !$backendUser->isActive()) { if ($backendUser->getUid() == $GLOBALS['BE_USER']->user['uid'] || !$backendUser->isActive()) {
return '<span class="btn btn-default disabled">' . IconUtility::getSpriteIcon('empty-empty') . '</span>'; $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
} }
$title = LocalizationUtility::translate('switchBackMode', 'beuser'); $title = LocalizationUtility::translate('switchBackMode', 'beuser');
return '<a class="btn btn-default" href="' . return '<a class="btn btn-default" href="' .
......
...@@ -29,21 +29,21 @@ ...@@ -29,21 +29,21 @@
</f:if> </f:if>
</td> </td>
<td class="col-control"> <td class="col-control">
<f:link.action action="addToCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default"><be:spriteManagerIcon iconName="actions-edit-add"/> <f:translate key="compare" /></f:link.action> <f:link.action action="addToCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default"><core:icon identifier="actions-edit-add" size="small"/> <f:translate key="compare" /></f:link.action>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default" href="#" onclick="top.launchView('be_users', '{backendUser.uid}'); return false;"><core:icon identifier="actions-document-info" size="small"/></a> <a class="btn btn-default" href="#" onclick="top.launchView('be_users', '{backendUser.uid}'); return false;"><core:icon identifier="actions-document-info" /></a>
<a class="btn btn-default" href="{bu:editRecord(parameters: 'edit[be_users][{backendUser.uid}]=edit&returnUrl={returnUrl}')}"><core:icon identifier="actions-document-open" size="small"/></a> <a class="btn btn-default" href="{bu:editRecord(parameters: 'edit[be_users][{backendUser.uid}]=edit&returnUrl={returnUrl}')}"><core:icon identifier="actions-document-open" /></a>
<f:if condition="{backendUser.currentlyLoggedIn} == 1"> <f:if condition="{backendUser.currentlyLoggedIn} == 1">
<f:then> <f:then>
<span class="btn btn-default disabled"><be:spriteManagerIcon iconName="empty-empty" /></span> <span class="btn btn-default disabled"><core:icon identifier="empty-empty" /></span>
</f:then> </f:then>
<f:else> <f:else>
<f:if condition="{backendUser.isDisabled} == 1"> <f:if condition="{backendUser.isDisabled} == 1">
<f:then> <f:then>
<a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{backendUser.uid}][disable]=0', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" size="small"/></a> <a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{backendUser.uid}][disable]=0', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" /></a>
</f:then> </f:then>
<f:else> <f:else>
<a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{backendUser.uid}][disable]=1', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" size="small"/></a> <a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{backendUser.uid}][disable]=1', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" /></a>
</f:else> </f:else>
</f:if> </f:if>
</f:else> </f:else>
......
...@@ -37,13 +37,13 @@ ...@@ -37,13 +37,13 @@
arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}" arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}"
data="{severity: 'warning', title: '{f:translate(key: \'endSession\')}', content: '{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?', button-close-text: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:cancel\')}'}" data="{severity: 'warning', title: '{f:translate(key: \'endSession\')}', content: '{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?', button-close-text: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:cancel\')}'}"
> >
<core:icon identifier="actions-document-close" size="small"/> <core:icon identifier="actions-document-close" />
<f:translate key="endSession" /> <f:translate key="endSession" />
</f:link.action> </f:link.action>
</f:else> </f:else>
</f:if> </f:if>
<a class="btn btn-default" href="#" onclick="top.launchView('be_users', '{onlineUser.backendUser.uid}',''); return false;"> <a class="btn btn-default" href="#" onclick="top.launchView('be_users', '{onlineUser.backendUser.uid}',''); return false;">
<core:icon identifier="actions-document-info" size="small"/> <core:icon identifier="actions-document-info" />
</a> </a>
</div> </div>
</td> </td>
......
{namespace be = TYPO3\CMS\Backend\ViewHelpers}
{namespace bu = TYPO3\CMS\Beuser\ViewHelpers} {namespace bu = TYPO3\CMS\Beuser\ViewHelpers}
{namespace core = TYPO3\CMS\Core\ViewHelpers} {namespace core = TYPO3\CMS\Core\ViewHelpers}
...@@ -25,14 +24,14 @@ ...@@ -25,14 +24,14 @@
</td> </td>
<td class="col-control"> <td class="col-control">
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-default" href="#" onclick="top.launchView('be_groups', '{backendUserGroup.uid}'); return false;"><core:icon identifier="actions-document-info" size="small"/></a> <a class="btn btn-default" href="#" onclick="top.launchView('be_groups', '{backendUserGroup.uid}'); return false;"><core:icon identifier="actions-document-info" /></a>
<a class="btn btn-default" href="{bu:editRecord(parameters: 'edit[be_groups][{backendUserGroup.uid}]=edit&returnUrl={returnUrl}')}"><core:icon identifier="actions-document-open" size="small"/></a> <a class="btn btn-default" href="{bu:editRecord(parameters: 'edit[be_groups][{backendUserGroup.uid}]=edit&returnUrl={returnUrl}')}"><core:icon identifier="actions-document-open" /></a>
<f:if condition="{backendUserGroup.hidden}"> <f:if condition="{backendUserGroup.hidden}">
<f:then> <f:then>
<a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_groups][{backendUserGroup.uid}][hidden]=0', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" size="small"/></a> <a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_groups][{backendUserGroup.uid}][hidden]=0', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.unhide')}"><core:icon identifier="actions-edit-unhide" /></a>
</f:then> </f:then>
<f:else> <f:else>
<a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_groups][{backendUserGroup.uid}][hidden]=1', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" size="small"/></a> <a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_groups][{backendUserGroup.uid}][hidden]=1', redirectUrl: redirectUrl)}" title="{f:translate(key:'visibility.hide')}"><core:icon identifier="actions-edit-hide" /></a>
</f:else> </f:else>
</f:if> </f:if>
</div> </div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<f:layout name="Default" /> <f:layout name="Default" />
<f:section name="iconButtons"> <f:section name="iconButtons">
<f:link.action action="index"><be:spriteManagerIcon iconName="actions-view-go-back" /></f:link.action> <f:link.action action="index"><core:icon identifier="actions-view-go-back" /></f:link.action>
</f:section> </f:section>
<f:section name="headline"> <f:section name="headline">
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
<f:if condition="{compareUser.isDisabled} == 1"> <f:if condition="{compareUser.isDisabled} == 1">
<f:then> <f:then>
<a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=0', redirectUrl: redirectUrl)}" title="{f:translate(key: 'visibility.unhide')}"> <a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=0', redirectUrl: redirectUrl)}" title="{f:translate(key: 'visibility.unhide')}">
<core:icon identifier="actions-edit-unhide" size="small"/> <core:icon identifier="actions-edit-unhide" />
</a> </a>
</f:then> </f:then>
<f:else> <f:else>
<a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=1', redirectUrl: redirectUrl)}" title="{f:translate(key: 'visibility.hide')}"> <a class="btn btn-default" href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=1', redirectUrl: redirectUrl)}" title="{f:translate(key: 'visibility.hide')}">
<core:icon identifier="actions-edit-hide" size="small"/> <core:icon identifier="actions-edit-hide" />
</a> </a>
</f:else> </f:else>
</f:if> </f:if>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</td> </td>
<td> <td>
<f:link.action action="removeFromCompareList" arguments="{uid: compareUser.uid}" class="pull-right"> <f:link.action action="removeFromCompareList" arguments="{uid: compareUser.uid}" class="pull-right">
<be:spriteManagerIcon iconName="actions-selection-delete" /> <core:icon identifier="actions-selection-delete" />
</f:link.action> </f:link.action>
</td> </td>
</tr> </tr>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<f:section name="iconButtons"> <f:section name="iconButtons">
<a href="#" onclick="{previewUrl}" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}"> <a href="#" onclick="{previewUrl}" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}">
<core:icon identifier="actions-document-view" size="small" /> <core:icon identifier="actions-document-view" />
</a> </a>
</f:section> </f:section>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
arguments="{id: data.row._ORIG_uid, depth: depth}" arguments="{id: data.row._ORIG_uid, depth: depth}"
title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
> >
<core:icon identifier="actions-document-open" size="small"/> <core:icon identifier="actions-document-open" />
</f:link.action> </f:link.action>
</f:then> </f:then>
<f:else> <f:else>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
arguments="{id: data.row.uid, depth: depth}" arguments="{id: data.row.uid, depth: depth}"
title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}"
> >
<core:icon identifier="actions-document-open" size="small"/> <core:icon identifier="actions-document-open" />
</f:link.action> </f:link.action>
</f:else> </f:else>
</f:if> </f:if>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
data-lockstate="1" data-lockstate="1"
title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
> >
<be:spriteManagerIcon iconName="status-warning-lock" /> <core:icon identifier="status-warning-lock" />
</a> </a>
</f:then> </f:then>
<f:else> <f:else>
...@@ -199,11 +199,11 @@ ...@@ -199,11 +199,11 @@
<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td> <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4_t" /></td>
</tr> </tr>
<tr> <tr>
<td nowrap="nowrap"><be:spriteManagerIcon iconName="status-status-permission-granted" options="{class:'text-success'}" /></td> <td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
<td nowrap="nowrap"><be:spriteManagerIcon iconName="status-status-permission-denied" options="{class:'text-danger'}" /></td> <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
<td nowrap="nowrap"><be:spriteManagerIcon iconName="status-status-permission-granted" options="{class:'text-success'}" /></td> <td nowrap="nowrap"><core:icon identifier="status-status-permission-granted" /></td>
<td nowrap="nowrap"><be:spriteManagerIcon iconName="status-status-permission-denied" options="{class:'text-danger'}" /></td> <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
<td nowrap="nowrap"><be:spriteManagerIcon iconName="status-status-permission-denied" options="{class:'text-danger'}" /></td> <td nowrap="nowrap"><core:icon identifier="status-status-permission-denied" /></td>
<td nowrap="nowrap"><span class="number">5</span></td> <td nowrap="nowrap"><span class="number">5</span></td>
<td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td> <td nowrap="nowrap"><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8_t" /></td>
</tr> </tr>
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
</div> </div>
<p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p> <p><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:def" /></p>
<p> <p>
<be:spriteManagerIcon iconName="status-status-permission-granted" options="{class:'text-success'}" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/> <core:icon identifier="status-status-permission-granted" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Granted" /><br/>
<be:spriteManagerIcon iconName="status-status-permission-denied" options="{class:'text-danger'}" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" /> <core:icon identifier="status-status-permission-denied" /> <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:A_Denied" />
</p> </p>
</f:section> </f:section>
...@@ -549,7 +549,8 @@ class QueryView { ...@@ -549,7 +549,8 @@ class QueryView {
$params = '&edit[' . $table . '][' . $row['uid'] . ']=edit'; $params = '&edit[' . $table . '][' . $row['uid'] . ']=edit';
$out .= '<td><div class="btn-group">'; $out .= '<td><div class="btn-group">';
if (!$row['deleted']) { if (!$row['deleted']) {
$out .= '<a class="btn btn-default" href="#" onClick="top.launchView(\'' . $table . '\',' . $row['uid'] . ',\'' . $GLOBALS['BACK_PATH'] . '\');return false;">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('status-dialog-information') . '</a>'; $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$out .= '<a class="btn btn-default" href="#" onClick="top.launchView(\'' . $table . '\',' . $row['uid'] . ',\'' . $GLOBALS['BACK_PATH'] . '\');return false;">' . $iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>';
$out .= '<a class="btn btn-default" href="#" onClick="' . htmlspecialchars(BackendUtility::editOnClick($params, '', GeneralUtility::getIndpEnv('REQUEST_URI') . GeneralUtility::implodeArrayForUrl('SET', (array)GeneralUtility::_POST('SET')))) . '">' . $iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL) . '</a>'; $out .= '<a class="btn btn-default" href="#" onClick="' . htmlspecialchars(BackendUtility::editOnClick($params, '', GeneralUtility::getIndpEnv('REQUEST_URI') . GeneralUtility::implodeArrayForUrl('SET', (array)GeneralUtility::_POST('SET')))) . '">' . $iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL) . '</a>';