Index: typo3/sysext/cms/layout/wizard_be_layout.php
===================================================================
--- typo3/sysext/cms/layout/wizard_be_layout.php (revision 10120)
+++ typo3/sysext/cms/layout/wizard_backend_layout.php (revision )
@@ -42,7 +42,7 @@
* @package TYPO3
* @subpackage core
*/
-class SC_wizard_be_layout {
+class SC_wizard_backend_layout {
// GET vars:
var $P; // Wizard parameters, coming from TCEforms linking to the wizard.
@@ -83,7 +83,7 @@
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]");
+ parent.opener.TBE_EDITOR.fieldChanged("backend_layout","' . $uid . '","config","data[backend_layout][' . $uid . '][config]");
}
}
');
@@ -115,7 +115,7 @@
// load TS parser
$parser = t3lib_div::makeInstance('t3lib_TSparser');
$parser->parse($record[0][$this->P['field']]);
- $data = $parser->setup['be_layout.'];
+ $data = $parser->setup['backend_layout.'];
$t3GridData = '[';
$colCount = $data['colCount'];
$rowCount = $data['rowCount'];
@@ -276,13 +276,13 @@
}
-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']);
+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_be_layout');
+$SOBE = t3lib_div::makeInstance('SC_wizard_backend_layout');
$SOBE->init();
$SOBE->main();
$SOBE->printContent();
Index: typo3/sysext/cms/locallang_tca.xml
===================================================================
--- typo3/sysext/cms/locallang_tca.xml (revision 10080)
+++ typo3/sysext/cms/locallang_tca.xml (revision )
@@ -150,9 +150,9 @@
-
-
-
+
+
+
@@ -203,12 +203,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
Index: t3lib/class.t3lib_page.php
===================================================================
--- t3lib/class.t3lib_page.php (revision 10121)
+++ t3lib/class.t3lib_page.php (revision )
@@ -618,7 +618,7 @@
}
// 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 @@
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_page.php']);
}
-?>
\ No newline at end of file
+?>
Index: t3lib/stddb/tbl_pages.php
===================================================================
--- t3lib/stddb/tbl_pages.php (revision 10080)
+++ t3lib/stddb/tbl_pages.php (revision )
@@ -6,7 +6,7 @@
$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 @@
),
),
),
- '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 @@
'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 @@
'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 @@
'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 @@
--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 @@
--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: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php (revision 10120)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php (revision )
@@ -398,8 +398,8 @@
* @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 @@
// 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 @@
$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 @@
$grid .= '
';
// 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 .= '';
for ($i = 0; $i < $colCount; $i++) {
@@ -600,7 +600,7 @@
// 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 @@
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/cms/layout/class.tx_cms_layout.php']);
}
-?>
\ No newline at end of file
+?>
Index: typo3/sysext/cms/classes/class.tx_cms_backendlayout.php
===================================================================
--- typo3/sysext/cms/classes/class.tx_cms_backendlayout.php (revision 10120)
+++ typo3/sysext/cms/classes/class.tx_cms_backendlayout.php (revision )
@@ -92,17 +92,17 @@
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 @@
if ($backendLayoutUid) {
$backendLayout = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
- 'be_layouts',
+ 'backend_layout',
'uid=' . $backendLayoutUid
);
@@ -125,8 +125,8 @@
$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 @@
include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/cms/classes/class.tx_cms_backendlayout.php']);
}
-?>
\ No newline at end of file
+?>
Index: typo3/sysext/cms/layout/res/grideditor.js
===================================================================
--- typo3/sysext/cms/layout/res/grideditor.js (revision 10043)
+++ typo3/sysext/cms/layout/res/grideditor.js (revision )
@@ -590,7 +590,7 @@
* @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";
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 10136)
+++ t3lib/class.t3lib_befunc.php (revision )
@@ -605,7 +605,7 @@
'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 @@
$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: t3lib/stddb/tables.sql
===================================================================
--- t3lib/stddb/tables.sql (revision 10068)
+++ t3lib/stddb/tables.sql (revision )
@@ -215,8 +215,8 @@
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: typo3/sysext/cms/ext_tables.php
===================================================================
--- typo3/sysext/cms/ext_tables.php (revision 9393)
+++ typo3/sysext/cms/ext_tables.php (revision )
@@ -24,7 +24,7 @@
// 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 @@
// ******************************************************************
// 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 @@
'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: typo3/sysext/context_help/locallang_csh_pages.xml
===================================================================
--- typo3/sysext/context_help/locallang_csh_pages.xml (revision 10083)
+++ typo3/sysext/context_help/locallang_csh_pages.xml (revision )
@@ -152,8 +152,8 @@
Of course, admins can make custom use of this field via their TypoScript templates.
-
-