Commit ab5497b9 authored by Frank Nägler's avatar Frank Nägler Committed by Anja Leichsenring
Browse files

[TASK] Replaced icon with IconFactory: actions-move-*

Resolves: #69587
Releases: master
Change-Id: Ife2606f2c663a0b3df4bd7e140d5344043d5357d
Reviewed-on: http://review.typo3.org/43090

Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent 44c37ec0
......@@ -16,6 +16,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
use TYPO3\CMS\Backend\Utility\IconUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Backend\Form\NodeFactory;
......@@ -44,20 +46,13 @@ class FlexFormContainerContainer extends AbstractContainer {
// Every container adds its own part to the id prefix
$flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMd5(uniqid('id', TRUE));
$toggleIcons = IconUtility::getSpriteIcon(
'actions-move-down',
array(
'class' => 't3-flex-control-toggle-icon-open',
'style' => $flexFormContainerElementCollapsed ? 'display: none;' : '',
)
);
$toggleIcons .= IconUtility::getSpriteIcon(
'actions-move-right',
array(
'class' => 't3-flex-control-toggle-icon-close',
'style' => $flexFormContainerElementCollapsed ? '' : 'display: none;',
)
);
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$toggleIcons = '<span class="t3-flex-control-toggle-icon-open" style="' . ($flexFormContainerElementCollapsed ? 'display: none;' : '') . '">'
. $iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL)
. '</span>';
$toggleIcons .= '<span class="t3-flex-control-toggle-icon-close" style="' . ($flexFormContainerElementCollapsed ? '' : 'display: none;') . '">'
. $iconFactory->getIcon('actions-move-right', Icon::SIZE_SMALL)
. '</span>';
$flexFormContainerCounter = $this->globalOptions['flexFormContainerCounter'];
$actionFieldName = '_ACTION_FLEX_FORM'
......@@ -74,20 +69,10 @@ class FlexFormContainerContainer extends AbstractContainer {
$userHasAccessToDefaultLanguage = $this->getBackendUserAuthentication()->checkLanguageAccess(0);
if ($userHasAccessToDefaultLanguage) {
$moveAndDeleteContent[] = '<div class="pull-right">';
$moveAndDeleteContent[] = IconUtility::getSpriteIcon(
'actions-move-move',
array(
'title' => 'Drag to Move', // @todo: hardcoded title ...
'class' => 't3-js-sortable-handle'
)
);
$moveAndDeleteContent[] = IconUtility::getSpriteIcon(
'actions-edit-delete',
array(
'title' => 'Delete', // @todo: hardcoded title ...
'class' => 't3-js-delete'
)
);
// @todo: hardcoded title ...
$moveAndDeleteContent[] = '<span title="Drag to Move" class="t3-js-sortable-handle">' . $iconFactory->getIcon('actions-move-move', Icon::SIZE_SMALL) . '</span>';
// @todo: hardcoded title ...
$moveAndDeleteContent[] = '<span title="Delete" class="t3-js-delete">' . $iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL) . '</span>';
$moveAndDeleteContent[] = '</div>';
}
......
......@@ -161,8 +161,8 @@ class FlexFormSectionContainer extends AbstractContainer {
$html[] = '</strong>';
$html[] = '</div>';
$html[] = '<div class="t3-form-field-toggle-flexsection t3-form-flexsection-toggle">';
$html[] = '<a href="#">';
$html[] = IconUtility::getSpriteIcon('actions-move-right', array('title' => $toggleAll)) . $toggleAll;
$html[] = '<a href="#" title="' . $toggleAll . '">';
$html[] = $iconFactory->getIcon('actions-move-right', Icon::SIZE_SMALL) . $toggleAll;
$html[] = '</a>';
$html[] = '</div>';
$html[] = '<div';
......
......@@ -464,7 +464,7 @@ class InlineControlContainer extends AbstractContainer {
$className = '';
}
// Create the link:
$icon = $icon ? $this->iconFactory->getIcon($icon) : '';
$icon = $icon ? $this->iconFactory->getIcon($icon, Icon::SIZE_SMALL) : '';
$link = $this->wrapWithAnchor($icon . $title, '#', $attributes);
return '<div' . ($className ? ' class="' . $className . '"' : '') . 'title="' . $title . '">' . $link . '</div>';
}
......
......@@ -519,15 +519,15 @@ class InlineRecordContainer extends AbstractContainer {
$onClick = 'return inline.changeSorting(' . GeneralUtility::quoteJSvalue($nameObjectFtId) . ', \'1\')';
$style = $config['inline']['first'] == $rec['uid'] ? 'style="visibility: hidden;"' : '';
$cells['sort.up'] = '
<a class="btn btn-default sortingUp" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . '>
' . IconUtility::getSpriteIcon('actions-move-up', array('title' => $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:moveUp', TRUE))) . '
<a class="btn btn-default sortingUp" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . ' title="' . $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:moveUp', TRUE) . '">
' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '
</a>';
// Down
$onClick = 'return inline.changeSorting(' . GeneralUtility::quoteJSvalue($nameObjectFtId) . ', \'-1\')';
$style = $config['inline']['last'] == $rec['uid'] ? 'style="visibility: hidden;"' : '';
$cells['sort.down'] = '
<a class="btn btn-default sortingDown" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . '>
' . IconUtility::getSpriteIcon('actions-move-down', array('title' => $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:moveDown', TRUE))) . '
<a class="btn btn-default sortingDown" href="#" onclick="' . htmlspecialchars($onClick) . '" ' . $style . ' title="' . $languageService->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:moveDown', TRUE) . '">
' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '
</a>';
}
// "Edit" link:
......@@ -592,8 +592,8 @@ class InlineRecordContainer extends AbstractContainer {
// Drag&Drop Sorting: Sortable handler for script.aculo.us
if ($enabledControls['dragdrop'] && $permsEdit && $enableManualSorting && $config['appearance']['useSortable']) {
$additionalCells['dragdrop'] = '
<span class="btn btn-default">
' . IconUtility::getSpriteIcon('actions-move-move', array('data-id' => $rec['uid'], 'class' => 'sortableHandle', 'title' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move', TRUE))) . '
<span class="btn btn-default sortableHandle" data-id="' . htmlspecialchars($rec['uid']) . '" title="' . $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move', TRUE) . '">
' . $this->iconFactory->getIcon('actions-move-move', Icon::SIZE_SMALL) . '
</span>';
}
} elseif ($isVirtualRecord && $isParentExisting) {
......
......@@ -590,7 +590,7 @@ abstract class AbstractFormElement extends AbstractNode {
class="btn btn-default t3-btn-moveoption-top"
data-fieldname="' . $fName . '"
title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_to_top')) . '">
' . IconUtility::getSpriteIcon('actions-move-to-top') . '
' . $this->iconFactory->getIcon('actions-move-to-top', Icon::SIZE_SMALL) . '
</a>';
}
......@@ -599,14 +599,14 @@ abstract class AbstractFormElement extends AbstractNode {
class="btn btn-default t3-btn-moveoption-up"
data-fieldname="' . $fName . '"
title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_up')) . '">
' . IconUtility::getSpriteIcon('actions-move-up') . '
' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '
</a>';
$icons['L'][] = '
<a href="#"
class="btn btn-default t3-btn-moveoption-down"
data-fieldname="' . $fName . '"
title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_down')) . '">
' . IconUtility::getSpriteIcon('actions-move-down') . '
' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '
</a>';
if ($sSize >= 5) {
$icons['L'][] = '
......@@ -614,7 +614,7 @@ abstract class AbstractFormElement extends AbstractNode {
class="btn btn-default t3-btn-moveoption-bottom"
data-fieldname="' . $fName . '"
title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.move_to_bottom')) . '">
' . IconUtility::getSpriteIcon('actions-move-to-bottom') . '
' . $this->iconFactory->getIcon('actions-move-to-bottom', Icon::SIZE_SMALL) . '
</a>';
}
}
......
......@@ -16,6 +16,8 @@ namespace TYPO3\CMS\Backend\RecordList;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\Utility\IconUtility;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Lang\LanguageService;
......@@ -327,14 +329,15 @@ abstract class AbstractRecordList {
public function fwd_rwd_HTML($type, $pointer, $table = '') {
$content = '';
$tParam = $table ? '&table=' . rawurlencode($table) : '';
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
switch ($type) {
case 'fwd':
$href = $this->listURL() . '&pointer=' . ($pointer - $this->iLimit) . $tParam;
$content = '<a href="' . htmlspecialchars($href) . '">' . IconUtility::getSpriteIcon('actions-move-up') . '</a> <i>[1 - ' . $pointer . ']</i>';
$content = '<a href="' . htmlspecialchars($href) . '">' . $iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '</a> <i>[1 - ' . $pointer . ']</i>';
break;
case 'rwd':
$href = $this->listURL() . '&pointer=' . $pointer . $tParam;
$content = '<a href="' . htmlspecialchars($href) . '">' . IconUtility::getSpriteIcon('actions-move-down') . '</a> <i>[' . ($pointer + 1) . ' - ' . $this->totalItems . ']</i>';
$content = '<a href="' . htmlspecialchars($href) . '">' . $iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '</a> <i>[' . ($pointer + 1) . ' - ' . $this->totalItems . ']</i>';
break;
}
return $content;
......
......@@ -1253,7 +1253,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
$moveButtonContent .= '<a class="btn btn-default" href="'
. htmlspecialchars($this->getPageLayoutController()->doc->issueCommand($params))
. '" title="' . $this->getLanguageService()->getLL('moveUp', TRUE) . '">'
. IconUtility::getSpriteIcon('actions-move-up') . '</a>';
. $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '</a>';
if (!$dragDropEnabled) {
$displayMoveButtons = TRUE;
}
......@@ -1266,7 +1266,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
$moveButtonContent .= '<a class="btn btn-default" href="'
. htmlspecialchars($this->getPageLayoutController()->doc->issueCommand($params))
. '" title="' . $this->getLanguageService()->getLL('moveDown', TRUE) . '">'
. IconUtility::getSpriteIcon('actions-move-down') . '</a>';
. $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '</a>';
if (!$dragDropEnabled) {
$displayMoveButtons = TRUE;
}
......
......@@ -490,14 +490,14 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
// @todo $inputStyle undefined
$brTag = $inputStyle ? '' : '<br />';
if ($k != 1) {
$ctrl .= '<button name="FORMCFG[row_top][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-to-top', array('title' => $this->getLanguageService()->getLL('table_top', TRUE))) . '</button>' . $brTag;
$ctrl .= '<button name="FORMCFG[row_up][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-up', array('title' => $this->getLanguageService()->getLL('table_up', TRUE))) . '</button>' . $brTag;
$ctrl .= '<button name="FORMCFG[row_top][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_top', TRUE) . '">' . $this->iconFactory->getIcon('actions-move-to-top', Icon::SIZE_SMALL) . '</button>' . $brTag;
$ctrl .= '<button name="FORMCFG[row_up][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_up', TRUE) . '">' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '</button>' . $brTag;
}
$ctrl .= '<button name="FORMCFG[row_remove][' . ($k + 1) * 2 . ']" ' . $onClick . ' title = "' . $this->getLanguageService()->getLL('table_removeRow', TRUE) . '">' . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_LARGE) . '</button>' . $brTag;
if ($k != (count($formCfgArray)/2)) {
$ctrl .= '<button name="FORMCFG[row_down][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-down', array('title' => $this->getLanguageService()->getLL('table_down', TRUE))) . '</button>' . $brTag;
$ctrl .= '<button name="FORMCFG[row_bottom][' . ($k + 1) * 2 . ']"' . $onClick . '>' . IconUtility::getSpriteIcon('actions-move-to-bottom', array('title' => $this->getLanguageService()->getLL('table_bottom', TRUE))) . '</button>' . $brTag;
$ctrl .= '<button name="FORMCFG[row_down][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_down', TRUE) . '">' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '</button>' . $brTag;
$ctrl .= '<button name="FORMCFG[row_bottom][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_bottom', TRUE) . '">' . $this->iconFactory->getIcon('actions-move-to-bottom', Icon::SIZE_SMALL) . '</button>' . $brTag;
}
$ctrl .= '<button name="FORMCFG[row_add][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_addRow', TRUE) . '">' . IconUtility::getSpriteIcon('actions-template-new') . '</button>' . $brTag;
......
......@@ -320,6 +320,54 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
'provider' => SvgIconProvider::class,
'options' => array(
'source' => 'EXT:backend/Resources/Public/Icons/Action/actions-page-move.svg',
),
),
'actions-move' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'arrows',
)
),
'actions-move-down' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-down',
)
),
'actions-move-left' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-left',
)
),
'actions-move-move' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'bars',
)
),
'actions-move-right' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-right',
)
),
'actions-move-to-bottom' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-double-down',
)
),
'actions-move-to-top' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-double-up',
)
),
'actions-move-up' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-up',
)
),
'actions-page-open' => array(
......
......@@ -18,6 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\Utility\IconUtility;
use TYPO3\CMS\Backend\FrontendBackendUserAuthentication;
use TYPO3\CMS\Core\Database\DatabaseConnection;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Type\Bitmask\JsConfirmation;
use TYPO3\CMS\Core\Utility\GeneralUtility;
......@@ -114,9 +115,9 @@ class FrontendEditPanel {
}
// Hiding in workspaces because implementation is incomplete
if (isset($allow['move']) && $sortField && $this->backendUser->workspace === 0) {
$icon = IconUtility::getSpriteIcon('actions-move-up', array('title' => $this->backendUser->extGetLL('p_moveUp')));
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_moveUp')) . '">' . $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '</span>';
$panel .= $this->editPanelLinkWrap($icon, $formName, 'up');
$icon = IconUtility::getSpriteIcon('actions-move-down', array('title' => $this->backendUser->extGetLL('p_moveDown')));
$icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_moveDown')) . '">' . $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '</span>';
$panel .= $this->editPanelLinkWrap($icon, $formName, 'down');
}
// Hiding in workspaces because implementation is incomplete
......
......@@ -1316,7 +1316,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
$moveUpAction = '<a class="btn btn-default" href="#" onclick="'
. htmlspecialchars('return jumpToUrl(' . $module->doc->issueCommand($params, -1) . ');')
. '" title="' . $this->getLanguageService()->getLL('moveUp', TRUE) . '">'
. IconUtility::getSpriteIcon('actions-move-up') . '</a>';
. $this->iconFactory->getIcon('actions-move-up', Icon::SIZE_SMALL) . '</a>';
} else {
$moveUpAction = $this->spaceIcon;
}
......@@ -1328,7 +1328,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
$moveDownAction = '<a class="btn btn-default" href="#" onclick="'
. htmlspecialchars('return jumpToUrl(' . $module->doc->issueCommand($params, -1) . ');')
. '" title="' . $this->getLanguageService()->getLL('moveDown', TRUE) . '">'
. IconUtility::getSpriteIcon('actions-move-down') . '</a>';
. $this->iconFactory->getIcon('actions-move-down', Icon::SIZE_SMALL) . '</a>';
} else {
$moveDownAction = $this->spaceIcon;
}
......@@ -1406,7 +1406,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
$moveLeftAction = '<a class="btn btn-default" href="#" onclick="'
. htmlspecialchars('return jumpToUrl(' . $module->doc->issueCommand($params, -1) . ');')
. '" title="' . $this->getLanguageService()->getLL('prevLevel', TRUE) . '">'
. IconUtility::getSpriteIcon('actions-move-left') . '</a>';
. $this->iconFactory->getIcon('actions-move-left', Icon::SIZE_SMALL) . '</a>';
$this->addActionToCellGroup($cells, $moveLeftAction, 'moveLeft');
}
// Down (Paste as subpage to the page right above)
......@@ -1417,7 +1417,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
$moveRightAction = '<a class="btn btn-default" href="#" onclick="'
. htmlspecialchars('return jumpToUrl(' . $module->doc->issueCommand($params, -1) . ');')
. '" title="' . $this->getLanguageService()->getLL('nextLevel', TRUE) . '">'
. IconUtility::getSpriteIcon('actions-move-right') . '</a>';
. $this->iconFactory->getIcon('actions-move-right', Icon::SIZE_SMALL) . '</a>';
} else {
$moveRightAction = $this->spaceIcon;
}
......
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