From 11e16139a1d70e3da7d6eed9a3a24c81731c848e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20N=C3=A4gler?= <typo3@naegler.net>
Date: Sun, 23 Nov 2014 18:15:06 +0100
Subject: [PATCH] [TASK] Click menu icons as icon font
follow up patch to change the last icons
Resolves: #63199
Resolves: #63137
Releases: master
Change-Id: I2e07f072ed6345e8209eeb8388e3cd6bcb038cfa
Reviewed-on: http://review.typo3.org/34497
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
---
typo3/js/extjs/components/pagetree/javascript/contextmenu.js | 1 -
typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php | 1 -
typo3/sysext/backend/Classes/Utility/IconUtility.php | 2 +-
typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php | 5 +++++
typo3/sysext/t3skin/ext_localconf.php | 1 -
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/typo3/js/extjs/components/pagetree/javascript/contextmenu.js b/typo3/js/extjs/components/pagetree/javascript/contextmenu.js
index 6ebe9f8298b3..e00f4e2959f0 100644
--- a/typo3/js/extjs/components/pagetree/javascript/contextmenu.js
+++ b/typo3/js/extjs/components/pagetree/javascript/contextmenu.js
@@ -156,7 +156,6 @@ TYPO3.Components.PageTree.ContextMenu = Ext.extend(Ext.menu.Menu, {
'callbackAction': contextMenuConfiguration[singleAction]['callbackAction'],
'customAttributes': contextMenuConfiguration[singleAction]['customAttributes']
};
-
component.itemTpl = Ext.menu.Item.prototype.itemTpl = new Ext.XTemplate(
'<a id="{id}" class="{cls}" hidefocus="true" unselectable="on" href="{href}">',
'<span class="{hrefTarget}">',
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index f7a7ccd3d776..2d85ab28c6ad 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -682,7 +682,6 @@ class ClickMenu {
$addParam = '';
$theIcon = 'actions-document-open';
if ($this->iParts[0] === 'pages' && $this->iParts[1] && $this->backendUser->check('modules', $pageModule)) {
- $theIcon = 'fa-desktop';
$this->editPageIconSet = TRUE;
if ($this->backendUser->uc['classicPageEditMode']) {
$addParam = '&editRegularContentFromId=' . (int)$this->iParts[1];
diff --git a/typo3/sysext/backend/Classes/Utility/IconUtility.php b/typo3/sysext/backend/Classes/Utility/IconUtility.php
index dc269be6eef1..8ca604352f74 100644
--- a/typo3/sysext/backend/Classes/Utility/IconUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/IconUtility.php
@@ -1003,7 +1003,7 @@ class IconUtility {
* is usually called by the methods that are responsible for fetching the names
* out of the file name, or the record type
*
- * @param string $name Iconname like 'actions-document-new'
+ * @param string $iconName Iconname like 'actions-document-new'
* @return string A list of all CSS classes needed for the HTML tag
*/
static public function getSpriteIconClasses($iconName) {
diff --git a/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php b/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php
index b1b4aa0e855a..c27949f1c3e7 100644
--- a/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php
+++ b/typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php
@@ -26,6 +26,7 @@ class IconStyleModifier {
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-export-t3d' => 'fa-download',
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-history-open' => 'fa-history',
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-import-t3d' => 'fa-upload',
+ 't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-edit-access' => 'fa-clock-o',
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-info' => 'fa-info-circle',
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-move c-inputButton' => 'fa-arrows',
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-move' => 'fa-arrows',
@@ -40,6 +41,7 @@ class IconStyleModifier {
't3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-cut-release' => 'fa-cut danger',
't3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-delete' => 'fa-trash',
't3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-download' => 'fa-download',
+ 't3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-edit' => 'fa-pencil',
't3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-hide' => 'fa-toggle-on',
't3-icon t3-icon-actions t3-icon-actions-edit t3-icon-edit-paste' => 'fa-paste',
't3-icon t3-icon-actions t3-icon-actions-document t3-icon-document-paste-after' => 'fa-caret-square-o-down',
@@ -71,12 +73,14 @@ class IconStyleModifier {
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-backend-user-switch' => 'fa-sign-out',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-cache-clear' => 'fa-bolt',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-configure' => 'fa-gear',
+ 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-documentation' => 'fa-anchor',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-download ' => 'fa-cloud-download',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-download' => 'fa-download',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-install' => 'fa-plus-circle',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-sqldump' => 'fa-database',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-uninstall' => 'fa-minus-square',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-help-open' => 'fa-question-circle',
+ 't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-list-open' => 'fa-list-alt',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-refresh' => 'fa-refresh',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-shortcut-new' => 'fa-star',
't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-tree-search-open' => 'fa-search',
@@ -94,6 +98,7 @@ class IconStyleModifier {
't3-icon t3-icon-actions t3-icon-actions-view t3-icon-view-table-collapse' => 'fa-chevron-left',
't3-icon t3-icon-actions t3-icon-actions-window t3-icon-window-open' => 'fa-arrows-alt',
't3-icon t3-icon-actions t3-icon-system-extension-import' => 'fa-cloud-download',
+ 't3-icon t3-icon-apps t3-icon-apps-pagetree t3-icon-pagetree-page-mountpoint' => 'fa-anchor',
't3-icon t3-icon-apps t3-icon-apps-toolbar t3-icon-toolbar-menu-actions' => 'fa-cog',
't3-icon t3-icon-apps t3-icon-apps-toolbar t3-icon-toolbar-menu-cache' => 'fa-bolt',
't3-icon t3-icon-apps t3-icon-apps-toolbar t3-icon-toolbar-menu-opendocs' => 'fa-file',
diff --git a/typo3/sysext/t3skin/ext_localconf.php b/typo3/sysext/t3skin/ext_localconf.php
index 856a5328476a..e5453f7045a8 100644
--- a/typo3/sysext/t3skin/ext_localconf.php
+++ b/typo3/sysext/t3skin/ext_localconf.php
@@ -18,4 +18,3 @@ defined('TYPO3_MODE') or die();
'TYPO3\\CMS\\T3skin\\Slot\\IconStyleModifier',
'buildSpriteIconClasses'
);
-
--
GitLab