Commit 51bb498d authored by Wouter Wolters's avatar Wouter Wolters Committed by Andreas Fernandez
Browse files

[TASK] Replace all be.buttons.icon ViewHelpers that use an icon

Resolves: #69461
Releases: master
Change-Id: I1e637c92183eba1cf21e837f7294d9d8c38d6d19
Reviewed-on: http://review.typo3.org/42963


Reviewed-by: default avatarDaniel Goerz <ervaude@gmail.com>
Tested-by: default avatarDaniel Goerz <ervaude@gmail.com>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <typo3@scripting-base.de>
parent 0777205a
......@@ -4,9 +4,11 @@
<f:layout name="Permission" />
<f:section name="iconButtons">
<f:be.buttons.icon uri="{f:uri.action(action:'index')}" icon="actions-view-go-back" />
<a href="{f:uri.action(action:'index')}">
<core:icon identifier="actions-view-go-back" />
</a>
<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>
</f:section>
......
......@@ -124,6 +124,18 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
'name' => 'clipboard',
)
),
'actions-document-save' => array(
'provider' => BitmapIconProvider::class,
'options' => array(
'source' => 'EXT:t3skin/images/icons/actions/document-save.png'
)
),
'actions-document-save-close' => array(
'provider' => BitmapIconProvider::class,
'options' => array(
'source' => 'EXT:t3skin/images/icons/actions/document-save-close.png'
)
),
'actions-document-view' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
......@@ -298,6 +310,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
'name' => 'refresh',
)
),
'actions-system-refresh' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'refresh',
)
),
'actions-version-swap-version' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
......@@ -310,6 +328,42 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
'name' => 'check-square-o',
)
),
'actions-view-go-back' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'angle-double-left',
)
),
'actions-view-go-up' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'level-up',
)
),
'actions-view-paging-first' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'step-backward',
)
),
'actions-view-paging-last' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'step-forward',
)
),
'actions-view-paging-previous' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'arrow-left',
)
),
'actions-view-paging-next' => array(
'provider' => FontawesomeIconProvider::class,
'options' => array(
'name' => 'arrow-right',
)
),
// Status
'status-status-current' => array(
......
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="Default" />
<f:section name="docheader">
<f:be.buttons.icon uri="{f:uri.action(action:'index')}" icon="actions-view-go-up" />
<a href="{f:uri.action(action:'index')}">
<core:icon identifier="actions-view-go-up" />
</a>
</f:section>
<f:section name="content">
......
{namespace csh=TYPO3\CMS\Cshmanual\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="Default" />
<f:section name="docheader">
<f:be.buttons.icon uri="{f:uri.action(action:'index')}" icon="actions-view-go-up" />
<a href="{f:uri.action(action:'index')}">
<core:icon identifier="actions-view-go-up" />
</a>
</f:section>
<f:section name="content">
......
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="main" />
<f:section name="docheader-buttons">
<f:be.buttons.icon uri="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extension.key})}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
<f:be.buttons.icon uri="javascript:document.configurationform.submit();" icon="actions-document-save" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:save')}" />
<f:be.buttons.icon uri="#" icon="actions-document-save-close" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:saveAndClose')}" />
<a href="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extension.key})}" title="{f:translate(key:'extConfTemplate.backToList')}">
<core:icon identifier="actions-view-go-back" />
</a>
<a href="javascript:document.configurationform.submit();" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:save')}">
<core:icon identifier="actions-document-save" />
</a>
<a href="#" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:saveAndClose')}" class="t3js-save-close">
<core:icon identifier="actions-document-save-close" />
</a>
</f:section>
<f:section name="module-headline">
......
......@@ -3,7 +3,9 @@
<f:layout name="main" />
<f:section name="docheader-buttons">
<f:be.buttons.icon uri="{f:uri.action(controller: 'List',action: 'distributions')}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
<a href="{f:uri.action(controller: 'List',action: 'distributions')}" title="{f:translate(key:'extConfTemplate.backToList')}">
<core:icon identifier="actions-view-go-back" />
</a>
</f:section>
<f:section name="module-headline">
......@@ -45,12 +47,12 @@
</f:if>
<li>
<button class="btn btn-default distribution-openViewModule" onclick="top.goToModule('web_ViewpageView');">
<f:be.buttons.icon icon="actions-document-view" /><f:translate key="distribution.welcome.openViewModule" />
<core:icon identifier="actions-document-view" /><f:translate key="distribution.welcome.openViewModule" />
</button>
</li>
<li>
<button class="btn btn-default distribution-openPageModule" onclick="top.goToModule('web_page');">
<f:be.buttons.icon icon="actions-document-open" /><f:translate key="distribution.welcome.openPageModule" />
<core:icon identifier="actions-document-open" /><f:translate key="distribution.welcome.openPageModule" />
</button>
</li>
</f:then>
......
......@@ -5,7 +5,9 @@
<f:section name="docheader-buttons">
<div id="upload-button-wrap">
<f:be.buttons.icon uri="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" icon="actions-edit-upload" title="{f:translate(key:'extensionList.uploadExtension')}"/>
<a href="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" title="{f:translate(key:'extensionList.uploadExtension')}">
<core:icon identifier="actions-edit-upload" />
</a>
</div>
</f:section>
......
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="main"/>
<f:section name="docheader-buttons">
<f:be.buttons.icon uri="{f:uri.action(action: 'ter')}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
<a href="{f:uri.action(action: 'ter')}" title="{f:translate(key:'extConfTemplate.backToList')}">
<core:icon identifier="actions-view-go-back" />
</a>
</f:section>
<f:section name="module-headline">
......
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="main"/>
<f:section name="docheader-buttons">
<div id="upload-button-wrap">
<f:be.buttons.icon uri="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" icon="actions-edit-upload" title="{f:translate(key:'extensionList.uploadExtension')}"/>
<a href="{f:uri.action(action:'form',controller:'UploadExtensionFile')}" title="{f:translate(key:'extensionList.uploadExtension')}">
<core:icon identifier="actions-edit-upload" />
</a>
</div>
</f:section>
......
{namespace em=TYPO3\CMS\Extensionmanager\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="main" />
<f:section name="docheader-buttons">
<f:be.buttons.icon uri="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extensionKey})}" icon="actions-view-go-back" title="{f:translate(key:'extConfTemplate.backToList')}" />
<a href="{f:uri.action(action:'index',controller:'List',additionalParams:{search:extensionKey})}" title="{f:translate(key:'extConfTemplate.backToList')}">
<core:icon identifier="actions-view-go-back" />
</a>
</f:section>
<f:section name="module-headline">
......
......@@ -684,7 +684,7 @@ define(['jquery', 'nprogress', 'datatables', 'TYPO3/CMS/Backend/jquery.clearable
ExtensionManager.configurationFieldSupport();
var $validate = $('.validate');
$validate.validate();
$(document).on('click', '.t3-icon-document-save-close', function() {
$(document).on('click', '.t3js-save-close', function() {
$validate.append($('<input />', {type: 'hidden', name: 'tx_extensionmanager_tools_extensionmanagerextensionmanager[action]', value: 'saveAndClose'})).submit();
});
......
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:if condition="{configuration.insertAbove}">
<f:render section="paginator" arguments="{pagination: pagination, position:'top', recordsLabel: configuration.recordsLabel}" />
</f:if>
......@@ -14,35 +15,25 @@
<f:if condition="{pagination.hasLessPages}">
<f:then>
<li>
<f:be.buttons.icon
uri="{f:widget.uri(arguments:{currentPage: 1})}"
icon="actions-view-paging-first"
title="{f:translate(key:'widget.pagination.first')}"
/>
<a href="{f:widget.uri(arguments:{currentPage: 1})}" title="{f:translate(key:'widget.pagination.first')}">
<core:icon identifier="actions-view-paging-first" />
</a>
</li>
<li>
<f:be.buttons.icon
uri="{f:widget.uri(arguments:{currentPage: pagination.previousPage})}"
icon="actions-view-paging-previous"
title="{f:translate(key:'widget.pagination.previous')}"
/>
<a href="{f:widget.uri(arguments:{currentPage: pagination.previousPage})}" title="{f:translate(key:'widget.pagination.previous')}">
<core:icon identifier="actions-view-paging-previous" />
</a>
</li>
</f:then>
<f:else>
<li class="disabled">
<span>
<f:be.buttons.icon
uri=""
icon="actions-view-paging-first"
/>
<core:icon identifier="actions-view-paging-first" />
</span>
</li>
<li class="disabled">
<span>
<f:be.buttons.icon
uri=""
icon="actions-view-paging-previous"
/>
<core:icon identifier="actions-view-paging-previous" />
</span>
</li>
</f:else>
......@@ -87,45 +78,33 @@
<f:if condition="{pagination.hasMorePages}">
<f:then>
<li>
<f:be.buttons.icon
uri="{f:widget.uri(arguments:{currentPage: pagination.nextPage})}"
icon="actions-view-paging-next"
title="{f:translate(key:'widget.pagination.next')}"
/>
<a href="{f:widget.uri(arguments:{currentPage: pagination.nextPage})}" title="{f:translate(key:'widget.pagination.next')}">
<core:icon identifier="actions-view-paging-next" />
</a>
</li>
<li>
<f:be.buttons.icon
uri="{f:widget.uri(arguments:{currentPage: pagination.numberOfPages})}"
icon="actions-view-paging-last"
title="{f:translate(key:'widget.pagination.last')}"
/>
<a href="{f:widget.uri(arguments:{currentPage: pagination.numberOfPages})}" title="{f:translate(key:'widget.pagination.last')}">
<core:icon identifier="actions-view-paging-last" />
</a>
</li>
</f:then>
<f:else>
<li class="disabled">
<span>
<f:be.buttons.icon
uri=""
icon="actions-view-paging-next"
/>
<core:icon identifier="actions-view-paging-next" />
</span>
</li>
<li class="disabled">
<span>
<f:be.buttons.icon
uri=""
icon="actions-view-paging-last"
/>
<core:icon identifier="actions-view-paging-last" />
</span>
</li>
</f:else>
</f:if>
<li>
<f:be.buttons.icon
uri="{f:widget.uri(arguments:{currentPage: pagination.current})}"
icon="actions-system-refresh"
title="{f:translate(key:'widget.pagination.refresh')}"
/>
<a href="{f:widget.uri(arguments:{currentPage: pagination.current})}" title="{f:translate(key:'widget.pagination.refresh')}">
<core:icon identifier="actions-system-refresh" />
</a>
</li>
</ul>
</nav>
......
{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="Administration"/>
......@@ -21,7 +22,9 @@
<tr>
<th></th>
<th>
<f:be.buttons.icon title="{f:translate(key:'administration.removeAllEntries')}" icon="actions-edit-delete" uri="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:\'ALL\',depth:depth,mode:mode}')}"/>
<a href="{f:uri.action(action:'deleteIndexedItem', arguments:'{id:\'ALL\', depth:depth, mode:mode}')}" title="{f:translate(key:'administration.removeAllEntries')}">
<core:icon identifier="actions-edit-delete" />
</a>
</th>
<th>
<f:translate key="field.fileName"/>
......@@ -61,7 +64,9 @@
<f:if condition="{i.index} == 0"> {line.row.title}</f:if>
</td>
<td>
<f:be.buttons.icon title="{f:translate(key:'administration.removeEntry')}" icon="actions-edit-delete" uri="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:l.phash,depth:depth,mode:mode}')}"/>
<a href="{f:uri.action(action:'deleteIndexedItem',arguments:'{id:l.phash,depth:depth,mode:mode}')}" title="{f:translate(key:'administration.removeEntry')}">
<core:icon identifier="actions-edit-delete" />
</a>
</td>
<td>
<f:image src="{l.icon}"/>
......
{namespace is=TYPO3\CMS\IndexedSearch\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="Administration"/>
......@@ -194,5 +195,7 @@
</f:section>
<f:section name="Buttons">
<f:be.buttons.icon title="{f:translate(key:'administration.back')}" icon="actions-view-go-back" uri="{f:uri.action(action:'statistic')}"/>
<a href="{f:uri.action(action:'statistic')}" title="{f:translate(key:'administration.back')}">
<core:icon identifier="actions-view-go-back" />
</a>
</f:section>
......@@ -13,8 +13,8 @@
<span class="menuItem loadingItem">
<span title="" class="t3-icon fa fa-spin fa-circle-o-notch">&nbsp;</span>
</span>
<span class="menuItem cancelItem" data-action="cancelLanguageUpdate">
&nbsp;<f:be.buttons.icon icon="actions-document-close" title="{f:translate(key:'button.cancel')}"/>
<span class="menuItem cancelItem" data-action="cancelLanguageUpdate" title="{f:translate(key:'button.cancel')}">
&nbsp;<core:icon identifier="actions-document-close" />
</span>
</div>
</f:section>
......
......@@ -345,6 +345,8 @@ define('TYPO3/CMS/Lang/LanguageModule', ['jquery', 'moment', 'datatables', 'TYPO
LanguageModule.handleActionEvent($element.parent(), event);
} else if ($element.parent().parent().data('action') !== undefined) {
LanguageModule.handleActionEvent($element.parent().parent(), event);
} else if ($element.parent().parent().parent().parent().data('action') !== undefined) {
LanguageModule.handleActionEvent($element.parent().parent().parent().parent(), event);
}
});
};
......
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="Default" />
<f:section name="iconButtons">
<a data-action="reload"><f:be.buttons.icon icon="actions-system-refresh" title="{f:translate(key:'button.reload')}" /></a>
<a data-action="reload" title="{f:translate(key:'button.reload')}"><core:icon identifier="actions-system-refresh" /></a>
</f:section>
<f:section name="content">
......
{namespace s = TYPO3\CMS\Scheduler\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<p class="lead">
<f:translate key="msg.infoScreenIntro" />
......@@ -27,7 +28,9 @@
<td>
<div class="btn-group" role="group">
<span class="btn btn-default">
<f:be.buttons.icon uri="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" icon="actions-document-new" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}"/>
<a href="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}">
<core:icon identifier="actions-document-new" />
</a>
</span>
</div>
</td>
......
{namespace notes=TYPO3\CMS\SysNote\ViewHelpers}
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:layout name="Default" />
......@@ -28,10 +29,12 @@
</f:if>
<div class="right icons">
<f:be.buttons.icon uri="{notes:deleteLink(id:note.uid)}"
icon="actions-edit-delete"
additionalAttributes="{class: 't3js-modal-trigger', data-severity: 'warning', data-title: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:delete\')}', data-content: '{f:translate(key: \'LLL:EXT:lang/locallang_alt_doc.xlf:deleteWarning\')}', data-button-close-text: '{f:translate(key: \'LLL:EXT:lang/locallang_common.xlf:cancel\')}'}" />
<f:be.buttons.icon uri="{notes:editLink(id:note.uid)}" icon="actions-document-open" />
<a href="{notes:deleteLink(id:note.uid)}" class="t3js-modal-trigger" data-severity="warning" data-title="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:delete')}" data-content="{f:translate(key: 'LLL:EXT:lang/locallang_alt_doc.xlf:deleteWarning')}" data-button-close-text="{f:translate(key: 'LLL:EXT:lang/locallang_common.xlf:cancel')}">
<core:icon identifier="actions-edit-delete" />
</a>
<a href="{notes:editLink(id:note.uid)}">
<core:icon identifier="actions-document-open" />
</a>
</div>
</div>
<div class="content">
......
{namespace core=TYPO3\CMS\Core\ViewHelpers}
<f:be.container
includeCssFiles="{
0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}',
......@@ -24,15 +25,14 @@
</div>
<div class="typo3-docheader-buttons">
<div class="left">
<f:be.buttons.icon uri="{url}"
additionalAttributes="{onclick: 'window.open(this.href,\'newTYPO3frontendWindow\').focus();return false;'}"
icon="actions-document-view" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}"
/>
<a href="{url}" onclick="window.open(this.href, 'newTYPO3frontendWindow').focus();return false;" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xlf:labels.showPage')}">
<core:icon identifier="actions-document-view" />
</a>
</div>
<div class="right">
<f:be.buttons.icon
uri="javascript:document.getElementById('tx_viewpage_iframe').contentWindow.location.reload(true);"
icon="actions-system-refresh" title="{f:translate(key: 'refreshPage')}" />
<a href="javascript:document.getElementById('tx_viewpage_iframe').contentWindow.location.reload(true);" title="{f:translate(key: 'refreshPage')}">
<core:icon identifier="actions-system-refresh" />
</a>
<f:be.buttons.shortcut/>
</div>
</div>
......
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