diff --git a/NEWS.md b/NEWS.md
index 3c08ee25cfc85057e4af946cabfadc1b4bad1be0..4da0999b6f60b7ef9b29dbac5ba101e21e3dda42 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -55,6 +55,24 @@ The options array (the fourth parameter) now can contain a 'label' to set a
custom label for each category field.
+#### CSS Styled Content
+
+* Removed deprecated DB fields
+
+There are 5 DB fields in tt_content that haven't been used in TYPO3 since
+version 4.0, and were disabled by default when using CSS Styled Content.
+
+The DB fields are
+ - text_align
+ - text_face
+ - text_size
+ - text_color
+ - text_properties
+
+The fields have been removed from the code and are removed by the
+DB Compare after upgrading.
+
+
#### Caching
* Caching behaviour by newly introduced grouping parameter
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index c1fa20ba2d6ceb18ccb19bf1f6ac07c668eda1f8..1508481c607688e7e510b47e539123cef236d128 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -1282,7 +1282,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
case 'image':
if ($row['CType'] == 'text' || $row['CType'] == 'textpic') {
if ($row['bodytext']) {
- $this->getProcessedValue('tt_content', 'text_align,text_face,text_size,text_color,text_properties', $row, $infoArr);
$out .= $this->linkEditContent($this->renderText($row['bodytext']), $row) . '<br />';
}
}
diff --git a/typo3/sysext/cms/locallang_ttc.xlf b/typo3/sysext/cms/locallang_ttc.xlf
index 4ef1ec0892d949928190809e2e0d4630602f5f2a..e087da3f7c141f39e94e012be3d20665a62a6e49 100644
--- a/typo3/sysext/cms/locallang_ttc.xlf
+++ b/typo3/sysext/cms/locallang_ttc.xlf
@@ -168,120 +168,6 @@
<trans-unit id="header_layout.I.6" xml:space="preserve">
<source>Hidden</source>
</trans-unit>
- <trans-unit id="text_align" xml:space="preserve">
- <source>Align:</source>
- </trans-unit>
- <trans-unit id="text_align_formlabel" xml:space="preserve">
- <source>Text Alignment</source>
- </trans-unit>
- <trans-unit id="text_align.I.1" xml:space="preserve">
- <source>Center</source>
- </trans-unit>
- <trans-unit id="text_align.I.2" xml:space="preserve">
- <source>Right</source>
- </trans-unit>
- <trans-unit id="text_align.I.3" xml:space="preserve">
- <source>Left</source>
- </trans-unit>
- <trans-unit id="text_face" xml:space="preserve">
- <source>Fontface:</source>
- </trans-unit>
- <trans-unit id="text_face_formlabel" xml:space="preserve">
- <source>Text Face</source>
- </trans-unit>
- <trans-unit id="text_size" xml:space="preserve">
- <source>Size:</source>
- </trans-unit>
- <trans-unit id="text_size_formlabel" xml:space="preserve">
- <source>Text Size</source>
- </trans-unit>
- <trans-unit id="text_size.I.1" xml:space="preserve">
- <source>1: Small</source>
- </trans-unit>
- <trans-unit id="text_size.I.2" xml:space="preserve">
- <source>2: Medium</source>
- </trans-unit>
- <trans-unit id="text_size.I.3" xml:space="preserve">
- <source>3: Large</source>
- </trans-unit>
- <trans-unit id="text_size.I.4" xml:space="preserve">
- <source>4: Header 1</source>
- </trans-unit>
- <trans-unit id="text_size.I.5" xml:space="preserve">
- <source>5: Header 2</source>
- </trans-unit>
- <trans-unit id="text_size.I.6" xml:space="preserve">
- <source>Default +1</source>
- </trans-unit>
- <trans-unit id="text_size.I.7" xml:space="preserve">
- <source>Default -1</source>
- </trans-unit>
- <trans-unit id="text_color" xml:space="preserve">
- <source>Color:</source>
- </trans-unit>
- <trans-unit id="text_color_formlabel" xml:space="preserve">
- <source>Text Color</source>
- </trans-unit>
- <trans-unit id="text_color.I.1" xml:space="preserve">
- <source>Color 1</source>
- </trans-unit>
- <trans-unit id="text_color.I.2" xml:space="preserve">
- <source>Color 2</source>
- </trans-unit>
- <trans-unit id="text_color.I.3" xml:space="preserve">
- <source>None</source>
- </trans-unit>
- <trans-unit id="text_color.I.5" xml:space="preserve">
- <source>Black</source>
- </trans-unit>
- <trans-unit id="text_color.I.6" xml:space="preserve">
- <source>White</source>
- </trans-unit>
- <trans-unit id="text_color.I.7" xml:space="preserve">
- <source>Dark Gray</source>
- </trans-unit>
- <trans-unit id="text_color.I.8" xml:space="preserve">
- <source>Gray</source>
- </trans-unit>
- <trans-unit id="text_color.I.9" xml:space="preserve">
- <source>Silver</source>
- </trans-unit>
- <trans-unit id="text_color.I.10" xml:space="preserve">
- <source>Red</source>
- </trans-unit>
- <trans-unit id="text_color.I.11" xml:space="preserve">
- <source>Navy Blue</source>
- </trans-unit>
- <trans-unit id="text_color.I.12" xml:space="preserve">
- <source>Yellow</source>
- </trans-unit>
- <trans-unit id="text_color.I.13" xml:space="preserve">
- <source>Green</source>
- </trans-unit>
- <trans-unit id="text_color.I.14" xml:space="preserve">
- <source>Olive</source>
- </trans-unit>
- <trans-unit id="text_color.I.15" xml:space="preserve">
- <source>Maroon</source>
- </trans-unit>
- <trans-unit id="text_properties" xml:space="preserve">
- <source>Properties:</source>
- </trans-unit>
- <trans-unit id="text_properties_formlabel" xml:space="preserve">
- <source>Text Decoration</source>
- </trans-unit>
- <trans-unit id="text_properties.I.0" xml:space="preserve">
- <source>Bold</source>
- </trans-unit>
- <trans-unit id="text_properties.I.1" xml:space="preserve">
- <source>Italics</source>
- </trans-unit>
- <trans-unit id="text_properties.I.2" xml:space="preserve">
- <source>Underline</source>
- </trans-unit>
- <trans-unit id="text_properties.I.3" xml:space="preserve">
- <source>Uppercase</source>
- </trans-unit>
<trans-unit id="bodytext.W.RTE" xml:space="preserve">
<source>Fullscreen Rich Text Editing</source>
</trans-unit>
diff --git a/typo3/sysext/context_help/4.5/locallang_csh_ttcontent.xlf b/typo3/sysext/context_help/4.5/locallang_csh_ttcontent.xlf
index f6aca8f077e562addd1cbeebcdc791b44955c33b..fbd1a171ef3427dce7e6c92c307d2126861e7024 100644
--- a/typo3/sysext/context_help/4.5/locallang_csh_ttcontent.xlf
+++ b/typo3/sysext/context_help/4.5/locallang_csh_ttcontent.xlf
@@ -283,71 +283,6 @@ xMOD_csh_corebe:wizard_forms_wiz,
xMOD_csh_corebe:wizard_table_wiz</source>
<note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
</trans-unit>
- <trans-unit id="text_align.description" xml:space="preserve">
- <source>Aligns the body text to the left, center, or right.</source>
- </trans-unit>
- <trans-unit id="text_align.details" xml:space="preserve">
- <source>See Page Content / Fontface for comments.
-<b>Note:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_align.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_face.description" xml:space="preserve">
- <source>Select a font face family for the body text.</source>
- </trans-unit>
- <trans-unit id="text_face.details" xml:space="preserve">
- <source><strong>Notice:</strong> These options are meant for special design. The general (default) design should be configured in the template instead. Furthermore you should NOT use these options if your template implements stylesheets and are based on using styles in general.</source>
- </trans-unit>
- <trans-unit id="_text_face.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_size.description" xml:space="preserve">
- <source>Select a font size for the body text.</source>
- </trans-unit>
- <trans-unit id="text_size.details" xml:space="preserve">
- <source>See Page Content / Fontface for comments.
-<b>Note:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_size.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_color.description" xml:space="preserve">
- <source>Select a color for the body text.</source>
- </trans-unit>
- <trans-unit id="text_color.details" xml:space="preserve">
- <source>See Page Content / Fontface for comments.
-<b>Note:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_color.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_properties.description" xml:space="preserve">
- <source>Select additional font properties.</source>
- </trans-unit>
- <trans-unit id="text_properties.details" xml:space="preserve">
- <source>These options will select font properties for all the body text. However you may wish to mark only a part of the bodytext as bold or underline in which case you should use the formatting options in the Rich Text Editor. Alternatively you can use the HTML tags here:
-
-&lt;b&gt;<strong>This is bold</strong>&lt;b&gt;
-&lt;i&gt;<em>This is italics</em>&lt;i&gt;
-&lt;u&gt;<u>This is underlined</u>&lt;u&gt;
-
-See Page Content / Fontface for comments.
-<b>Note:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_properties.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
<trans-unit id="image.description" xml:space="preserve">
<source>Insert one or more images.</source>
</trans-unit>
diff --git a/typo3/sysext/context_help/locallang_csh_ttcontent.xlf b/typo3/sysext/context_help/locallang_csh_ttcontent.xlf
index dffb683b297bcc6743c30448b2ebe529daecfbf2..48770e025c1d794e53a420a8671c9c39884c878e 100644
--- a/typo3/sysext/context_help/locallang_csh_ttcontent.xlf
+++ b/typo3/sysext/context_help/locallang_csh_ttcontent.xlf
@@ -294,71 +294,6 @@ xMOD_csh_corebe:wizard_forms_wiz,
xMOD_csh_corebe:wizard_table_wiz</source>
<note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
</trans-unit>
- <trans-unit id="text_align.description" xml:space="preserve">
- <source>Places the body text to the left, centered or to the right.</source>
- </trans-unit>
- <trans-unit id="text_align.details" xml:space="preserve">
- <source>See Page content / Font face for comments.
-<b>Notice:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_align.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_face.description" xml:space="preserve">
- <source>Select a font fact family for the body text.</source>
- </trans-unit>
- <trans-unit id="text_face.details" xml:space="preserve">
- <source><strong>Notice</strong> that these options are only meant for special design. The general (default) design should be configured in the template instead. Furthermore you should NOT use these options if your template implements stylesheets and are based on using styles in general.</source>
- </trans-unit>
- <trans-unit id="_text_face.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_size.description" xml:space="preserve">
- <source>Select a font size for the body text.</source>
- </trans-unit>
- <trans-unit id="text_size.details" xml:space="preserve">
- <source>See Page content / Font face for comments.
-<b>Notice:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_size.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_color.description" xml:space="preserve">
- <source>Select a color for the body text.</source>
- </trans-unit>
- <trans-unit id="text_color.details" xml:space="preserve">
- <source>See Page content / Font face for comments.
-<b>Notice:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_color.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
- <trans-unit id="text_properties.description" xml:space="preserve">
- <source>Select additional font properties.</source>
- </trans-unit>
- <trans-unit id="text_properties.details" xml:space="preserve">
- <source>These options will select font properties for all the body text. However you may wish to mark only a part of the bodytext as bold or underline in which case you should use the formatting options in the Rich Text Editor. Alternatively you can use the HTML tags here:
-
-&lt;b&gt;<strong>This is bold</strong>&lt;b&gt;
-&lt;i&gt;<em>This is italics</em>&lt;i&gt;
-&lt;u&gt;<u>This is underlined</u>&lt;u&gt;
-
-See Page content / Font face for comments.
-<b>Notice:</b> This option is obsolete when you are using CSS for rendering.</source>
- </trans-unit>
- <trans-unit id="_text_properties.seeAlso" xml:space="preserve">
- <source>tt_content:text_face,
-tt_content:bodytext</source>
- <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note>
- </trans-unit>
<trans-unit id="image.description" xml:space="preserve">
<source>Insert one or more images.</source>
</trans-unit>
diff --git a/typo3/sysext/css_styled_content/ext_tables.php b/typo3/sysext/css_styled_content/ext_tables.php
index e7d2d011a406ee631d7fef02243f965ebb7959b8..e8b5af6a6fb1ab443497c6a6c7cea2e25656b532 100755
--- a/typo3/sysext/css_styled_content/ext_tables.php
+++ b/typo3/sysext/css_styled_content/ext_tables.php
@@ -7,7 +7,7 @@ if (!defined('TYPO3_MODE')) {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:css_styled_content/flexform_ds.xml', 'table');
$GLOBALS['TCA']['tt_content']['types']['table']['showitem'] = 'CType;;4;;1-1-1, hidden, header;;3;;2-2-2, linkToTop;;;;4-4-4,
- --div--;LLL:EXT:cms/locallang_ttc.xlf:CType.I.5, layout;;10;;3-3-3, cols, bodytext;;9;nowrap:wizards[table], text_properties, pi_flexform,
+ --div--;LLL:EXT:cms/locallang_ttc.xlf:CType.I.5, layout;;10;;3-3-3, cols, bodytext;;9;nowrap:wizards[table], pi_flexform,
--div--;LLL:EXT:cms/locallang_tca.xlf:pages.tabs.access, starttime, endtime, fe_group';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'static/', 'CSS Styled Content');
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'static/v4.5/', 'CSS Styled Content TYPO3 v4.5');
diff --git a/typo3/sysext/css_styled_content/pageTSconfig.txt b/typo3/sysext/css_styled_content/pageTSconfig.txt
index 7493e07bad35bd7e96bef8a7dce37db8bc7746ff..db898a4e020aa256de48ba6bd93597913095d2ef 100755
--- a/typo3/sysext/css_styled_content/pageTSconfig.txt
+++ b/typo3/sysext/css_styled_content/pageTSconfig.txt
@@ -2,34 +2,10 @@
# Page TSconfig for "css_styled_content"
#
# Removes obsolete type values and fields from "Content Element" table "tt_content"
-# Configures processing for the Rich Text Editor according to the rendering principles.
# ***************************************************************************************
TCEFORM.tt_content {
- text_properties.disabled=1
- text_align.disabled=1
- text_color.disabled=1
- text_face.disabled=1
- text_size.disabled=1
image_frames.disabled = 1
CType.removeItems = swfobject,qtobject,multimedia
}
-
-
-//These Settings are removed as from 4.0 because we like to keep these settings up to the RTE-Extensions
-//Have a look at EXT:rtehtmlarea to find further examples on setting up RTE-Configuration
-/*
-RTE.config.tt_content.bodytext.showButtons = table
-RTE.config.tt_content.bodytext.proc {
- overruleMode = ts_css
- allowedClasses= _
-
- # This will clean up content coming from RTE into database so that it is XHTML compatible regarding case and quotes around attributes:
- entryHTMLparser_db = 1
- entryHTMLparser_db {
- keepNonMatchedTags = 1
- xhtml_cleaning = 1
- }
-}
-*/
diff --git a/typo3/sysext/frontend/Configuration/TCA/tt_content.php b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
index c68851d770a6598798b144d43c40201af2160ad0..ba3db1c4366442355798042abc56e87be52b82ee 100644
--- a/typo3/sysext/frontend/Configuration/TCA/tt_content.php
+++ b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
@@ -506,200 +506,6 @@ return array(
)
)
),
- 'text_align' => array(
- 'exclude' => 1,
- 'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_align',
- 'config' => array(
- 'type' => 'select',
- 'items' => array(
- array(
- '',
- ''
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_align.I.1',
- 'center'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_align.I.2',
- 'right'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_align.I.3',
- 'left'
- )
- ),
- 'default' => ''
- )
- ),
- 'text_face' => array(
- 'exclude' => 1,
- 'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_face',
- 'config' => array(
- 'type' => 'select',
- 'items' => array(
- array(
- 'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
- '0'
- ),
- array(
- 'Times',
- '1'
- ),
- array(
- 'Verdana',
- '2'
- ),
- array(
- 'Arial',
- '3'
- )
- ),
- 'default' => '0'
- )
- ),
- 'text_size' => array(
- 'exclude' => 1,
- 'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_size',
- 'config' => array(
- 'type' => 'select',
- 'items' => array(
- array(
- 'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
- '0'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.1',
- '1'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.2',
- '2'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.3',
- '3'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.4',
- '4'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.5',
- '5'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.6',
- '10'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_size.I.7',
- '11'
- )
- ),
- 'default' => '0'
- )
- ),
- 'text_color' => array(
- 'exclude' => 1,
- 'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_color',
- 'config' => array(
- 'type' => 'select',
- 'items' => array(
- array(
- 'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
- '0'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.1',
- '1'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.2',
- '2'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.3',
- '200'
- ),
- array(
- '-----',
- '--div--'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.5',
- '240'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.6',
- '241'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.7',
- '242'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.8',
- '243'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.9',
- '244'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.10',
- '245'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.11',
- '246'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.12',
- '247'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.13',
- '248'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.14',
- '249'
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_color.I.15',
- '250'
- )
- ),
- 'default' => '0'
- )
- ),
- 'text_properties' => array(
- 'exclude' => 1,
- 'label' => 'LLL:EXT:cms/locallang_ttc.xlf:text_properties',
- 'config' => array(
- 'type' => 'check',
- 'items' => array(
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.0',
- ''
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.1',
- ''
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.2',
- ''
- ),
- array(
- 'LLL:EXT:cms/locallang_ttc.xlf:text_properties.I.3',
- ''
- )
- ),
- 'cols' => 4
- )
- ),
'image' => array(
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.images',
'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig('image', array(
@@ -1809,7 +1615,6 @@ return array(
rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
- --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
@@ -1825,7 +1630,6 @@ return array(
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
- --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
@@ -1852,7 +1656,6 @@ return array(
bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.bulletlist_formlabel;;nowrap,
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
- --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
@@ -1865,7 +1668,6 @@ return array(
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.table_layout;tablelayout,
- --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.textlayout;textlayout,
--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
@@ -2051,9 +1853,6 @@ return array(
'8' => array(
'showitem' => 'layout'
),
- '9' => array(
- 'showitem' => 'text_align,text_face,text_size,text_color'
- ),
'10' => array(
'showitem' => 'table_bgColor, table_border, table_cellspacing, table_cellpadding'
),
@@ -2135,10 +1934,6 @@ return array(
'showitem' => 'layout;LLL:EXT:cms/locallang_ttc.xlf:layout_formlabel, spaceBefore;LLL:EXT:cms/locallang_ttc.xlf:spaceBefore_formlabel, spaceAfter;LLL:EXT:cms/locallang_ttc.xlf:spaceAfter_formlabel, section_frame;LLL:EXT:cms/locallang_ttc.xlf:section_frame_formlabel',
'canNotCollapse' => 1
),
- 'textlayout' => array(
- 'showitem' => 'text_align;LLL:EXT:cms/locallang_ttc.xlf:text_align_formlabel, text_face;LLL:EXT:cms/locallang_ttc.xlf:text_face_formlabel, text_size;LLL:EXT:cms/locallang_ttc.xlf:text_size_formlabel, text_color;LLL:EXT:cms/locallang_ttc.xlf:text_color_formlabel, --linebreak--, text_properties;LLL:EXT:cms/locallang_ttc.xlf:text_properties_formlabel',
- 'canNotCollapse' => 1
- ),
'tablelayout' => array(
'showitem' => 'table_bgColor;LLL:EXT:cms/locallang_ttc.xlf:table_bgColor_formlabel, table_border;LLL:EXT:cms/locallang_ttc.xlf:table_border_formlabel, table_cellspacing;LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing_formlabel, table_cellpadding;LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding_formlabel',
'canNotCollapse' => 1
diff --git a/typo3/sysext/frontend/ext_tables.sql b/typo3/sysext/frontend/ext_tables.sql
index 19653641ea5d5fee0414a26425e4683fb75dc62a..6db219e42e40a311bd6cdc02fbef9a6cf3fbaa71 100644
--- a/typo3/sysext/frontend/ext_tables.sql
+++ b/typo3/sysext/frontend/ext_tables.sql
@@ -297,11 +297,6 @@ CREATE TABLE tt_content (
titleText text,
longdescURL text,
header_layout varchar(30) DEFAULT '0' NOT NULL,
- text_align varchar(6) DEFAULT '' NOT NULL,
- text_face tinyint(3) unsigned DEFAULT '0' NOT NULL,
- text_size tinyint(3) unsigned DEFAULT '0' NOT NULL,
- text_color tinyint(3) unsigned DEFAULT '0' NOT NULL,
- text_properties tinyint(3) unsigned DEFAULT '0' NOT NULL,
menu_type varchar(30) DEFAULT '0' NOT NULL,
list_type varchar(255) DEFAULT '0' NOT NULL,
table_border tinyint(3) unsigned DEFAULT '0' NOT NULL,
@@ -369,4 +364,4 @@ CREATE TABLE backend_layout (
PRIMARY KEY (uid),
KEY parent (pid),
KEY t3ver_oid (t3ver_oid,t3ver_wsid)
-);
\ No newline at end of file
+);