[TASK] Remove CSS Styled Content option of image position items 98/43398/2
authorBenjamin Mack <benni@typo3.org>
Thu, 17 Sep 2015 13:32:24 +0000 (15:32 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Sat, 19 Sep 2015 15:02:27 +0000 (17:02 +0200)
The extension configuration option that disables the disabling of
the superfluous options on CType=image (like "Left of Text") is
removed in favor of always disabling these options, which is the default
anyway.

Integrators can still override this change in their own PageTSconfig.

Resolves: #69920
Releases: master
Change-Id: Ibb9662be3cee5eed6e03dff3d4f7e758449c2591
Reviewed-on: http://review.typo3.org/43398
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/css_styled_content/Resources/Private/Language/locallang_em.xlf [deleted file]
typo3/sysext/css_styled_content/ext_conf_template.txt [deleted file]
typo3/sysext/css_styled_content/ext_localconf.php

diff --git a/typo3/sysext/css_styled_content/Resources/Private/Language/locallang_em.xlf b/typo3/sysext/css_styled_content/Resources/Private/Language/locallang_em.xlf
deleted file mode 100644 (file)
index c9a2643..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814810" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="css_styled_content">
-               <header/>
-               <body>
-                       <trans-unit id="cssstyledcontent.config.setPageTSconfig">
-                               <source>Set PageTSconfig by default: If you are going to use this extension by default in this database then set this flag. In that case you don't need to set specific PageTSconfig for each page, which you have to do otherwise!</source>
-                       </trans-unit>
-                       <trans-unit id="cssstyledcontent.config.removePositionTypes">
-                               <source>Remove unused positioning types: This will disable the image positions that make no sense on CType=image (it leaves just "above left", "center" and "right").</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/css_styled_content/ext_conf_template.txt b/typo3/sysext/css_styled_content/ext_conf_template.txt
deleted file mode 100644 (file)
index 0658049..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-  # cat=basic/enable; type=boolean; label=LLL:EXT:css_styled_content/Resources/Private/Language/locallang_em.xlf:cssstyledcontent.config.removePositionTypes
-removePositionTypes = 1
index 7554715..ac4fb93 100644 (file)
@@ -1,13 +1,10 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-// unserializing the configuration so we can use it here:
-$_EXTCONF = unserialize($_EXTCONF);
-if (!$_EXTCONF || $_EXTCONF['removePositionTypes']) {
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
-               TCEFORM.tt_content.imageorient.types.image.removeItems = 8,9,10,17,18,25,26
-       ');
-}
+// Disable image positions that make no sense on CType=image (it leaves just "above left", "center" and "right")
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
+       TCEFORM.tt_content.imageorient.types.image.removeItems = 8,9,10,17,18,25,26
+');
 
 // Mark the delivered TypoScript templates as "content rendering template" (providing the hooks of "static template 43" = content (default))
 $GLOBALS['TYPO3_CONF_VARS']['FE']['contentRenderingTemplates'][] = 'cssstyledcontent/static/';