Skip to content
Snippets Groups Projects
Commit 0207ddc6 authored by Wouter Wolters's avatar Wouter Wolters Committed by Benjamin Mack
Browse files

[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: default avatarMichael Oehlhof <typo3@oehlhof.de>
Tested-by: default avatarMichael Oehlhof <typo3@oehlhof.de>
Reviewed-by: default avatarBenjamin Mack <benni@typo3.org>
Tested-by: default avatarBenjamin Mack <benni@typo3.org>
parent 11e6bea6
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 33 deletions
typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
+ 7
− 7
View file @ 0207ddc6
......@@ -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>
......
typo3/sysext/cms/layout/res/grideditor.css → typo3/sysext/backend/Resources/Public/Css/grideditor.css
+ 26
− 26
View file @ 0207ddc6
......@@ -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;
}
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