Skip to content

Commit

Permalink
[TASK] Raise typo3 icons to 1.9.0
Browse files Browse the repository at this point in the history
Executed tasks:
  cd Build
  yarn add @typo3/icons@1.9.0 --dev
  yarn grunt copy:core_icons
  yarn grunt copy:extension_icons
  yarn grunt copy:install_icons
  yarn grunt copy:module_icons

Resolves: #88467
Releases: master, 9.5
Change-Id: Ib04a694d5f68e5543a674bca4da7f957ae20ace3
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60859
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
  • Loading branch information
benjaminkott authored and andreaskienast committed May 31, 2019
1 parent 078f372 commit f364ea8
Show file tree
Hide file tree
Showing 37 changed files with 480 additions and 342 deletions.
2 changes: 1 addition & 1 deletion Build/package.json
Expand Up @@ -22,7 +22,7 @@
"@types/jqueryui": "^1.11.34",
"@types/nprogress": "^0.0.29",
"@types/requirejs": "*",
"@typo3/icons": "1.8.0",
"@typo3/icons": "1.9.0",
"autoprefixer": "^6.3.7",
"autosize": "^3.0.21",
"bootstrap-sass": "^3.4.1",
Expand Down
701 changes: 438 additions & 263 deletions Build/yarn.lock

Large diffs are not rendered by default.

47 changes: 6 additions & 41 deletions typo3/sysext/core/Classes/Imaging/IconRegistry.php
Expand Up @@ -101,20 +101,6 @@ class IconRegistry implements SingletonInterface
* please request them at: https://github.com/typo3/typo3.icons/issues
*/

// Actions
'actions-wizard-link' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'link'
]
],
'actions-wizard-rte' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'arrows-alt'
]
],

// Apps
'apps-pagetree-category-toggle-hide-checked' => [
'provider' => FontawesomeIconProvider::class,
Expand Down Expand Up @@ -241,32 +227,6 @@ class IconRegistry implements SingletonInterface
]
],

// Extensions
'extensions-extensionmanager-update-script' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'refresh',
]
],
'extensions-scheduler-run-task' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'play-circle',
]
],
'extensions-scheduler-run-task-cron' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'clock-o',
]
],
'generate-ws-preview-link' => [
'provider' => BitmapIconProvider::class,
'options' => [
'source' => 'EXT:workspaces/Resources/Public/Images/generate-ws-preview-link.png'
]
],

// Empty
'empty-empty' => [
'provider' => FontawesomeIconProvider::class,
Expand Down Expand Up @@ -473,12 +433,17 @@ class IconRegistry implements SingletonInterface
* @var array
*/
protected $deprecatedIcons = [
'module-workspaces-action-preview-link' => 'actions-version-workspaces-preview-link',
'generate-ws-preview-link' => 'actions-version-workspaces-preview-link',
'extensions-workspaces-generatepreviewlink' => 'actions-version-workspaces-preview-link',
'extensions-extensionmanager-update-script' => 'actions-refresh',
'extensions-scheduler-run-task' => 'actions-play',
'extensions-scheduler-run-task-cron' => 'actions-clock',
'status-warning-lock' => 'warning-lock',
'status-warning-in-use' => 'warning-in-use',
'status-status-reference-hard' => 'status-reference-hard',
'status-status-reference-soft' => 'status-reference-soft',
'status-status-edit-read-only' => 'status-edit-read-only',
'extensions-workspaces-generatepreviewlink' => 'generate-ws-preview-link',
't3-form-icon-advanced-password' => 'form-advanced-password',
't3-form-icon-checkbox' => 'form-checkbox',
't3-form-icon-content-element' => 'form-content-element',
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -70,7 +70,7 @@ public function render()
);
$this->tag->addAttribute('href', $uri);
$this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.update.script', 'extensionmanager'));
$this->tag->setContent($iconFactory->getIcon('extensions-extensionmanager-update-script', Icon::SIZE_SMALL)->render());
$this->tag->setContent($iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL)->render());
$tag = $this->tag->render();
} else {
return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
Expand Down
Expand Up @@ -164,17 +164,17 @@
[
'LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:sys_file_metadata.status.1',
1,
'filemetadata-status-1'
'actions-check'
],
[
'LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:sys_file_metadata.status.2',
2,
'filemetadata-status-2'
'actions-clock'
],
[
'LLL:EXT:filemetadata/Resources/Private/Language/locallang_tca.xlf:sys_file_metadata.status.3',
3,
'filemetadata-status-3'
'actions-view'
],
],
'fieldWizard' => [
Expand Down
19 changes: 0 additions & 19 deletions typo3/sysext/filemetadata/ext_localconf.php
@@ -1,21 +1,2 @@
<?php
defined('TYPO3_MODE') or die();

$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);

$iconRegistry->registerIcon(
'filemetadata-status-1',
\TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider::class,
['name' => 'check']
);
$iconRegistry->registerIcon(
'filemetadata-status-2',
\TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider::class,
['name' => 'clock-o']
);
$iconRegistry->registerIcon(
'filemetadata-status-3',
\TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider::class,
['name' => 'eye']
);
unset($iconRegistry);
Expand Up @@ -110,10 +110,10 @@
</div>
<div class="btn-group" role="group">
<a class="btn btn-default" data-toggle="tooltip" data-container="body" href="{moduleUri}&CMD=setNextExecutionTime&tx_scheduler[uid]={taskRecord.uid}" title="{f:translate(key:'action.run_task_cron')}">
<core:icon identifier="extensions-scheduler-run-task-cron"/>
<core:icon identifier="actions-clock"/>
</a>
<a class="btn btn-default" data-toggle="tooltip" data-container="body" href="{moduleUri}&tx_scheduler[execute][]={taskRecord.uid}" title="{f:translate(key:'action.run_task')}">
<core:icon identifier="extensions-scheduler-run-task"/>
<core:icon identifier="actions-play"/>
</a>
</div>
</f:else>
Expand Down
@@ -1,11 +1,11 @@
<f:render partial="TaskList" arguments="{tasks: tasks, moduleUri: moduleUri, missingClasses: missingClasses}" />

<button class="btn btn-default" name="go_cron" id="scheduler_executeselected">
<core:icon identifier="extensions-scheduler-run-task-cron" />
<core:icon identifier="actions-clock" />
<f:translate key="label.cronjobSelected" />
</button>
<button class="btn btn-default" name="go" id="scheduler_executeselected">
<core:icon identifier="extensions-scheduler-run-task" />
<core:icon identifier="actions-play" />
<f:translate key="label.executeSelected" />
</button>

Expand Down
Expand Up @@ -197,7 +197,7 @@ public function indexAction()
->setClasses('t3js-preview-link')
->setShowLabelText(true)
->setTitle($this->getLanguageService()->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:tooltip.generatePagePreview'))
->setIcon($iconFactory->getIcon('module-workspaces-action-preview-link', Icon::SIZE_SMALL));
->setIcon($iconFactory->getIcon('actions-version-workspaces-preview-link', Icon::SIZE_SMALL));
$buttonBar->addButton($showButton);
}
$backendUser->setAndSaveSessionData('tx_workspace_activeWorkspace', $activeWorkspace);
Expand Down
Diff not rendered.

0 comments on commit f364ea8

Please sign in to comment.