2006-05-18 Ernesto Baschny <ernst@cron-it.de>
authorErnesto Baschny <ernst@cron-it.de>
Thu, 18 May 2006 12:00:26 +0000 (12:00 +0000)
committerErnesto Baschny <ernst@cron-it.de>
Thu, 18 May 2006 12:00:26 +0000 (12:00 +0000)
* Fixed bug #3138: Alignment of text in css_styled_content's Text w/ images (nowrap) was wrong (Firefox)

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

ChangeLog
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
typo3/sysext/css_styled_content/static/setup.txt

index 719ffec..77af1b1 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-18  Ernesto Baschny  <ernst@cron-it.de>
+
+       * Fixed bug #3138: Alignment of text in css_styled_content's Text w/ images (nowrap) was wrong (Firefox)
+
 2006-05-15  Ingmar Schlecht  <ingmar@typo3.org>
 
        * Fixed bug #1374: Mailforms didn't work with <input type="image"> submit buttons. (Thanks to Thorsten Kahler and Rupert Germann!)      
index 553415f..7969fcf 100755 (executable)
@@ -645,6 +645,7 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
                        // How much space will the image-block occupy?
                $imageBlockWidth = max($imageRowsFinalWidths)+ $colspacing*($colCount-1) + $colCount*$border*($borderSpace+$borderThickness)*2;
                $GLOBALS['TSFE']->register['rowwidth'] = $imageBlockWidth;
+               $GLOBALS['TSFE']->register['rowWidthPlusTextMargin'] = $imageBlockWidth + $textMargin;
 
                        // noRows is in fact just one ROW, with the amount of columns specified, where the images are placed in.
                        // noCols is just one COLUMN, each images placed side by side on each row
index 26796c1..1617338 100755 (executable)
@@ -1308,11 +1308,11 @@ tt_content.image.20 {
                18.value = <div class="csc-textpic csc-textpic-intext-left###CLASSES###">###IMAGES######TEXT###</div>
                # intext-right-nowrap
                25 = TEXT
-               25.value = <div class="csc-textpic csc-textpic-intext-right-nowrap###CLASSES###">###IMAGES###<div style="margin-right:{register:rowwidth}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
+               25.value = <div class="csc-textpic csc-textpic-intext-right-nowrap###CLASSES###">###IMAGES###<div style="margin-right:{register:rowWidthPlusTextMargin}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
                25.insertData = 1
                # intext-left-nowrap
                26 = TEXT
-               26.value = <div class="csc-textpic csc-textpic-intext-left-nowrap###CLASSES###">###IMAGES###<div style="margin-left:{register:rowwidth}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
+               26.value = <div class="csc-textpic csc-textpic-intext-left-nowrap###CLASSES###">###IMAGES###<div style="margin-left:{register:rowWidthPlusTextMargin}px;">###TEXT###</div></div><div class="csc-textpic-clear"><!-- --></div>
                26.insertData = 1
        }