From 0207ddc69d0685c3d7ffb7a64d1cea49ca61c80e Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 26 Feb 2015 22:06:57 +0100
Subject: [PATCH] [TASK] Move EXT:cms/layout/res/ files to correct location
Resolves: #65296
Releases: master
Change-Id: I08a3c8b6f89c029efacad06e13ea137560370e43
Reviewed-on: http://review.typo3.org/37293
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
---
.../BackendLayoutWizardController.php | 14 ++---
.../Resources/Public/Css}/grideditor.css | 52 +++++++++---------
.../t3grid-edit-inactive-1.png | Bin
.../t3grid-edit-inactive.png | Bin
.../BackendLayoutWizard}/t3grid-edit.png | Bin
.../t3grid-editor-down-inactive.png | Bin
.../t3grid-editor-down.png | Bin
.../t3grid-editor-left-inactive.png | Bin
.../t3grid-editor-left.png | Bin
.../t3grid-editor-right-inactive.png | Bin
.../t3grid-editor-right.png | Bin
.../t3grid-editor-up-inactive.png | Bin
.../BackendLayoutWizard}/t3grid-editor-up.png | Bin
.../t3grid-layer-icon-close.png | Bin
.../t3grid-layer-icon-help.png | Bin
.../t3grid-layer-icon-save.png | Bin
.../BackendLayoutWizard}/t3grid-tabledown.png | Bin
.../BackendLayoutWizard}/t3grid-tableleft.png | Bin
.../t3grid-tableright.png | Bin
.../BackendLayoutWizard}/t3grid-tableup.png | Bin
.../Public/JavaScript}/grideditor.js | 0
21 files changed, 33 insertions(+), 33 deletions(-)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Css}/grideditor.css (54%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-edit-inactive-1.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-edit-inactive.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-edit.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-down-inactive.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-down.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-left-inactive.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-left.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-right-inactive.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-right.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-up-inactive.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-editor-up.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-layer-icon-close.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-layer-icon-help.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-layer-icon-save.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-tabledown.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-tableleft.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-tableright.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/Images/BackendLayoutWizard}/t3grid-tableup.png (100%)
rename typo3/sysext/{cms/layout/res => backend/Resources/Public/JavaScript}/grideditor.js (100%)
diff --git a/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php b/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
index a1ab6481eb39..e591388937d5 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
@@ -67,7 +67,7 @@ class BackendLayoutWizardController {
$this->doc = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
$this->doc->backPath = $GLOBALS['BACK_PATH'];
$pageRenderer = $this->doc->getPageRenderer();
- $pageRenderer->addJsFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('cms') . 'layout/res/grideditor.js');
+ $pageRenderer->addJsFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('backend') . 'Resources/Public/JavaScript/grideditor.js');
$pageRenderer->addJsInlineCode('storeData', '
function storeData(data) {
if (parent.opener && parent.opener.document && parent.opener.document.' . $this->formName . ' && parent.opener.document.' . $this->formName . '[' . GeneralUtility::quoteJSvalue($this->fieldName) . ']) {
@@ -171,7 +171,7 @@ class BackendLayoutWizardController {
});
t3Grid.drawTable();
');
- $this->doc->styleSheetFile_post = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('cms') . 'layout/res/grideditor.css';
+ $this->doc->styleSheetFile_post = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('backend') . 'Resources/Public/Css/grideditor.css';
}
/**
@@ -180,7 +180,7 @@ class BackendLayoutWizardController {
* @return void
*/
public function main() {
- $resourcePath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('cms') . 'layout/';
+ $resourcePath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('backend') . 'Resources/Public/Images/BackendLayoutWizard/';
$content = '<a href="#" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" onclick="storeData(t3Grid.export2LayoutRecord());return true;">' . IconUtility::getSpriteIcon('actions-document-save') . '</a>';
$content .= '<a href="#" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE) . '" onclick="storeData(t3Grid.export2LayoutRecord());window.close();return true;">' . IconUtility::getSpriteIcon('actions-document-save-close') . '</a>';
$content .= '<a href="#" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE) . '" onclick="window.close();return true;">' . IconUtility::getSpriteIcon('actions-document-close') . '</a>';
@@ -194,20 +194,20 @@ class BackendLayoutWizardController {
</td>
<td width="20" valign="center">
<a class="addCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_addColumn') . '" onclick="t3Grid.addColumn(); t3Grid.drawTable(\'editor\');">
- <img src="' . $resourcePath . 'res/t3grid-tableright.png" border="0" />
+ <img src="' . $resourcePath . 't3grid-tableright.png" border="0" />
</a><br />
<a class="removeCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_removeColumn') . '" onclick="t3Grid.removeColumn(); t3Grid.drawTable(\'editor\');">
- <img src="' . $resourcePath . 'res/t3grid-tableleft.png" border="0" />
+ <img src="' . $resourcePath . 't3grid-tableleft.png" border="0" />
</a>
</td>
</tr>
<tr>
<td colspan="2" height="20" align="center">
<a class="addCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_addRow') . '" onclick="t3Grid.addRow(); t3Grid.drawTable(\'editor\');">
- <img src="' . $resourcePath . 'res/t3grid-tabledown.png" border="0" />
+ <img src="' . $resourcePath . 't3grid-tabledown.png" border="0" />
</a>
<a class="removeCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_removeRow') . '" onclick="t3Grid.removeRow(); t3Grid.drawTable(\'editor\');">
- <img src="' . $resourcePath . 'res/t3grid-tableup.png" border="0" />
+ <img src="' . $resourcePath . 't3grid-tableup.png" border="0" />
</a>
</td>
</tr>
diff --git a/typo3/sysext/cms/layout/res/grideditor.css b/typo3/sysext/backend/Resources/Public/Css/grideditor.css
similarity index 54%
rename from typo3/sysext/cms/layout/res/grideditor.css
rename to typo3/sysext/backend/Resources/Public/Css/grideditor.css
index bc44cf00c56c..ce087003a4c8 100644
--- a/typo3/sysext/cms/layout/res/grideditor.css
+++ b/typo3/sysext/backend/Resources/Public/Css/grideditor.css
@@ -59,48 +59,48 @@ div.cell_container:hover {
}
.link_expand_right {
- background-image: url(t3grid-editor-right-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-right-inactive.png);
left: 46px;
top: 14px;
}
.link_expand_right:hover {
- background-image: url(t3grid-editor-right.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-right.png);
}
.link_shrink_left {
- background-image: url(t3grid-editor-left-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-left-inactive.png);
left: 0px;
top: 14px;
}
.link_shrink_left:hover {
- background-image: url(t3grid-editor-left.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-left.png);
}
.link_expand_down {
- background-image: url(t3grid-editor-down-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-down-inactive.png);
left: 14px;
top: 46px;
}
.link_expand_down:hover {
- background-image: url(t3grid-editor-down.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-down.png);
}
.link_shrink_up {
- background-image: url(t3grid-editor-up-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-up-inactive.png);
left: 14px;
top: 0px;
}
.link_shrink_up:hover {
- background-image: url(t3grid-editor-up.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-up.png);
}
.link_editor {
- background-image: url(t3grid-edit-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-edit-inactive.png);
width: 32px;
height: 32px;
left: 14px;
@@ -108,19 +108,19 @@ div.cell_container:hover {
}
.link_editor:hover {
- background-image: url(t3grid-edit.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-edit.png);
}
.question {
- background-image: url(t3grid-layer-icon-help.png) !important;
+ background-image: url(../Images/BackendLayoutWizard/t3grid-layer-icon-help.png) !important;
}
.save {
- background-image: url(t3grid-layer-icon-save.png) !important;
+ background-image: url(../Images/BackendLayoutWizard/t3grid-layer-icon-save.png) !important;
}
.cancel {
- background-image: url(t3grid-layer-icon-close.png) !important;
+ background-image: url(../Images/BackendLayoutWizard/t3grid-layer-icon-close.png) !important;
}
table#outer_container td, table#editor td {
@@ -176,48 +176,48 @@ div.cell_container:hover {
}
.link_expand_right {
- background-image: url(t3grid-editor-right-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-right-inactive.png);
left: 46px;
top: 14px;
}
.link_expand_right:hover {
- background-image: url(t3grid-editor-right.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-right.png);
}
.link_shrink_left {
- background-image: url(t3grid-editor-left-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-left-inactive.png);
left: 0px;
top: 14px;
}
.link_shrink_left:hover {
- background-image: url(t3grid-editor-left.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-left.png);
}
.link_expand_down {
- background-image: url(t3grid-editor-down-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-down-inactive.png);
left: 14px;
top: 46px;
}
.link_expand_down:hover {
- background-image: url(t3grid-editor-down.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-down.png);
}
.link_shrink_up {
- background-image: url(t3grid-editor-up-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-up-inactive.png);
left: 14px;
top: 0px;
}
.link_shrink_up:hover {
- background-image: url(t3grid-editor-up.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-editor-up.png);
}
.link_editor {
- background-image: url(t3grid-edit-inactive.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-edit-inactive.png);
width: 32px;
height: 32px;
left: 14px;
@@ -225,17 +225,17 @@ div.cell_container:hover {
}
.link_editor:hover {
- background-image: url(t3grid-edit.png);
+ background-image: url(../Images/BackendLayoutWizard/t3grid-edit.png);
}
.question {
- background-image: url(t3grid-layer-icon-help.png) !important;
+ background-image: url(../Images/BackendLayoutWizard/t3grid-layer-icon-help.png) !important;
}
.save {
- background-image: url(t3grid-layer-icon-save.png) !important;
+ background-image: url(../Images/BackendLayoutWizard/t3grid-layer-icon-save.png) !important;
}
.cancel {
- background-image: url(t3grid-layer-icon-close.png) !important;
+ background-image: url(../Images/BackendLayoutWizard/t3grid-layer-icon-close.png) !important;
}
diff --git a/typo3/sysext/cms/layout/res/t3grid-edit-inactive-1.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-edit-inactive-1.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-edit-inactive-1.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-edit-inactive-1.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-edit-inactive.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-edit-inactive.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-edit-inactive.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-edit-inactive.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-edit.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-edit.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-edit.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-edit.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-down-inactive.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-down-inactive.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-down-inactive.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-down-inactive.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-down.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-down.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-down.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-down.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-left-inactive.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-left-inactive.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-left-inactive.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-left-inactive.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-left.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-left.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-left.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-left.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-right-inactive.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-right-inactive.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-right-inactive.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-right-inactive.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-right.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-right.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-right.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-right.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-up-inactive.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-up-inactive.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-up-inactive.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-up-inactive.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-editor-up.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-up.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-editor-up.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-editor-up.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-layer-icon-close.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-layer-icon-close.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-layer-icon-close.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-layer-icon-close.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-layer-icon-help.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-layer-icon-help.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-layer-icon-help.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-layer-icon-help.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-layer-icon-save.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-layer-icon-save.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-layer-icon-save.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-layer-icon-save.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-tabledown.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tabledown.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-tabledown.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tabledown.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-tableleft.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tableleft.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-tableleft.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tableleft.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-tableright.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tableright.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-tableright.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tableright.png
diff --git a/typo3/sysext/cms/layout/res/t3grid-tableup.png b/typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tableup.png
similarity index 100%
rename from typo3/sysext/cms/layout/res/t3grid-tableup.png
rename to typo3/sysext/backend/Resources/Public/Images/BackendLayoutWizard/t3grid-tableup.png
diff --git a/typo3/sysext/cms/layout/res/grideditor.js b/typo3/sysext/backend/Resources/Public/JavaScript/grideditor.js
similarity index 100%
rename from typo3/sysext/cms/layout/res/grideditor.js
rename to typo3/sysext/backend/Resources/Public/JavaScript/grideditor.js
--
GitLab