Added feature #12818: Feature: border class is hardcoded [css styled content] (thank...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7254 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index e4708c7..3a06ee8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-04-08  Steffen Kamper  <info@sk-typo3.de>
 
+       * Added feature #12818: Feature: border class is hardcoded  [css styled content] (thanks to Susanne Moog)
        * Fixed bug #13693: Backend doesn't use pageRenderer methods
 
 2010-04-07  Stanislas Rolland  <typo3@sjbr.ca>

diff --git a/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php b/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
index 31fd485..72a7952 100755 (executable)
--- a/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
+++ b/typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
@@ -810,7 +810,7 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
                }
                $borderClass = '';
                if ($border)    {
-                       $borderClass = 'csc-textpic-border';
+                       $borderClass = $conf['borderClass'] ? $conf['borderClass'] : 'csc-textpic-border';
                }
 
                        // Multiple classes with all properties, to be styled in CSS

diff --git a/typo3/sysext/css_styled_content/static/constants.txt b/typo3/sysext/css_styled_content/static/constants.txt
index d88e846..5fbc165 100644 (file)
--- a/typo3/sysext/css_styled_content/static/constants.txt
+++ b/typo3/sysext/css_styled_content/static/constants.txt
@@ -67,7 +67,9 @@ styles.content.imgtext {
     # cat=content/cImage/i3; type=int+; label= Image border, padding: Padding left and right to the image, around the border.
   borderSpace = 0
     # cat=content/cImage/i4; type=string; label= Image border CSS-selector: If you want your border to apply elsewhere, change this setting. E.g. to apply to the whole image+caption, use 'DIV.csc-textpic-border DIV.csc-textpic-imagewrap .csc-textpic-image'.
-  borderSelector = DIV.csc-textpic-border DIV.csc-textpic-imagewrap .csc-textpic-image IMG, DIV.csc-textpic-border DIV.csc-textpic-single-image IMG
+  borderSelector = DIV.{$styles.content.imgtext.borderClass} DIV.csc-textpic-imagewrap .csc-textpic-image IMG, DIV.{$styles.content.imgtext.borderClass} DIV.csc-textpic-single-image IMG
+    # cat=content/cImage/i5; type=string; label= Image border class: The name of the CSS class for creating image borders
+  borderClass = csc-textpic-border  
     # cat=content/cImage/i5; type=boolean; label= Image row separation: Whether images should be rendered/wrapped in separated rows, e.g. inside a DIV.csc-textpic-imagerow element
   separateRows = 1
 }

diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index 736cb58..e0a72d1 100644 (file)
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -560,6 +560,7 @@ tt_content.image.20 {
 
        borderCol = {$styles.content.imgtext.borderColor}
        borderThick = {$styles.content.imgtext.borderThick}
+       borderClass = {$styles.content.imgtext.borderClass}
        colSpace = {$styles.content.imgtext.colSpace}
        rowSpace = {$styles.content.imgtext.rowSpace}
        textMargin = {$styles.content.imgtext.textMargin}