From 271b8aeecc378b85fa5cbd01d57596921bc3e9dd Mon Sep 17 00:00:00 2001 From: Markus Sommer <markus.sommer@in2code.de> Date: Fri, 15 Jan 2016 20:14:33 +0100 Subject: [PATCH] [TASK] Move Images to Resources Resolves: #72748 Releases: master Change-Id: I53d7eb784c15d2adddc8574a77eb340e0d97cd7a Reviewed-on: https://review.typo3.org/45963 Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com> --- .../Public/Less/TYPO3/_element_pagetree.less | 18 +++++++++--------- .../Resources/Public/CSS/Wizard/Wizard.css | 4 ++-- .../Public/Images}/module-menu-down.png | Bin .../Public/Images}/module-menu-right.png | Bin .../t3skin/Resources/Public/Css/backend.css | 18 +++++++++--------- .../Images}/filetree-folder-default.png | Bin .../Public/Images}/filetree-folder-opened.png | Bin .../Images}/pagetree-drag-copy-above.png | Bin .../Images}/pagetree-drag-copy-below.png | Bin .../Images}/pagetree-drag-move-above.png | Bin .../Images}/pagetree-drag-move-below.png | Bin .../Images}/pagetree-drag-move-between.png | Bin .../Images}/pagetree-drag-move-into.png | Bin .../Images}/pagetree-drag-new-between.png | Bin .../Images}/pagetree-drag-new-inside.png | Bin .../Images}/pagetree-drag-place-denied.png | Bin typo3/sysext/t3skin/extjs/xtheme-t3skin.css | 4 ++-- 17 files changed, 22 insertions(+), 22 deletions(-) rename typo3/sysext/{t3skin/images/arrows => form/Resources/Public/Images}/module-menu-down.png (100%) rename typo3/sysext/{t3skin/images/arrows => form/Resources/Public/Images}/module-menu-right.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/filetree-folder-default.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/filetree-folder-opened.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-copy-above.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-copy-below.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-move-above.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-move-below.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-move-between.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-move-into.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-new-between.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-new-inside.png (100%) rename typo3/sysext/t3skin/{images/icons/apps => Resources/Public/Images}/pagetree-drag-place-denied.png (100%) diff --git a/Build/Resources/Public/Less/TYPO3/_element_pagetree.less b/Build/Resources/Public/Less/TYPO3/_element_pagetree.less index 074c38926c4e..e3ef9efd0d60 100644 --- a/Build/Resources/Public/Less/TYPO3/_element_pagetree.less +++ b/Build/Resources/Public/Less/TYPO3/_element_pagetree.less @@ -159,39 +159,39 @@ } .x-dd-drop-nodrop .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-place-denied.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-place-denied.png); } .x-tree-drop-ok-append.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-new-inside.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-inside.png); } .x-tree-drop-ok-below.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-copy-below.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-below.png); } .x-tree-drop-ok-above.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-copy-above.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-above.png); } .x-tree-drop-ok-between.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-new-between.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-between.png); } .x-tree-drop-ok-append .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-into.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-into.png); } .x-tree-drop-ok-between .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-between.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-between.png); } .x-tree-drop-ok-below .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-below.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-below.png); } .x-tree-drop-ok-above .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-above.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-above.png); } #typo3-pagetree .x-tree-node .x-tree-drag-insert-below, diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/Wizard.css b/typo3/sysext/form/Resources/Public/CSS/Wizard/Wizard.css index 03db924738b4..495a4641e0c7 100644 --- a/typo3/sysext/form/Resources/Public/CSS/Wizard/Wizard.css +++ b/typo3/sysext/form/Resources/Public/CSS/Wizard/Wizard.css @@ -77,12 +77,12 @@ form ol { #formwizard-left .x-accordion-hd .x-tool-toggle { margin: 0; float: left; - background-image: url("../../../../../../../typo3/sysext/t3skin/images/arrows/module-menu-down.png"); + background-image: url("../../Images/module-menu-down.png"); background-position: 0 4px; } #formwizard-left .x-panel-collapsed .x-accordion-hd .x-tool-toggle { - background-image: url("../../../../../../../typo3/sysext/t3skin/images/arrows/module-menu-right.png"); + background-image: url("../../Images/module-menu-right.png"); background-position: 1px 3px; } diff --git a/typo3/sysext/t3skin/images/arrows/module-menu-down.png b/typo3/sysext/form/Resources/Public/Images/module-menu-down.png similarity index 100% rename from typo3/sysext/t3skin/images/arrows/module-menu-down.png rename to typo3/sysext/form/Resources/Public/Images/module-menu-down.png diff --git a/typo3/sysext/t3skin/images/arrows/module-menu-right.png b/typo3/sysext/form/Resources/Public/Images/module-menu-right.png similarity index 100% rename from typo3/sysext/t3skin/images/arrows/module-menu-right.png rename to typo3/sysext/form/Resources/Public/Images/module-menu-right.png diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css index 0d180660d096..5b3277582134 100644 --- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css +++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css @@ -9880,31 +9880,31 @@ ul.typo3-messages { border: 1px solid #9eb2c5; } .x-dd-drop-nodrop .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-place-denied.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-place-denied.png); } .x-tree-drop-ok-append.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-new-inside.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-inside.png); } .x-tree-drop-ok-below.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-copy-below.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-below.png); } .x-tree-drop-ok-above.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-copy-above.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-above.png); } .x-tree-drop-ok-between.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-new-between.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-between.png); } .x-tree-drop-ok-append .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-into.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-into.png); } .x-tree-drop-ok-between .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-between.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-between.png); } .x-tree-drop-ok-below .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-below.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-below.png); } .x-tree-drop-ok-above .x-dd-drop-icon { - background-image: url(../../../../t3skin/images/icons/apps/pagetree-drag-move-above.png); + background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-above.png); } #typo3-pagetree .x-tree-node .x-tree-drag-insert-below, .x-tree-node div.x-tree-drag-insert-below, diff --git a/typo3/sysext/t3skin/images/icons/apps/filetree-folder-default.png b/typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-default.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/filetree-folder-default.png rename to typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-default.png diff --git a/typo3/sysext/t3skin/images/icons/apps/filetree-folder-opened.png b/typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-opened.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/filetree-folder-opened.png rename to typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-opened.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-copy-above.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-above.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-copy-above.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-above.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-copy-below.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-below.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-copy-below.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-below.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-above.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-above.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-above.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-above.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-below.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-below.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-below.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-below.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-between.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-between.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-between.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-between.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-into.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-into.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-move-into.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-into.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-new-between.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-between.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-new-between.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-between.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-new-inside.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-inside.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-new-inside.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-inside.png diff --git a/typo3/sysext/t3skin/images/icons/apps/pagetree-drag-place-denied.png b/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-place-denied.png similarity index 100% rename from typo3/sysext/t3skin/images/icons/apps/pagetree-drag-place-denied.png rename to typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-place-denied.png diff --git a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css index 7edeaf3e61be..888104aa6d4e 100644 --- a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css +++ b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css @@ -1225,7 +1225,7 @@ td.x-grid3-hd-over, td.x-grid3-hd-menu-open { } .x-tree-node-expanded .x-tree-node-icon{ - background-image:url(../images/icons/apps/filetree-folder-opened.png); + background-image:url(../Resources/Public/Images/filetree-folder-opened.png); } .x-tree-node-leaf .x-tree-node-icon{ @@ -1233,7 +1233,7 @@ td.x-grid3-hd-over, td.x-grid3-hd-menu-open { } .x-tree-node-collapsed .x-tree-node-icon{ - background-image:url(../images/icons/apps/filetree-folder-default.png); + background-image:url(../Resources/Public/Images/filetree-folder-default.png); } .x-tree-node-loading .x-tree-node-icon{ -- GitLab