From 562b329ebd93300f852c9539fa5900398bfdc466 Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Fri, 3 Nov 2017 18:39:37 +0100
Subject: [PATCH] [!!!][TASK] Remove the TS option page.bodyTagMargins
The option 'page.bodyTagMargins' is rarly used and can be removed.
Any style information should be placed in a CSS file.
Resolves: #82914
Releases: master
Change-Id: Ib34ae835d0e50653b70f7ecf9573f42fbcca83a6
Reviewed-on: https://review.typo3.org/54548
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Frans Saris <franssaris@gmail.com>
Tested-by: Frans Saris <franssaris@gmail.com>
---
...moveTypoScriptOptionPagebodyTagMargins.rst | 32 +++++++++++++++++++
.../frontend/Classes/Page/PageGenerator.php | 17 +---------
.../t3editor/Resources/Private/tsref.xml | 12 -------
.../JavaScript/Mode/typoscript/typoscript.js | 3 +-
4 files changed, 34 insertions(+), 30 deletions(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Breaking-82914-RemoveTypoScriptOptionPagebodyTagMargins.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82914-RemoveTypoScriptOptionPagebodyTagMargins.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82914-RemoveTypoScriptOptionPagebodyTagMargins.rst
new file mode 100644
index 000000000000..363481c134bd
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82914-RemoveTypoScriptOptionPagebodyTagMargins.rst
@@ -0,0 +1,32 @@
+.. include:: ../../Includes.txt
+
+===============================================================
+Breaking: #82914 - Remove TypoScript option page.bodyTagMargins
+===============================================================
+
+See :issue:`82914`
+
+Description
+===========
+
+The TypoScript option `page.bodyTagMargins` has been removed.
+
+
+Impact
+======
+
+Setting this option will have no effect anymore.
+
+
+Affected Installations
+======================
+
+Any TYPO3 installation using this option.
+
+
+Migration
+=========
+
+Move the configuration into your used CSS files.
+
+.. index:: NotScanned
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index 09b520216a10..3b7d807cafd6 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -348,16 +348,8 @@ class PageGenerator
}
}
- // Stylesheets
- $style = '';
- // Setting body tag margins in CSS:
- if (isset($tsfe->pSetup['bodyTagMargins']) && $tsfe->pSetup['bodyTagMargins.']['useCSS']) {
- $margins = (int)$tsfe->pSetup['bodyTagMargins'];
- $style .= '
- BODY {margin: ' . $margins . 'px ' . $margins . 'px ' . $margins . 'px ' . $margins . 'px;}';
- }
// CSS_inlineStyle from TS
- $style .= trim($tsfe->pSetup['CSS_inlineStyle']);
+ $style = trim($tsfe->pSetup['CSS_inlineStyle']);
$style .= $tsfe->cObj->cObjGet($tsfe->pSetup['cssInline.'], 'cssInline.');
if (trim($style)) {
self::addCssToPageRenderer($style, true, 'additionalTSFEInlineStyle');
@@ -733,13 +725,6 @@ class PageGenerator
} else {
$defBT = $tsfe->pSetup['bodyTagCObject'] ? $tsfe->cObj->cObjGetSingle($tsfe->pSetup['bodyTagCObject'], $tsfe->pSetup['bodyTagCObject.'], 'bodyTagCObject') : '<body>';
$bodyTag = $tsfe->pSetup['bodyTag'] ? $tsfe->pSetup['bodyTag'] : $defBT;
- if (isset($tsfe->pSetup['bodyTagMargins'])) {
- $margins = (int)$tsfe->pSetup['bodyTagMargins'];
- if ($tsfe->pSetup['bodyTagMargins.']['useCSS']) {
- } else {
- $bodyTag = preg_replace('/>$/', '', trim($bodyTag)) . ' leftmargin="' . $margins . '" topmargin="' . $margins . '" marginwidth="' . $margins . '" marginheight="' . $margins . '">';
- }
- }
if (trim($tsfe->pSetup['bodyTagAdd'])) {
$bodyTag = preg_replace('/>$/', '', trim($bodyTag)) . ' ' . trim($tsfe->pSetup['bodyTagAdd']) . '>';
}
diff --git a/typo3/sysext/t3editor/Resources/Private/tsref.xml b/typo3/sysext/t3editor/Resources/Private/tsref.xml
index bbf1a280d890..313016c699f2 100644
--- a/typo3/sysext/t3editor/Resources/Private/tsref.xml
+++ b/typo3/sysext/t3editor/Resources/Private/tsref.xml
@@ -4849,18 +4849,6 @@ page.bodyTag = <body bgcolor="{$bgCol}">]]></description>
<property name="bodyTagCObject" type="cObj">
<description><![CDATA[This is default bodytag overridden by ".bodyTag" if that is set.]]></description>
<default><![CDATA[
-]]></default>
- </property>
- <property name="bodyTagMargins" type="int">
- <description><![CDATA[margins in the bodytag.
-
-Property:
-.useCSS = 1 (boolean) - will set a "BODY {margin: ...}" line in the in-document style declaration - for XHTML compliance.
-
-Example:
-value 4
-adds leftmargin="4" topmargin="4" marginwidth="4" marginheight="4" to the bodyTag.]]></description>
- <default><![CDATA[
]]></default>
</property>
<property name="cssInline" type="CARRAY">
diff --git a/typo3/sysext/t3editor/Resources/Public/JavaScript/Mode/typoscript/typoscript.js b/typo3/sysext/t3editor/Resources/Public/JavaScript/Mode/typoscript/typoscript.js
index 8d585a7d36e2..ed63c4b093ae 100644
--- a/typo3/sysext/t3editor/Resources/Public/JavaScript/Mode/typoscript/typoscript.js
+++ b/typo3/sysext/t3editor/Resources/Public/JavaScript/Mode/typoscript/typoscript.js
@@ -121,7 +121,6 @@
'bodyTag': kw('bodyTag'),
'bodyTagAdd': kw('bodyTagAdd'),
'bodyTagCObject': kw('bodyTagCObject'),
- 'bodyTagMargins': kw('bodyTagMargins'),
'bodytext': kw('bodytext'),
'border': kw('border'),
'borderCol': kw('borderCol'),
@@ -1825,4 +1824,4 @@
}
};
});
-});
\ No newline at end of file
+});
--
GitLab