Fixed issue #16458: Rename table be_layouts to backend_layout
authorIngo Renner <ingo.renner@typo3.org>
Fri, 21 Jan 2011 11:19:19 +0000 (11:19 +0000)
committerIngo Renner <ingo.renner@typo3.org>
Fri, 21 Jan 2011 11:19:19 +0000 (11:19 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10200 709f56b5-9817-0410-a4d7-c38de5d9e867

39 files changed:
ChangeLog
t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_page.php
t3lib/stddb/tables.sql
t3lib/stddb/tbl_pages.php
typo3/sysext/cms/classes/class.tx_cms_backendlayout.php
typo3/sysext/cms/ext_tables.php
typo3/sysext/cms/ext_tables.sql
typo3/sysext/cms/layout/class.tx_cms_layout.php
typo3/sysext/cms/layout/res/grideditor.js
typo3/sysext/cms/layout/wizard_backend_layout.php [new file with mode: 0644]
typo3/sysext/cms/layout/wizard_backend_layout.png [new file with mode: 0644]
typo3/sysext/cms/layout/wizard_be_layout.php [deleted file]
typo3/sysext/cms/layout/wizard_be_layout.png [deleted file]
typo3/sysext/cms/locallang_tca.xml
typo3/sysext/cms/tbl_cms.php
typo3/sysext/context_help/locallang_csh_pages.xml
typo3/sysext/t3skin/icons/gfx/i/backend_layout.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__f.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__h.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__hf.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__hfu.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__ht.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__htu.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__hu.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__t.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__u.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/backend_layout__x.gif [new file with mode: 0644]
typo3/sysext/t3skin/icons/gfx/i/be_layout.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__f.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__h.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__hf.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__hfu.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__ht.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__htu.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__hu.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__t.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__u.gif [deleted file]
typo3/sysext/t3skin/icons/gfx/i/be_layout__x.gif [deleted file]

index 20ce650..c4a5752 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,8 @@
 
 2011-01-21  Ingo Renner  <ingo@typo3.org>
 
-       * Fixed issues #17188: [reports] change status update task to use the new default From email address setting from config_default
+       * Fixed issue #17188: [reports] change status update task to use the new default From email address setting from config_default
+       * Fixed issue #16458: Rename table be_layouts to backend_layout
 
 2011-01-21  Francois Suter  <francois.suter@typo3.org>
 
index 9677967..6f8b350 100644 (file)
@@ -605,7 +605,7 @@ final class t3lib_BEfunc {
                                        't3ver_state' => $val['t3ver_state'],
                                        't3ver_swapmode' => $val['t3ver_swapmode'],
                                        't3ver_stage' => $val['t3ver_stage'],
-                                       'be_layout_next_level' => $val['be_layout_next_level']
+                                       'backend_layout_next_level' => $val['backend_layout_next_level']
                                );
                                if (isset($val['_ORIG_pid'])) {
                                        $output[$c]['_ORIG_pid'] = $val['_ORIG_pid'];
@@ -633,7 +633,7 @@ final class t3lib_BEfunc {
                        $row = $getPageForRootline_cache[$ident];
                } else {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                               'pid,uid,title,TSconfig,is_siteroot,storage_pid,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_swapmode,t3ver_stage,be_layout_next_level',
+                               'pid,uid,title,TSconfig,is_siteroot,storage_pid,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_swapmode,t3ver_stage,backend_layout_next_level',
                                'pages',
                                        'uid=' . intval($uid) . ' ' .
                                                        self::deleteClause('pages') . ' ' .
index a81bc61..a6489c8 100644 (file)
@@ -618,7 +618,7 @@ class t3lib_pageSelect {
                }
 
                        // Initialize:
-               $selFields = t3lib_div::uniqueList('pid,uid,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_swapmode,title,alias,nav_title,media,layout,hidden,starttime,endtime,fe_group,extendToSubpages,doktype,TSconfig,storage_pid,is_siteroot,mount_pid,mount_pid_ol,fe_login_mode,be_layout_next_level,' . $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields']);
+               $selFields = t3lib_div::uniqueList('pid,uid,t3ver_oid,t3ver_wsid,t3ver_state,t3ver_swapmode,title,alias,nav_title,media,layout,hidden,starttime,endtime,fe_group,extendToSubpages,doktype,TSconfig,storage_pid,is_siteroot,mount_pid,mount_pid_ol,fe_login_mode,backend_layout_next_level,' . $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields']);
                $this->error_getRootLine = '';
                $this->error_getRootLine_failPid = 0;
 
@@ -1442,4 +1442,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_page.php']);
 }
 
-?>
\ No newline at end of file
+?>
index a64faef..621dac8 100644 (file)
@@ -215,8 +215,8 @@ CREATE TABLE pages (
   alias varchar(32) DEFAULT '' NOT NULL,
   l18n_cfg tinyint(4) DEFAULT '0' NOT NULL,
   fe_login_mode tinyint(4) DEFAULT '0' NOT NULL,
-  be_layout int(10) DEFAULT '0' NOT NULL,
-  be_layout_next_level int(10) DEFAULT '0' NOT NULL,
+  backend_layout int(10) DEFAULT '0' NOT NULL,
+  backend_layout_next_level int(10) DEFAULT '0' NOT NULL,
   PRIMARY KEY (uid),
   KEY t3ver_oid (t3ver_oid,t3ver_wsid),
   KEY parent (pid,sorting,deleted,hidden),
index 396eabf..9b321de 100644 (file)
@@ -6,7 +6,7 @@ if (!defined('TYPO3_MODE')) {
 $TCA['pages'] = array(
        'ctrl' => $TCA['pages']['ctrl'],
        'interface' => array(
-               'showRecordFieldList' => 'doktype,title,alias,hidden,starttime,endtime,fe_group,url,target,no_cache,shortcut,keywords,description,abstract,newUntil,lastUpdated,cache_timeout,be_layout,be_layout_next_level',
+               'showRecordFieldList' => 'doktype,title,alias,hidden,starttime,endtime,fe_group,url,target,no_cache,shortcut,keywords,description,abstract,newUntil,lastUpdated,cache_timeout,backend_layout,backend_layout_next_level',
                'maxDBListItems' => 30,
                'maxSingleDBListItems' => 50,
        ),
@@ -725,16 +725,16 @@ $TCA['pages'] = array(
                                ),
                        ),
                ),
-               'be_layout' => array(
+               'backend_layout' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.be_layout',
+                       'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.backend_layout',
                        'config' => array(
                                'type' => 'select',
-                               'foreign_table' => 'be_layouts',
-                               'foreign_table_where' => 'AND ( ( ###PAGE_TSCONFIG_ID### = 0 AND ###STORAGE_PID### = 0 ) OR ( be_layouts.pid = ###PAGE_TSCONFIG_ID### OR be_layouts.pid = ###STORAGE_PID### ) ) AND be_layouts.hidden = 0',
+                               'foreign_table' => 'backend_layout',
+                               'foreign_table_where' => 'AND ( ( ###PAGE_TSCONFIG_ID### = 0 AND ###STORAGE_PID### = 0 ) OR ( backend_layout.pid = ###PAGE_TSCONFIG_ID### OR backend_layout.pid = ###STORAGE_PID### ) ) AND backend_layout.hidden = 0',
                                'items' => array(
                                        array('', 0),
-                                       array('LLL:EXT:cms/locallang_tca.xml:pages.be_layout.none', -1)
+                                       array('LLL:EXT:cms/locallang_tca.xml:pages.backend_layout.none', -1)
                                ),
                                'selicon_cols' => 5,
                                'size' => 1,
@@ -742,16 +742,16 @@ $TCA['pages'] = array(
                                'default' => ''
                        )
                ),
-               'be_layout_next_level' => array(
+               'backend_layout_next_level' => array(
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.be_layout_next_level',
+                       'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.backend_layout_next_level',
                        'config' => array(
                                'type' => 'select',
-                               'foreign_table' => 'be_layouts',
-                               'foreign_table_where' => 'AND ( ( ###PAGE_TSCONFIG_ID### = 0 AND ###STORAGE_PID### = 0 ) OR ( be_layouts.pid = ###PAGE_TSCONFIG_ID### OR be_layouts.pid = ###STORAGE_PID### ) ) AND be_layouts.hidden = 0',
+                               'foreign_table' => 'backend_layout',
+                               'foreign_table_where' => 'AND ( ( ###PAGE_TSCONFIG_ID### = 0 AND ###STORAGE_PID### = 0 ) OR ( backend_layout.pid = ###PAGE_TSCONFIG_ID### OR backend_layout.pid = ###STORAGE_PID### ) ) AND backend_layout.hidden = 0',
                                'items' => array(
                                        array('', 0),
-                                       array('LLL:EXT:cms/locallang_tca.xml:pages.be_layout.none', -1)
+                                       array('LLL:EXT:cms/locallang_tca.xml:pages.backend_layout.none', -1)
                                ),
                                'selicon_cols' => 5,
                                'size' => 1,
@@ -945,7 +945,7 @@ $TCA['pages'] = array(
                        'showitem' => 'is_siteroot',
                ),
                '8' => array(
-                       'showitem' => 'be_layout_next_level'
+                       'showitem' => 'backend_layout_next_level'
                ),
                'standard' => array(
                        'showitem' => 'doktype;LLL:EXT:cms/locallang_tca.xml:pages.doktype_formlabel',
@@ -1004,7 +1004,7 @@ $TCA['pages'] = array(
                        'canNotCollapse' => 1,
                ),
                'layout' => array(
-                       'showitem' => 'layout;LLL:EXT:cms/locallang_tca.xml:pages.layout_formlabel, newUntil;LLL:EXT:cms/locallang_tca.xml:pages.newUntil_formlabel, --linebreak--, be_layout;LLL:EXT:cms/locallang_tca.xml:pages.be_layout_formlabel, be_layout_next_level;LLL:EXT:cms/locallang_tca.xml:pages.be_layout_next_level_formlabel',
+                       'showitem' => 'layout;LLL:EXT:cms/locallang_tca.xml:pages.layout_formlabel, newUntil;LLL:EXT:cms/locallang_tca.xml:pages.newUntil_formlabel, --linebreak--, backend_layout;LLL:EXT:cms/locallang_tca.xml:pages.backend_layout_formlabel, backend_layout_next_level;LLL:EXT:cms/locallang_tca.xml:pages.backend_layout_next_level_formlabel',
                        'canNotCollapse' => 1,
                ),
                'module' => array(
@@ -1080,7 +1080,7 @@ if (!t3lib_div::compat_version('4.2')) {
                        --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,
                                starttime, endtime, fe_group, extendToSubpages,
                        --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.options,
-                               TSconfig;;6;nowrap;4-4-4, storage_pid;;7, l18n_cfg, be_layout;;8,
+                               TSconfig;;6;nowrap;4-4-4, storage_pid;;7, l18n_cfg, backend_layout;;8,
                        --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
        ');
                // adding doktype 2 ("Advanced")
@@ -1094,9 +1094,9 @@ if (!t3lib_div::compat_version('4.2')) {
                        --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,
                                starttime, endtime, fe_login_mode, fe_group, extendToSubpages,
                        --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.options,
-                               TSconfig;;6;nowrap;6-6-6, storage_pid;;7, l18n_cfg, module, content_from_pid, be_layout;;8,
+                               TSconfig;;6;nowrap;6-6-6, storage_pid;;7, l18n_cfg, module, content_from_pid, backend_layout;;8,
                        --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
        ');
 }
 
-?>
\ No newline at end of file
+?>
index abeec06..cf1d69a 100644 (file)
@@ -92,17 +92,17 @@ class tx_cms_BackendLayout {
 
                for ($i = count($rootline); $i > 0; $i--) {
                        $page = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
-                               'uid, be_layout, be_layout_next_level',
+                               'uid, backend_layout, backend_layout_next_level',
                                'pages',
                                'uid=' . intval($rootline[$i]['uid'])
                        );
 
-                       if (intval($page['be_layout_next_level']) > 0 && $page['uid'] != $id) {
-                               $backendLayoutUid = intval($page['be_layout_next_level']);
+                       if (intval($page['backend_layout_next_level']) > 0 && $page['uid'] != $id) {
+                               $backendLayoutUid = intval($page['backend_layout_next_level']);
                                break;
                        } else {
-                               if (intval($page['be_layout']) > 0) {
-                                       $backendLayoutUid = intval($page['be_layout']);
+                               if (intval($page['backend_layout']) > 0) {
+                                       $backendLayoutUid = intval($page['backend_layout']);
                                        break;
                                }
                        }
@@ -112,7 +112,7 @@ class tx_cms_BackendLayout {
                if ($backendLayoutUid) {
                        $backendLayout = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
                                '*',
-                               'be_layouts',
+                               'backend_layout',
                                'uid=' . $backendLayoutUid
                        );
 
@@ -125,8 +125,8 @@ class tx_cms_BackendLayout {
                                $backendLayout['__colPosList'] = array();
 
                                        // create items and colPosList
-                               if ($backendLayout['__config']['be_layout.'] && $backendLayout['__config']['be_layout.']['rows.']) {
-                                       foreach ($backendLayout['__config']['be_layout.']['rows.'] as $row) {
+                               if ($backendLayout['__config']['backend_layout.'] && $backendLayout['__config']['backend_layout.']['rows.']) {
+                                       foreach ($backendLayout['__config']['backend_layout.']['rows.'] as $row) {
                                                if (isset($row['columns.']) && is_array($row['columns.'])) {
                                                        foreach ($row['columns.'] as $column) {
                                                                $backendLayout['__items'][] = array(
@@ -151,4 +151,4 @@ if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/cms/cla
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/cms/classes/class.tx_cms_backendlayout.php']);
 }
 
-?>
\ No newline at end of file
+?>
index 89e01d4..4c4d2e2 100755 (executable)
@@ -24,7 +24,7 @@ if (TYPO3_MODE == 'BE') {
 
 
        // Add allowed records to pages:
-t3lib_extMgm::allowTableOnStandardPages('pages_language_overlay,tt_content,sys_template,sys_domain,be_layouts');
+t3lib_extMgm::allowTableOnStandardPages('pages_language_overlay,tt_content,sys_template,sys_domain,backend_layout');
 
 
 // ******************************************************************
@@ -259,9 +259,9 @@ $TCA['sys_template'] = array (
 // ******************************************************************
 // layouts
 // ******************************************************************
-$TCA['be_layouts'] = array (
+$TCA['backend_layout'] = array (
        'ctrl' => array (
-               'title'     => 'LLL:EXT:cms/locallang_tca.xml:be_layouts',
+               'title'     => 'LLL:EXT:cms/locallang_tca.xml:backend_layout',
                'label'     => 'title',
                'tstamp'    => 'tstamp',
                'crdate'    => 'crdate',
@@ -274,11 +274,11 @@ $TCA['be_layouts'] = array (
                        'disabled' => 'hidden',
                ),
                'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_cms.php',
-               'iconfile' => 'be_layout.gif',
+               'iconfile' => 'backend_layout.gif',
                'selicon_field' => 'icon',
                'selicon_field_path' => 'uploads/media',
                'thumbnail' => 'resources',
        )
 );
 
-?>
\ No newline at end of file
+?>
index 08994fe..ace758c 100755 (executable)
@@ -438,9 +438,9 @@ CREATE TABLE tt_content (
 );
 
 #
-# Table structure for table 'be_layouts'
+# Table structure for table 'backend_layout'
 #
-CREATE TABLE be_layouts (
+CREATE TABLE backend_layout (
   uid int(11) NOT NULL auto_increment,
   pid int(11) DEFAULT '0' NOT NULL,
   t3ver_oid int(11) DEFAULT '0' NOT NULL,
index cf1fae8..dd3ac12 100755 (executable)
@@ -398,8 +398,8 @@ class tx_cms_layout extends recordList {
         * @return mixed Uid of the backend layout record or NULL if no layout should be used
         */
        function getSelectedBackendLayoutUid($id) {
-               $page = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('be_layout', 'pages', 'uid=' . $id);
-               $backendLayoutUid = intval($page['be_layout']);
+               $page = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('backend_layout', 'pages', 'uid=' . $id);
+               $backendLayoutUid = intval($page['backend_layout']);
                if ($backendLayoutUid == -1) {
                                // if it is set to "none" - don't use any
                        $backendLayoutUid = NULL;
@@ -407,7 +407,7 @@ class tx_cms_layout extends recordList {
                                // if it not set check the rootline for a layout on next level and use this
                        $rootline = t3lib_BEfunc::BEgetRootLine($id);
                        for ($i = count($rootline) - 2; $i > 0; $i--) {
-                               $backendLayoutUid = intval($rootline[$i]['be_layout_next_level']);
+                               $backendLayoutUid = intval($rootline[$i]['backend_layout_next_level']);
                                if ($backendLayoutUid > 0) {
                                                // stop searching if a layout for "next level" is set
                                        break;
@@ -545,7 +545,7 @@ class tx_cms_layout extends recordList {
                                $out = '';
 
                                $backendLayoutUid = $this->getSelectedBackendLayoutUid($id);
-                               $backendLayoutRecord = t3lib_BEfunc::getRecord('be_layouts', intval($backendLayoutUid));
+                               $backendLayoutRecord = t3lib_BEfunc::getRecord('backend_layout', intval($backendLayoutUid));
                                $this->tt_contentConfig['showAsGrid'] = !empty($backendLayoutRecord['config']) && !$this->tt_contentConfig['languageMode'];
 
                                if (!$this->tt_contentConfig['showAsGrid']) {
@@ -589,8 +589,8 @@ class tx_cms_layout extends recordList {
                                        $grid .= '<div class="t3-gridContainer"><table border="0" cellspacing="1" cellpadding="4" width="80%" height="100%" class="t3-page-columns t3-gridTable">';
 
                                        // add colgroups
-                                       $colCount = intval($parser->setup['be_layout.']['colCount']);
-                                       $rowCount = intval($parser->setup['be_layout.']['rowCount']);
+                                       $colCount = intval($parser->setup['backend_layout.']['colCount']);
+                                       $rowCount = intval($parser->setup['backend_layout.']['rowCount']);
 
                                        $grid .= '<colgroup>';
                                        for ($i = 0; $i < $colCount; $i++) {
@@ -600,7 +600,7 @@ class tx_cms_layout extends recordList {
 
                                        // cycle through rows
                                        for ($row = 1; $row <= $rowCount; $row++) {
-                                               $rowConfig = $parser->setup['be_layout.']['rows.'][$row . '.'];
+                                               $rowConfig = $parser->setup['backend_layout.']['rows.'][$row . '.'];
                                                if (!isset($rowConfig)) {
                                                        continue;
                                                }
@@ -2744,4 +2744,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/cms/layout/class.tx_cms_layout.php']);
 }
 
-?>
\ No newline at end of file
+?>
index 679db0a..aceae39 100644 (file)
@@ -590,7 +590,7 @@ TYPO3.Backend.t3Grid = Ext.extend(Ext.Component, {
         * @return string
         */
        export2LayoutRecord: function() {
-               var result = "be_layout {\n\tcolCount = " + this.colCount + "\n\trowCount = " + this.rowCount + "\n\trows {\n";
+               var result = "backend_layout {\n\tcolCount = " + this.colCount + "\n\trowCount = " + this.rowCount + "\n\trows {\n";
                for (var row = 0; row < this.rowCount; row++) {
                        result += "\t\t" + (row + 1) + " {\n";
                        result += "\t\t\tcolumns {\n";
diff --git a/typo3/sysext/cms/layout/wizard_backend_layout.php b/typo3/sysext/cms/layout/wizard_backend_layout.php
new file mode 100644 (file)
index 0000000..df7ff53
--- /dev/null
@@ -0,0 +1,290 @@
+<?php
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 1999-2011 Kasper Sk?rh?j (kasperYYYY@typo3.com)
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  A copy is found in the textfile GPL.txt and important notices to the license
+ *  from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+/**
+ * Grid wizard
+ *
+ * $Id $
+ */
+
+require_once('conf.php');
+require($BACK_PATH . 'init.php');
+require($BACK_PATH . 'template.php');
+$LANG->includeLLFile('EXT:lang/locallang_wizards.xml');
+
+/**
+ * Script Class for grid wizard
+ *
+ * @author     T3UXW09 Team1 <modernbe@cybercraft.de>
+ * @package TYPO3
+ * @subpackage core
+ */
+class SC_wizard_backend_layout {
+
+       // GET vars:
+       var $P; // Wizard parameters, coming from TCEforms linking to the wizard.
+
+       /**
+        * document template object
+        *
+        * @var smallDoc
+        */
+       var $doc;
+       var $content; // Accumulated content.
+
+
+       /**
+        * Initialises the Class
+        *
+        * @return      void
+        */
+       function init() {
+
+
+               // Setting GET vars (used in frameset script):
+               $this->P = t3lib_div::_GP('P', 1);
+
+               //data[layouts][2][config]
+               $this->formName = $this->P['formName'];
+               $this->fieldName = $this->P['itemName'];
+               $this->md5ID = $this->P['md5ID'];
+               $uid = intval($this->P['uid']);
+
+               // Initialize document object:
+               $this->doc = t3lib_div::makeInstance('noDoc');
+               $this->doc->backPath = $GLOBALS['BACK_PATH'];
+
+               $pageRenderer = $this->doc->getPageRenderer();
+               $pageRenderer->addJsFile($GLOBALS['BACK_PATH'] . TYPO3_MOD_PATH . 'res/grideditor.js');
+               $pageRenderer->addJsInlineCode('storeData', '
+                       function storeData(data)        {
+                               if (parent.opener && parent.opener.document && parent.opener.document.' . $this->formName . ' && parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"])    {
+                                       parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"].value = data;
+                                       parent.opener.TBE_EDITOR.fieldChanged("backend_layout","' . $uid . '","config","data[backend_layout][' . $uid . '][config]");
+                               }
+                       }
+               ');
+
+               $languageLabels = array(
+                       'save' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_labelSave', 1),
+                       'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_windowTitle', 1),
+                       'name' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_labelName', 1),
+                       'column' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_labelColumn', 1),
+                       'editCell' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_editCell', 1),
+                       'mergeCell' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_mergeCell', 1),
+                       'splitCell' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_splitCell', 1),
+                       'name' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_name', 1),
+                       'column' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_column', 1),
+                       'notSet' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_notSet', 1),
+                       'nameHelp' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_nameHelp', 1),
+                       'columnHelp' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_columnHelp', 1),
+               );
+               $pageRenderer->addInlineLanguageLabelArray($languageLabels);
+
+               // select record
+               $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows($this->P['field'], $this->P['table'], 'uid=' . intval($this->P['uid']));
+               if (trim($record[0][$this->P['field']]) == '') {
+                       $t3GridData = "[[{colspan:1,rowspan:1,spanned:false,name:''}]]";
+                       $colCount = 1;
+                       $rowCount = 1;
+               } else {
+
+                       // load TS parser
+                       $parser = t3lib_div::makeInstance('t3lib_TSparser');
+                       $parser->parse($record[0][$this->P['field']]);
+                       $data = $parser->setup['backend_layout.'];
+                       $t3GridData = '[';
+                       $colCount = $data['colCount'];
+                       $rowCount = $data['rowCount'];
+                       $dataRows = $data['rows.'];
+                       $spannedMatrix = array();
+
+                       for ($i = 1; $i <= $rowCount; $i++) {
+                               $rowString = '';
+                               for ($j = 1; $j <= $colCount; $j++) {
+                                       if ($j == 1) {
+                                               $row = array_shift($dataRows);
+                                               $columns = $row['columns.'];
+                                               $rowString = '[';
+                                               $cells = array();
+                                       }
+                                       if (!$spannedMatrix[$i][$j]) {
+                                               if (is_array($columns) && count($columns)) {
+                                                       $column = array_shift($columns);
+                                                       $cellString = '{';
+                                                       $cellData = array();
+                                                       if (isset($column['colspan'])) {
+                                                               $cellData[] = 'colspan:' . intval($column['colspan']);
+                                                               if (isset($column['rowspan'])) {
+                                                                       for ($spanRow = 0; $spanRow < intval($column['rowspan']); $spanRow++) {
+                                                                               for ($spanColumn = 0; $spanColumn < intval($column['colspan']); $spanColumn++) {
+                                                                                       $spannedMatrix[$i + $spanRow][$j + $spanColumn] = 1;
+                                                                               }
+                                                                       }
+                                                               } else {
+                                                                       for ($spanColumn = 0; $spanColumn < intval($column['colspan']); $spanColumn++) {
+                                                                               $spannedMatrix[$i][$j + $spanColumn] = 1;
+                                                                       }
+                                                               }
+                                                       } else {
+                                                               $cellData[] = 'colspan:1';
+                                                               if (isset($column['rowspan'])) {
+                                                                       for ($spanRow = 0; $spanRow < intval($column['rowspan']); $spanRow++) {
+                                                                               $spannedMatrix[$i + $spanRow][$j] = 1;
+                                                                       }
+                                                               }
+                                                       }
+                                                       if (isset($column['rowspan'])) {
+                                                               $cellData[] = 'rowspan:' . intval($column['rowspan']);
+                                                       } else {
+                                                               $cellData[] = 'rowspan:1';
+                                                       }
+                                                       if (isset($column['name'])) {
+                                                               $cellData[] = 'name:\'' . $column['name'] . '\'';
+                                                       }
+                                                       if (isset($column['colPos'])) {
+                                                               $cellData[] = 'column:' . $column['colPos'];
+                                                       }
+
+                                                       $cellString .= implode(',', $cellData) . '}';
+                                                       $cells[] = $cellString;
+
+                                               }
+                                       } else {
+                                               $cells[] = '{colspan:1,rowspan:1,spanned:1}';
+                                       }
+                               }
+                               $rowString .= implode(',', $cells);
+                               if ($rowString) {
+                                       $rowString .= ']';
+                               }
+                               $rows[] = $rowString;
+                               ksort($spannedMatrix[$i]);
+                       }
+
+                       $t3GridData .= implode(',', $rows) . ']';
+
+
+               }
+
+               $pageRenderer->enableExtJSQuickTips();
+
+               $pageRenderer->addExtOnReadyCode('
+                       t3Grid = new TYPO3.Backend.t3Grid({
+                               data: ' . $t3GridData . ',
+                               colCount: ' . $colCount . ',
+                               rowCount: ' . $rowCount . ',
+                               targetElement: \'editor\'
+                       });
+                       t3Grid.drawTable();
+                       ');
+
+
+               $this->doc->styleSheetFile_post = TYPO3_MOD_PATH . 'res/grideditor.css';
+               $this->doc->styleSheetFile2 = 'sysext/t3skin/stylesheets/extjs/xtheme-t3skin.css';
+       }
+
+       /**
+        * Main Method, rendering either colorpicker or frameset depending on ->showPicker
+        *
+        * @return      void
+        */
+       function main() {
+
+               $content .= '<a href="#" title="' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', TRUE) . '" onclick="storeData(t3Grid.export2LayoutRecord());return true;">' .
+                        t3lib_iconWorks::getSpriteIcon('actions-document-save') . '</a>';
+
+               $content .= '<a href="#" title="' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseDoc', TRUE) . '" onclick="storeData(t3Grid.export2LayoutRecord());window.close();return true;">' .
+                       t3lib_iconWorks::getSpriteIcon('actions-document-save-close') . '</a>';
+
+               $content .= '<a href="#" title="'.
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE) . '" onclick="window.close();return true;">' .
+                        t3lib_iconWorks::getSpriteIcon('actions-document-close') . '</a>';
+
+
+               $content .= $this->doc->spacer(10);
+
+               $content .= '
+               <table border="0" width="100%" height="100%" id="outer_container">
+                       <tr>
+                               <td class="editor_cell">
+                                       <div id="editor">
+                                       </div>
+                               </td>
+                               <td width="20" valign="center">
+                                       <a class="addCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_addColumn') . '" onclick="t3Grid.addColumn(); t3Grid.drawTable(\'editor\');">
+                                               <img src="res/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="res/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="res/t3grid-tabledown.png" border="0" />
+                                       </a>
+                                       <a class="removeCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_removeRow') . '" onclick="t3Grid.removeRow(); t3Grid.drawTable(\'editor\');">
+                                               <img src="res/t3grid-tableup.png" border="0" />
+                                       </a>
+                               </td>
+                       </tr>
+               </table>
+               ';
+
+               $this->content = $content;
+       }
+
+       /**
+        * Returnes the sourcecode to the browser
+        *
+        * @return      void
+        */
+       function printContent() {
+               echo $this->doc->render(
+                       'Grid wizard',
+                       $this->content
+               );
+       }
+
+}
+
+
+if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/wizard_backend_layout.php'])) {
+       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/wizard_backend_layout.php']);
+}
+
+
+// Make instance:
+$SOBE = t3lib_div::makeInstance('SC_wizard_backend_layout');
+$SOBE->init();
+$SOBE->main();
+$SOBE->printContent();
+
+?>
diff --git a/typo3/sysext/cms/layout/wizard_backend_layout.png b/typo3/sysext/cms/layout/wizard_backend_layout.png
new file mode 100644 (file)
index 0000000..aa9d37a
Binary files /dev/null and b/typo3/sysext/cms/layout/wizard_backend_layout.png differ
diff --git a/typo3/sysext/cms/layout/wizard_be_layout.php b/typo3/sysext/cms/layout/wizard_be_layout.php
deleted file mode 100644 (file)
index 1f1cecb..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 1999-2011 Kasper Sk?rh?j (kasperYYYY@typo3.com)
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Grid wizard
- *
- * $Id $
- */
-
-require_once('conf.php');
-require($BACK_PATH . 'init.php');
-require($BACK_PATH . 'template.php');
-$LANG->includeLLFile('EXT:lang/locallang_wizards.xml');
-
-/**
- * Script Class for grid wizard
- *
- * @author     T3UXW09 Team1 <modernbe@cybercraft.de>
- * @package TYPO3
- * @subpackage core
- */
-class SC_wizard_be_layout {
-
-       // GET vars:
-       var $P; // Wizard parameters, coming from TCEforms linking to the wizard.
-
-       /**
-        * document template object
-        *
-        * @var smallDoc
-        */
-       var $doc;
-       var $content; // Accumulated content.
-
-
-       /**
-        * Initialises the Class
-        *
-        * @return      void
-        */
-       function init() {
-
-
-               // Setting GET vars (used in frameset script):
-               $this->P = t3lib_div::_GP('P', 1);
-
-               //data[layouts][2][config]
-               $this->formName = $this->P['formName'];
-               $this->fieldName = $this->P['itemName'];
-               $this->md5ID = $this->P['md5ID'];
-               $uid = intval($this->P['uid']);
-
-               // Initialize document object:
-               $this->doc = t3lib_div::makeInstance('noDoc');
-               $this->doc->backPath = $GLOBALS['BACK_PATH'];
-
-               $pageRenderer = $this->doc->getPageRenderer();
-               $pageRenderer->addJsFile($GLOBALS['BACK_PATH'] . TYPO3_MOD_PATH . 'res/grideditor.js');
-               $pageRenderer->addJsInlineCode('storeData', '
-                       function storeData(data)        {
-                               if (parent.opener && parent.opener.document && parent.opener.document.' . $this->formName . ' && parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"])    {
-                                       parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"].value = data;
-                                       parent.opener.TBE_EDITOR.fieldChanged("be_layouts","' . $uid . '","config","data[be_layouts][' . $uid . '][config]");
-                               }
-                       }
-               ');
-
-               $languageLabels = array(
-                       'save' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_labelSave', 1),
-                       'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_windowTitle', 1),
-                       'name' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_labelName', 1),
-                       'column' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_labelColumn', 1),
-                       'editCell' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_editCell', 1),
-                       'mergeCell' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_mergeCell', 1),
-                       'splitCell' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_splitCell', 1),
-                       'name' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_name', 1),
-                       'column' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_column', 1),
-                       'notSet' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_notSet', 1),
-                       'nameHelp' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_nameHelp', 1),
-                       'columnHelp' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_wizards.xml:grid_columnHelp', 1),
-               );
-               $pageRenderer->addInlineLanguageLabelArray($languageLabels);
-
-               // select record
-               $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows($this->P['field'], $this->P['table'], 'uid=' . intval($this->P['uid']));
-               if (trim($record[0][$this->P['field']]) == '') {
-                       $t3GridData = "[[{colspan:1,rowspan:1,spanned:false,name:''}]]";
-                       $colCount = 1;
-                       $rowCount = 1;
-               } else {
-
-                       // load TS parser
-                       $parser = t3lib_div::makeInstance('t3lib_TSparser');
-                       $parser->parse($record[0][$this->P['field']]);
-                       $data = $parser->setup['be_layout.'];
-                       $t3GridData = '[';
-                       $colCount = $data['colCount'];
-                       $rowCount = $data['rowCount'];
-                       $dataRows = $data['rows.'];
-                       $spannedMatrix = array();
-
-                       for ($i = 1; $i <= $rowCount; $i++) {
-                               $rowString = '';
-                               for ($j = 1; $j <= $colCount; $j++) {
-                                       if ($j == 1) {
-                                               $row = array_shift($dataRows);
-                                               $columns = $row['columns.'];
-                                               $rowString = '[';
-                                               $cells = array();
-                                       }
-                                       if (!$spannedMatrix[$i][$j]) {
-                                               if (is_array($columns) && count($columns)) {
-                                                       $column = array_shift($columns);
-                                                       $cellString = '{';
-                                                       $cellData = array();
-                                                       if (isset($column['colspan'])) {
-                                                               $cellData[] = 'colspan:' . intval($column['colspan']);
-                                                               if (isset($column['rowspan'])) {
-                                                                       for ($spanRow = 0; $spanRow < intval($column['rowspan']); $spanRow++) {
-                                                                               for ($spanColumn = 0; $spanColumn < intval($column['colspan']); $spanColumn++) {
-                                                                                       $spannedMatrix[$i + $spanRow][$j + $spanColumn] = 1;
-                                                                               }
-                                                                       }
-                                                               } else {
-                                                                       for ($spanColumn = 0; $spanColumn < intval($column['colspan']); $spanColumn++) {
-                                                                               $spannedMatrix[$i][$j + $spanColumn] = 1;
-                                                                       }
-                                                               }
-                                                       } else {
-                                                               $cellData[] = 'colspan:1';
-                                                               if (isset($column['rowspan'])) {
-                                                                       for ($spanRow = 0; $spanRow < intval($column['rowspan']); $spanRow++) {
-                                                                               $spannedMatrix[$i + $spanRow][$j] = 1;
-                                                                       }
-                                                               }
-                                                       }
-                                                       if (isset($column['rowspan'])) {
-                                                               $cellData[] = 'rowspan:' . intval($column['rowspan']);
-                                                       } else {
-                                                               $cellData[] = 'rowspan:1';
-                                                       }
-                                                       if (isset($column['name'])) {
-                                                               $cellData[] = 'name:\'' . $column['name'] . '\'';
-                                                       }
-                                                       if (isset($column['colPos'])) {
-                                                               $cellData[] = 'column:' . $column['colPos'];
-                                                       }
-
-                                                       $cellString .= implode(',', $cellData) . '}';
-                                                       $cells[] = $cellString;
-
-                                               }
-                                       } else {
-                                               $cells[] = '{colspan:1,rowspan:1,spanned:1}';
-                                       }
-                               }
-                               $rowString .= implode(',', $cells);
-                               if ($rowString) {
-                                       $rowString .= ']';
-                               }
-                               $rows[] = $rowString;
-                               ksort($spannedMatrix[$i]);
-                       }
-
-                       $t3GridData .= implode(',', $rows) . ']';
-
-
-               }
-
-               $pageRenderer->enableExtJSQuickTips();
-
-               $pageRenderer->addExtOnReadyCode('
-                       t3Grid = new TYPO3.Backend.t3Grid({
-                               data: ' . $t3GridData . ',
-                               colCount: ' . $colCount . ',
-                               rowCount: ' . $rowCount . ',
-                               targetElement: \'editor\'
-                       });
-                       t3Grid.drawTable();
-                       ');
-
-
-               $this->doc->styleSheetFile_post = TYPO3_MOD_PATH . 'res/grideditor.css';
-               $this->doc->styleSheetFile2 = 'sysext/t3skin/stylesheets/extjs/xtheme-t3skin.css';
-       }
-
-       /**
-        * Main Method, rendering either colorpicker or frameset depending on ->showPicker
-        *
-        * @return      void
-        */
-       function main() {
-
-               $content .= '<a href="#" title="' .
-                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', TRUE) . '" onclick="storeData(t3Grid.export2LayoutRecord());return true;">' .
-                        t3lib_iconWorks::getSpriteIcon('actions-document-save') . '</a>';
-
-               $content .= '<a href="#" title="' .
-                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveCloseDoc', TRUE) . '" onclick="storeData(t3Grid.export2LayoutRecord());window.close();return true;">' .
-                       t3lib_iconWorks::getSpriteIcon('actions-document-save-close') . '</a>';
-
-               $content .= '<a href="#" title="'.
-                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.closeDoc', TRUE) . '" onclick="window.close();return true;">' .
-                        t3lib_iconWorks::getSpriteIcon('actions-document-close') . '</a>';
-
-
-               $content .= $this->doc->spacer(10);
-
-               $content .= '
-               <table border="0" width="100%" height="100%" id="outer_container">
-                       <tr>
-                               <td class="editor_cell">
-                                       <div id="editor">
-                                       </div>
-                               </td>
-                               <td width="20" valign="center">
-                                       <a class="addCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_addColumn') . '" onclick="t3Grid.addColumn(); t3Grid.drawTable(\'editor\');">
-                                               <img src="res/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="res/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="res/t3grid-tabledown.png" border="0" />
-                                       </a>
-                                       <a class="removeCol" href="#" title="' . $GLOBALS['LANG']->getLL('grid_removeRow') . '" onclick="t3Grid.removeRow(); t3Grid.drawTable(\'editor\');">
-                                               <img src="res/t3grid-tableup.png" border="0" />
-                                       </a>
-                               </td>
-                       </tr>
-               </table>
-               ';
-
-               $this->content = $content;
-       }
-
-       /**
-        * Returnes the sourcecode to the browser
-        *
-        * @return      void
-        */
-       function printContent() {
-               echo $this->doc->render(
-                       'Grid wizard',
-                       $this->content
-               );
-       }
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/wizard_be_layout.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/wizard_be_layout.php']);
-}
-
-
-// Make instance:
-$SOBE = t3lib_div::makeInstance('SC_wizard_be_layout');
-$SOBE->init();
-$SOBE->main();
-$SOBE->printContent();
-
-?>
diff --git a/typo3/sysext/cms/layout/wizard_be_layout.png b/typo3/sysext/cms/layout/wizard_be_layout.png
deleted file mode 100644 (file)
index aa9d37a..0000000
Binary files a/typo3/sysext/cms/layout/wizard_be_layout.png and /dev/null differ
index d04e42f..6a84cbf 100755 (executable)
                        <label index="pages.fe_login_mode.enableAgain">Re-Enable login</label>
                        <label index="pages.storage_pid_formlabel">Page</label>
                        <label index="pages.TSconfig_formlabel">Page TSConfig</label>
-                       <label index="pages.be_layout_formlabel">Backend Layout (this page only)</label>
-                       <label index="pages.be_layout_next_level_formlabel">Backend Layout (subpages of this page)</label>
-                       <label index="pages.be_layout.none">None</label>
+                       <label index="pages.backend_layout_formlabel">Backend Layout (this page only)</label>
+                       <label index="pages.backend_layout_next_level_formlabel">Backend Layout (subpages of this page)</label>
+                       <label index="pages.backend_layout.none">None</label>
                        <label index="tt_content">Pagecontent</label>
                        <label index="fe_users">Website User</label>
                        <label index="fe_users.username">Username:</label>
                        <label index="sys_template.tabs.options">Options</label>
                        <label index="sys_template.tabs.access">Access</label>
                        <label index="pages_language_overlay">Alternative Page Language</label>
-                       <label index="be_layouts">Backend Layouts</label>
-                       <label index="be_layouts.title">Title</label>
-                       <label index="be_layouts.description">Description</label>
-                       <label index="be_layouts.config">Config</label>
-                       <label index="be_layouts.wizard">Wizard</label>
-                       <label index="be_layouts.icon">Icon</label>
+                       <label index="backend_layout">Backend Layout</label>
+                       <label index="backend_layout.title">Title</label>
+                       <label index="backend_layout.description">Description</label>
+                       <label index="backend_layout.config">Config</label>
+                       <label index="backend_layout.wizard">Wizard</label>
+                       <label index="backend_layout.icon">Icon</label>
                </languageKey>
        </data>
 </T3locallang>
index 6eb6f67..e9ff178 100755 (executable)
@@ -1134,19 +1134,19 @@ $TCA['sys_template'] = array(
 );
 
 // ******************************************************************
-// be_layouts
+// backend_layout
 // ******************************************************************
 /**
  * @todo add lll
  */
-$TCA['be_layouts'] = array(
-       'ctrl' => $TCA['be_layouts']['ctrl'],
+$TCA['backend_layout'] = array(
+       'ctrl' => $TCA['backend_layout']['ctrl'],
        'interface' => array(
                'showRecordFieldList' => 'title,config,description,hidden,icon'
        ),
        'columns' => array(
                'title' => array(
-                       'label' => 'LLL:EXT:cms/locallang_tca.xml:be_layouts.title',
+                       'label' => 'LLL:EXT:cms/locallang_tca.xml:backend_layout.title',
                        'config' => array(
                                'type' => 'input',
                                'size' => '25',
@@ -1155,7 +1155,7 @@ $TCA['be_layouts'] = array(
                        )
                ),
                'description' => array(
-                       'label' => 'LLL:EXT:cms/locallang_tca.xml:be_layouts.description',
+                       'label' => 'LLL:EXT:cms/locallang_tca.xml:backend_layout.description',
                        'config' => array(
                                'type' => 'text',
                                'rows' => '5',
@@ -1163,7 +1163,7 @@ $TCA['be_layouts'] = array(
                        )
                ),
                'config' => array(
-                       'label' => 'LLL:EXT:cms/locallang_tca.xml:be_layouts.config',
+                       'label' => 'LLL:EXT:cms/locallang_tca.xml:backend_layout.config',
                        'config' => array(
                                'type' => 'text',
                                'rows' => '5',
@@ -1171,10 +1171,10 @@ $TCA['be_layouts'] = array(
                                'wizards' => Array(
                                        '_PADDING' => 4,
                                        0 => Array(
-                                               'title' => 'LLL:EXT:cms/locallang_tca.xml:be_layouts.wizard',
+                                               'title' => 'LLL:EXT:cms/locallang_tca.xml:backend_layout.wizard',
                                                'type' => 'popup',
-                                               'icon' => t3lib_extMgm::extRelPath('cms').'layout/wizard_be_layout.png',
-                                               'script' => t3lib_extMgm::extRelPath('cms').'layout/wizard_be_layout.php',
+                                               'icon' => t3lib_extMgm::extRelPath('cms').'layout/wizard_backend_layout.png',
+                                               'script' => t3lib_extMgm::extRelPath('cms').'layout/wizard_backend_layout.php',
                                                'JSopenParams' => 'height=800,width=800,status=0,menubar=0,scrollbars=0',
                                        ),
                                ),
@@ -1189,7 +1189,7 @@ $TCA['be_layouts'] = array(
                        )
                ),
                'icon' => array(
-                       'label' => 'LLL:EXT:cms/locallang_tca.xml:be_layouts.icon',
+                       'label' => 'LLL:EXT:cms/locallang_tca.xml:backend_layout.icon',
                        'exclude' => 1,
                        'config' => array(
                                'type' => 'group',
@@ -1210,4 +1210,4 @@ $TCA['be_layouts'] = array(
 );
 
 
-?>
\ No newline at end of file
+?>
index fd3f416..fcf7498 100755 (executable)
@@ -152,8 +152,8 @@ By default, TYPO3 lets you create a content element of type &lt;i&gt;Sitemap&lt;
 
 Of course, admins can make custom use of this field via their TypoScript templates.</label>
                        <label index="_abstract.seeAlso">pages:description</label>
-                       <label index="be_layout.description">Select a backend layout for this particular page only.</label>
-                       <label index="be_layout.details">If you have created any additional backend layouts you can select them here to have the page module render the columns of this page with the selected layout.
+                       <label index="backend_layout.description">Select a backend layout for this particular page only.</label>
+                       <label index="backend_layout.details">If you have created any additional backend layouts you can select them here to have the page module render the columns of this page with the selected layout.
 
 Usually it will reflect the frontend layout in a way so that you will be able to recognize easily to which area of the page the content belongs.
 
@@ -163,9 +163,9 @@ If you select a layout or "none", it will override any settings that might have
 
 The selection is &lt;b&gt;NOT&lt;/b&gt; inherited automatically by subpages - use &lt;b&gt;Backend Layout (subpages of this page)&lt;/b&gt; if you want to achieve this.
 </label>
-                       <label index="_be_layout.seeAlso">pages:be_layout_next_level</label>
-                       <label index="be_layout_next_level.description">Select a backend layout for all subpages of this page.</label>
-                       <label index="be_layout_next_level.details">If you have created any additional backend layouts you can select them here to have the page module render the columns of the subpages of this page with the selected layout.
+                       <label index="_backend_layout.seeAlso">pages:backend_layout_next_level</label>
+                       <label index="backend_layout_next_level.description">Select a backend layout for all subpages of this page.</label>
+                       <label index="backend_layout_next_level.details">If you have created any additional backend layouts you can select them here to have the page module render the columns of the subpages of this page with the selected layout.
 
 Usually it will reflect the frontend layout in a way so that you will be able to recognize easily to which area of the page the content belongs.
 
@@ -174,7 +174,7 @@ You can select nothing or "none" to get the default column view of the page modu
 If you select a layout or "none", it will override any settings that might have been inherited from pages in the rootline of the current page.
 
 The selection is inherited automatically by all subpages - so you don't have to set it seperately for each of them.</label>
-                       <label index="_be_layout_next_level.seeAlso">pages:be_layout</label>
+                       <label index="_backend_layout_next_level.seeAlso">pages:backend_layout</label>
                        <label index="newUntil.description">Enter the 'expiry date' of the page.</label>
                        <label index="newUntil.details">The 'expiry date' of the page has no effect on the display of the webpage. This value is rather for internal use meant as a reminder of the date when the content of this page should be revised. So if the content of the page will be outdated at a certain point in time, you could set this value to that approximate date.
 In order to obtain an overview of the expiry dates of pages, use the 'Pagetree overview' in the 'Web&gt;Info' module.</label>
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout.gif
new file mode 100644 (file)
index 0000000..a8729f4
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__f.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__f.gif
new file mode 100644 (file)
index 0000000..d40ee08
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__f.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__h.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__h.gif
new file mode 100644 (file)
index 0000000..d3f4905
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__h.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hf.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hf.gif
new file mode 100644 (file)
index 0000000..1ead842
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hf.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hfu.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hfu.gif
new file mode 100644 (file)
index 0000000..b845a42
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hfu.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__ht.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__ht.gif
new file mode 100644 (file)
index 0000000..13c414a
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__ht.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__htu.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__htu.gif
new file mode 100644 (file)
index 0000000..1dac536
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__htu.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hu.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hu.gif
new file mode 100644 (file)
index 0000000..0264425
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__hu.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__t.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__t.gif
new file mode 100644 (file)
index 0000000..3580650
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__t.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__u.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__u.gif
new file mode 100644 (file)
index 0000000..5b44587
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__u.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/backend_layout__x.gif b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__x.gif
new file mode 100644 (file)
index 0000000..c367122
Binary files /dev/null and b/typo3/sysext/t3skin/icons/gfx/i/backend_layout__x.gif differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout.gif
deleted file mode 100644 (file)
index a8729f4..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__f.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__f.gif
deleted file mode 100644 (file)
index d40ee08..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__f.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__h.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__h.gif
deleted file mode 100644 (file)
index d3f4905..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__h.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__hf.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__hf.gif
deleted file mode 100644 (file)
index 1ead842..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__hf.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__hfu.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__hfu.gif
deleted file mode 100644 (file)
index b845a42..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__hfu.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__ht.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__ht.gif
deleted file mode 100644 (file)
index 13c414a..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__ht.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__htu.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__htu.gif
deleted file mode 100644 (file)
index 1dac536..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__htu.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__hu.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__hu.gif
deleted file mode 100644 (file)
index 0264425..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__hu.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__t.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__t.gif
deleted file mode 100644 (file)
index 3580650..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__t.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__u.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__u.gif
deleted file mode 100644 (file)
index 5b44587..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__u.gif and /dev/null differ
diff --git a/typo3/sysext/t3skin/icons/gfx/i/be_layout__x.gif b/typo3/sysext/t3skin/icons/gfx/i/be_layout__x.gif
deleted file mode 100644 (file)
index c367122..0000000
Binary files a/typo3/sysext/t3skin/icons/gfx/i/be_layout__x.gif and /dev/null differ