Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php (revision 9924)
+++ t3lib/class.t3lib_tceforms.php (working copy)
@@ -1404,13 +1404,17 @@
if (!($c % $cols)) {
$item .= '
';
}
- $cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']));
+ $renderInverted = !empty($config['renderInverted']) ? TRUE : FALSE;
+ $cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']), $renderInverted);
$cBName = $PA['itemFormElName'] . '_' . $c;
$cBID = $PA['itemFormElID'] . '_' . $c;
$item .= '' .
- 'insertDefStyle('check') . ' value="1" name="' . $cBName . '"' . $cBP . $disabled . ' id="' . $cBID . '" />' .
- $this->wrapLabels(' ') .
- ' | ';
+ 'insertDefStyle('check') .
+ ' value="1" name="' . $cBName . '"' . $cBP .
+ $disabled . ' id="' . $cBID . '" ' .
+ ' />' .
+ $this->wrapLabels(' ') .
+ '';
if (($c % $cols) + 1 == $cols) {
$item .= '
';
}
@@ -1428,12 +1432,16 @@
} else {
for ($c = 0; $c < count($selItems); $c++) {
$p = $selItems[$c];
- $cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']));
+ $renderInverted = !empty($config['renderInverted']) ? TRUE : FALSE;
+ $cBP = $this->checkBoxParams($PA['itemFormElName'], $thisValue, $c, count($selItems), implode('', $PA['fieldChangeFunc']), $renderInverted);
$cBName = $PA['itemFormElName'] . '_' . $c;
$cBID = $PA['itemFormElID'] . '_' . $c;
$item .= ($c > 0 ? '
' : '') .
- 'insertDefStyle('check') . ' value="1" name="' . $cBName . '"' . $cBP . $PA['onFocus'] . $disabled . ' id="' . $cBID . '" />' .
- $this->wrapLabels('');
+ 'insertDefStyle('check') .
+ ' value="1" name="' . $cBName . '"' . $cBP .
+ $PA['onFocus'] . $disabled . ' id="' . $cBID . '" ' .
+ ' />' .
+ $this->wrapLabels('');
}
}
if (!$disabled) {
@@ -4274,12 +4279,26 @@
* @param string Additional JavaScript for the onclick handler.
* @return string The onclick attribute + possibly the checked-option set.
*/
- function checkBoxParams($itemName, $thisValue, $c, $iCount, $addFunc = '') {
- $onClick = $this->elName($itemName) . '.value=this.checked?(' . $this->elName($itemName) . '.value|' . pow(2, $c) . '):(' . $this->elName($itemName) . '.value&' . (pow(2, $iCount) - 1 - pow(2, $c)) . ');' .
- $addFunc;
- $str = ' onclick="' . htmlspecialchars($onClick) . '"' .
- (($thisValue & pow(2, $c)) ? ' checked="checked"' : '');
- return $str;
+ protected function checkBoxParams($itemName, $thisValue, $c, $iCount, $addFunc = '', $renderInverted = FALSE) {
+ $toggleOn = $this->elName($itemName) . '.value&' . (pow(2, $iCount) - 1 - pow(2, $c));
+ $toggleOff = $this->elName($itemName) . '.value|' . pow(2, $c);
+ $isChecked = ($thisValue & pow(2, $checkboxNumber));
+
+ if ($renderInverted) {
+ $isChecked = !$isChecked;
+
+ $tmp = $toggleOn;
+ $toggleOn = $toggleOff;
+ $toggleOff = $tmp;
+ }
+
+ $toggle = $this->elName($itemName) . '.value=this.checked?' .
+ '(' . $toggleOff . '):(' . $toggleOn . ');';
+
+ $onclick = ' onclick="' . htmlspecialchars($toggle . $addFunc) . '" ';
+ $checked = $isChecked ? ' checked="checked" ' : '';
+
+ return $onclick . $checked;
}
/**
Index: t3lib/stddb/tbl_pages.php
===================================================================
--- t3lib/stddb/tbl_pages.php (revision 9924)
+++ t3lib/stddb/tbl_pages.php (working copy)
@@ -55,12 +55,12 @@
'--div--',
),
array(
- 'LLL:EXT:lang/locallang_tca.php:doktype.I.1',
+ 'LLL:EXT:lang/locallang_tca.xml:doktype.I.1',
(string) t3lib_pageSelect::DOKTYPE_SYSFOLDER,
'i/sysf.gif',
),
array(
- 'LLL:EXT:lang/locallang_tca.php:doktype.I.2',
+ 'LLL:EXT:lang/locallang_tca.xml:doktype.I.2',
(string) t3lib_pageSelect::DOKTYPE_RECYCLER,
'i/recycler.gif',
),
@@ -147,7 +147,7 @@
'type' => 'check',
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.editlock_checkbox_1_formlabel',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -157,10 +157,11 @@
'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.hidden',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'default' => '1',
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.hidden_checkbox_1_formlabel',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.show',
),
),
),
@@ -199,7 +200,7 @@
'type' => 'select',
'items' => array(
array(
- 'LLL:EXT:lang/locallang_general.xml:LGL.normal',
+ 'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
'0',
),
array(
@@ -225,7 +226,7 @@
'type' => 'select',
'items' => array(
array(
- '',
+ 'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
0,
),
array(
@@ -273,7 +274,7 @@
'type' => 'check',
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.extendToSubpages_checkbox_1_formlabel',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -294,9 +295,10 @@
'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.nav_hide',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.nav_hide_checkbox_1_formlabel',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -352,7 +354,7 @@
'type' => 'select',
'items' => array(
array(
- '',
+ 'LLL:EXT:lang/locallang_core.xml:labels.automatic',
'0',
),
array(
@@ -458,9 +460,10 @@
'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_cache',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_cache_checkbox_1_formlabel',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -470,9 +473,10 @@
'label' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_search',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.no_search_checkbox_1_formlabel',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -626,7 +630,7 @@
'type' => 'check',
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_tca.xml:pages.is_siteroot_checkbox_1_formlabel'
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled'
),
),
),
@@ -695,7 +699,7 @@
'type' => 'select',
'items' => array(
array(
- '',
+ 'LLL:EXT:cms/locallang_tca.xml:pages.fe_login_mode.enable',
0,
),
array(
Index: typo3/sysext/lang/locallang_tca.xml
===================================================================
--- typo3/sysext/lang/locallang_tca.xml (revision 9924)
+++ typo3/sysext/lang/locallang_tca.xml (working copy)
@@ -89,7 +89,7 @@
-
+
Index: typo3/sysext/lang/locallang_core.xml
===================================================================
--- typo3/sysext/lang/locallang_core.xml (revision 9924)
+++ typo3/sysext/lang/locallang_core.xml (working copy)
@@ -64,6 +64,9 @@
+
+
+
@@ -80,8 +83,8 @@
-
-
+
+
Index: typo3/sysext/css_styled_content/flexform_ds.xml
===================================================================
--- typo3/sysext/css_styled_content/flexform_ds.xml (revision 9924)
+++ typo3/sysext/css_styled_content/flexform_ds.xml (working copy)
@@ -35,6 +35,12 @@
check
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
@@ -69,6 +75,13 @@
check
+ 1
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
Index: typo3/sysext/css_styled_content/locallang_db.xml
===================================================================
--- typo3/sysext/css_styled_content/locallang_db.xml (revision 9924)
+++ typo3/sysext/css_styled_content/locallang_db.xml (working copy)
@@ -7,26 +7,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: typo3/sysext/cms/flexform_media.xml
===================================================================
--- typo3/sysext/cms/flexform_media.xml (revision 9924)
+++ typo3/sysext/cms/flexform_media.xml (working copy)
@@ -42,6 +42,12 @@
check
1
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
Index: typo3/sysext/cms/locallang_ttc.xml
===================================================================
--- typo3/sysext/cms/locallang_ttc.xml (revision 9924)
+++ typo3/sysext/cms/locallang_ttc.xml (working copy)
@@ -38,14 +38,14 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -106,7 +106,7 @@
-
+
@@ -119,19 +119,16 @@
-
-
-
+
-
+
-
-
+
-
-
+
+
@@ -153,45 +150,46 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
@@ -208,21 +206,20 @@
-
-
+
+
-
-
+
-
+
-
+
-
+
@@ -239,55 +236,52 @@
-
-
+
-
-
+
-
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -308,43 +302,44 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
Index: typo3/sysext/cms/tbl_tt_content.php
===================================================================
--- typo3/sysext/cms/tbl_tt_content.php (revision 9924)
+++ typo3/sysext/cms/tbl_tt_content.php (working copy)
@@ -171,9 +171,10 @@
'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'items' => array (
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:hidden.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -273,7 +274,7 @@
'type' => 'select',
'items' => array(
array(
- 'LLL:EXT:lang/locallang_general.xml:LGL.normal',
+ 'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
'0',
),
array(
@@ -349,7 +350,7 @@
'type' => 'select',
'items' => array(
array(
- '',
+ 'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
'',
),
array(
@@ -397,7 +398,7 @@
'type' => 'select',
'items' => array(
array(
- 'LLL:EXT:lang/locallang_general.xml:LGL.normal',
+ 'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
'0',
),
array(
@@ -798,7 +799,7 @@
'type' => 'check',
'items' => array (
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:imageborder.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -808,9 +809,10 @@
'label' => 'LLL:EXT:cms/locallang_ttc.xml:image_noRows',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'items' => array (
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:image_noRows.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -844,7 +846,7 @@
'type' => 'check',
'items' => array (
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:image_zoom.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -1089,7 +1091,7 @@
'type' => 'select',
'items' => array(
array(
- '',
+ 'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
'',
),
array(
@@ -1208,7 +1210,7 @@
'type' => 'select',
'items' => array(
array(
- '',
+ 'LLL:EXT:cms/locallang_ttc.xml:recursive.I.0',
'0',
),
array(
@@ -1435,7 +1437,7 @@
'type' => 'check',
'items' => array (
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:filelink_size.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -1575,7 +1577,7 @@
'default' => 1,
'items' => array (
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:sectionIndex.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -1587,7 +1589,7 @@
'type' => 'check',
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:linkToTop.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -1597,10 +1599,11 @@
'label' => 'LLL:EXT:cms/locallang_ttc.xml:rte_enabled',
'config' => array(
'type' => 'check',
+ 'renderInverted' => TRUE,
'showIfRTE' => 1,
'items' => array(
'1' => array(
- '0' => 'LLL:EXT:cms/locallang_ttc.xml:rte_enabled.I.0',
+ '0' => 'LLL:EXT:lang/locallang_core.xml:labels.enabled',
),
),
),
@@ -1742,7 +1745,7 @@
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
- --palette--;Table layout;tablelayout,
+ --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.table_layout;tablelayout,
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textlayout;textlayout,
--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
),
@@ -1768,7 +1771,7 @@
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
- --palette--;Filelinks layout;uploadslayout,
+ --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.uploads_layout;uploadslayout,
--div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
),
'multimedia' => array(
@@ -2024,7 +2027,7 @@
'canNotCollapse' => 1,
),
'mailform' => array(
- 'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.forms, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xml:subheader.ALT.mailform_formlabel',
+ 'showitem' => 'pages;LLL:EXT:cms/locallang_ttc.xml:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xml:subheader.ALT.mailform_formlabel',
'canNotCollapse' => 1,
),
'searchform' => array(
Index: typo3/sysext/cms/locallang_tca.xml
===================================================================
--- typo3/sysext/cms/locallang_tca.xml (revision 9924)
+++ typo3/sysext/cms/locallang_tca.xml (working copy)
@@ -10,71 +10,68 @@
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
@@ -85,8 +82,7 @@
-
-
+
@@ -100,38 +96,35 @@
-
-
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
-
+
@@ -144,16 +137,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
Index: typo3/sysext/felogin/locallang_db.xml
===================================================================
--- typo3/sysext/felogin/locallang_db.xml (revision 9924)
+++ typo3/sysext/felogin/locallang_db.xml (working copy)
@@ -7,29 +7,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
@@ -40,21 +40,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: typo3/sysext/felogin/flexform.xml
===================================================================
--- typo3/sysext/felogin/flexform.xml (revision 9924)
+++ typo3/sysext/felogin/flexform.xml (working copy)
@@ -15,6 +15,12 @@
check
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
@@ -24,6 +30,12 @@
1
check
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
@@ -33,13 +45,19 @@
check
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
1
-
+
group
db
@@ -59,27 +77,27 @@
select
-
+ LLL:EXT:cms/locallang_ttc.xml:recursive.I.0
- LLL:EXT:cms/locallang_ttc.php:recursive.I.1
+ LLL:EXT:cms/locallang_ttc.xml:recursive.I.1
1
- LLL:EXT:cms/locallang_ttc.php:recursive.I.2
+ LLL:EXT:cms/locallang_ttc.xml:recursive.I.2
2
- LLL:EXT:cms/locallang_ttc.php:recursive.I.3
+ LLL:EXT:cms/locallang_ttc.xml:recursive.I.3
3
- LLL:EXT:cms/locallang_ttc.php:recursive.I.4
+ LLL:EXT:cms/locallang_ttc.xml:recursive.I.4
4
- LLL:EXT:cms/locallang_ttc.php:recursive.I.5
+ LLL:EXT:cms/locallang_ttc.xml:recursive.I.5
250
@@ -165,6 +183,12 @@
check
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+
@@ -209,12 +233,18 @@
1
-
+
check
+
+
+ LLL:EXT:lang/locallang_core.xml:labels.enabled
+ 1
+
+