Added feature #15504: Description of TYPO3_CONF settings should allow HTML markup...
authorSteffen Kamper <info@sk-typo3.de>
Mon, 23 Aug 2010 22:32:59 +0000 (22:32 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Mon, 23 Aug 2010 22:32:59 +0000 (22:32 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8656 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/install/Resources/Public/Stylesheets/general.css
typo3/sysext/install/mod/class.tx_install.php

index 5ed8b41..227fb0c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 2010-08-23 Steffen Kamper  <steffen@typo3.org>
 
 
 2010-08-23 Steffen Kamper  <steffen@typo3.org>
 
+       * Added feature #15504: Description of TYPO3_CONF settings should allow HTML markup for readability (Thanks to Ernesto Baschny)
        * Fixed bug #15092: Ajax loaded items of inline records are encoded twice (Thanks to Martin Borer)
        * Fixed bug #15536: DebugConsole - Compat with ExtJS 3.2.x (broken resize event and double split bar) (Thanks to Stefan Galinski)
        * Updated sysexts version numbers and md5 values
        * Fixed bug #15092: Ajax loaded items of inline records are encoded twice (Thanks to Martin Borer)
        * Fixed bug #15536: DebugConsole - Compat with ExtJS 3.2.x (broken resize event and double split bar) (Thanks to Stefan Galinski)
        * Updated sysexts version numbers and md5 values
index ee7a61c..7b8d539 100644 (file)
@@ -5,7 +5,16 @@ body {
        font: 62.8% Verdana, Arial, Helvetica, sans-serif;
 }
 
        font: 62.8% Verdana, Arial, Helvetica, sans-serif;
 }
 
-p, form, fieldset, h3, h4, h5, h6, dl { 
+pre {
+       font-size: 1.2em;
+       margin: 1em 1em;
+}
+
+code {
+       font-size: 1.2em;
+}
+
+p, form, fieldset, h3, h4, h5, h6, dl {
        margin: 1em 0 1em 0;
 }
 
        margin: 1em 0 1em 0;
 }
 
@@ -22,6 +31,14 @@ ol {
        list-style: decimal;
 }
 
        list-style: decimal;
 }
 
+dl dd {
+       margin-left: 1.5em;
+}
+
+fieldset li p {
+       margin-top: 0;
+}
+
 h2 {
        margin: 2.5em 0 1.7em 0.8em;
        color: #585858;
 h2 {
        margin: 2.5em 0 1.7em 0.8em;
        color: #585858;
index 812b933..6b5f9e5 100755 (executable)
@@ -1964,8 +1964,8 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                $textLineSubpart = '';
 
                                                $description = trim($commentArr[1][$k][$vk]);
                                                $textLineSubpart = '';
 
                                                $description = trim($commentArr[1][$k][$vk]);
-                                               $isTextarea = preg_match('/^string \(textarea\)/i',$description) ? TRUE : FALSE;
-                                               $doNotRender = preg_match('/^string \(exclude\)/i', $description) ? TRUE : FALSE;
+                                               $isTextarea = preg_match('/^(<.*?>)?string \(textarea\)/i', $description) ? TRUE : FALSE;
+                                               $doNotRender = preg_match('/^(<.*?>)?string \(exclude\)/i', $description) ? TRUE : FALSE;
 
                                                if (!is_array($value) && !$doNotRender && ($this->checkForBadString($value) || $isTextarea)) {
                                                        $k2 = '['.$vk.']';
 
                                                if (!is_array($value) && !$doNotRender && ($this->checkForBadString($value) || $isTextarea)) {
                                                        $k2 = '['.$vk.']';
@@ -1988,7 +1988,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                                        TRUE,
                                                                        FALSE
                                                                );
                                                                        TRUE,
                                                                        FALSE
                                                                );
-                                                       } elseif (preg_match('/^boolean/i',$description)) {
+                                                       } elseif (preg_match('/^(<.*?>)?boolean/i', $description)) {
                                                                        // Get the subpart for a checkbox
                                                                $booleanSubpart = t3lib_parsehtml::getSubpart($template, '###BOOLEAN###');
                                                                        // Define the markers content
                                                                        // Get the subpart for a checkbox
                                                                $booleanSubpart = t3lib_parsehtml::getSubpart($template, '###BOOLEAN###');
                                                                        // Define the markers content
@@ -2044,7 +2044,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                        );
                                                                // Define the markers content
                                                        $markers = array(
                                                        );
                                                                // Define the markers content
                                                        $markers = array(
-                                                               'description' => htmlspecialchars($description),
+                                                               'description' => $description,
                                                                'key' => '[' . $k . '][' . $vk . ']',
                                                                'label' => htmlspecialchars(t3lib_div::fixed_lgd_cs($value, 40))
                                                        );
                                                                'key' => '[' . $k . '][' . $vk . ']',
                                                                'label' => htmlspecialchars(t3lib_div::fixed_lgd_cs($value, 40))
                                                        );