Project

General

Profile

Bug #36541 » 36541_2.diff

Torben Hansen, 2012-04-27 10:36

View differences:

typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
}
}
// Set the margin for image + text, no wrap always to avoid multiple stylesheets
if ($accessibilityMode) {
$noWrapMargin = (integer) (($maxWInText ? $maxWInText : $fiftyPercentWidthInText) +
intval($this->cObj->stdWrap($conf['textMargin'],$conf['textMargin.'])));
$this->addPageStyle(
'.csc-textpic-intext-right-nowrap .csc-textpic-text',
'margin-right: ' . $noWrapMargin . 'px;'
);
$this->addPageStyle(
'.csc-textpic-intext-left-nowrap .csc-textpic-text',
'margin-left: ' . $noWrapMargin . 'px;'
);
}
// max usuable width for images (without spacers and borders)
$netW = $maxW - $colspacing * ($colCount - 1) - $colCount * $border * ($borderThickness + $borderSpace) * 2;
......
$GLOBALS['TSFE']->register['rowwidth'] = $imageBlockWidth;
$GLOBALS['TSFE']->register['rowWidthPlusTextMargin'] = $imageBlockWidth + $textMargin;
// Set the margin for image + text, no wrap always to avoid multiple stylesheets
if ($accessibilityMode) {
$noWrapMargin = $imageBlockWidth + $textMargin;
$this->addPageStyle(
'.csc-textpic-intext-right-nowrap-' . $this->cObj->data['uid'] . ' .csc-textpic-text',
'margin-right: ' . $noWrapMargin . 'px;'
);
$this->addPageStyle(
'.csc-textpic-intext-left-nowrap-' . $this->cObj->data['uid'] . ' .csc-textpic-text',
'margin-left: ' . $noWrapMargin . 'px;'
);
}
// 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
$noRows = $this->cObj->stdWrap($conf['noRows'],$conf['noRows.']);
typo3/sysext/css_styled_content/static/setup.txt
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######TEXT###</div>
25.value = <div class="csc-textpic csc-textpic-intext-right-nowrap csc-textpic-intext-right-nowrap-{field:uid}###CLASSES###">###IMAGES######TEXT###</div>
25.insertData = 1
# intext-left-nowrap
26 = TEXT
26.value = <div class="csc-textpic csc-textpic-intext-left-nowrap###CLASSES###">###IMAGES######TEXT###</div>
26.value = <div class="csc-textpic csc-textpic-intext-left-nowrap csc-textpic-intext-left-nowrap-{field:uid}###CLASSES###">###IMAGES######TEXT###</div>
26.insertData = 1
}
rendering {
(2-2/2)