Bug #36541 » 36541.diff

Torben Hansen, 2012-04-26 12:28

View differences:

typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
613 613
			}
614 614
		}
615 615

  
616
			// Set the margin for image + text, no wrap always to avoid multiple stylesheets
617
		if ($accessibilityMode) {
618
			$noWrapMargin = (integer) (($maxWInText ? $maxWInText : $fiftyPercentWidthInText) +
619
				intval($this->cObj->stdWrap($conf['textMargin'],$conf['textMargin.'])));
620

  
621
			$this->addPageStyle(
622
				'.csc-textpic-intext-right-nowrap .csc-textpic-text',
623
				'margin-right: ' . $noWrapMargin . 'px;'
624
			);
625

  
626
			$this->addPageStyle(
627
				'.csc-textpic-intext-left-nowrap .csc-textpic-text',
628
				'margin-left: ' . $noWrapMargin . 'px;'
629
			);
630
		}
631

  
632 616
			// max usuable width for images (without spacers and borders)
633 617
		$netW = $maxW - $colspacing * ($colCount - 1) - $colCount * $border * ($borderThickness + $borderSpace) * 2;
634 618

  
......
785 769
		$GLOBALS['TSFE']->register['rowwidth'] = $imageBlockWidth;
786 770
		$GLOBALS['TSFE']->register['rowWidthPlusTextMargin'] = $imageBlockWidth + $textMargin;
787 771

  
772
			// Set the margin for image + text, no wrap always to avoid multiple stylesheets
773
		if ($accessibilityMode) {
774
			$noWrapMargin = $imageBlockWidth + $textMargin;
775

  
776
			$this->addPageStyle(
777
				'.csc-textpic-intext-right-nowrap .csc-textpic-text',
778
				'margin-right: ' . $noWrapMargin . 'px;'
779
			);
780

  
781
			$this->addPageStyle(
782
				'.csc-textpic-intext-left-nowrap .csc-textpic-text',
783
				'margin-left: ' . $noWrapMargin . 'px;'
784
			);
785
		}
786
		
787
		
788 788
			// noRows is in fact just one ROW, with the amount of columns specified, where the images are placed in.
789 789
			// noCols is just one COLUMN, each images placed side by side on each row
790 790
		$noRows = $this->cObj->stdWrap($conf['noRows'],$conf['noRows.']);
(1-1/2)