|
--- class.tslib_content.php 2005-06-05 16:48:37.000000000 +0200
|
|
+++ /srv/www/t3_independent/regionet/typo3_src-3.8.0/tslib/class.tslib_content.php 2005-05-24 21:57:08.000000000 +0200
|
|
@@ -1069,17 +1069,7 @@
|
|
// Table-tag is inserted
|
|
$i=$contentPosition;
|
|
$table_align = (($i==16) ? 'align="'.$align.'"' : '');
|
|
- // three variants with different inline styles are needed for alignment reasons
|
|
- if ($align=='center') {
|
|
- $tablecode = '<table'.($tableWidth?' width="'.$tableWidth.'"':'').' border="0" cellspacing="0" cellpadding="0" '.$table_align.' class="imgtext-table" style="margin: 0 auto;">'.$tablecode;
|
|
- }
|
|
- if ($align=='right') {
|
|
- $tablecode = '<table'.($tableWidth?' width="'.$tableWidth.'"':'').' border="0" cellspacing="0" cellpadding="0" '.$table_align.' class="imgtext-table" style="float: right; width: auto;">'.$tablecode;
|
|
- }
|
|
- if ($align=='left') {
|
|
- $tablecode = '<table'.($tableWidth?' width="'.$tableWidth.'"':'').' border="0" cellspacing="0" cellpadding="0" '.$table_align.' class="imgtext-table">'.$tablecode;
|
|
- }
|
|
- //$tablecode = '<table'.($tableWidth?' width="'.$tableWidth.'"':'').' border="0" cellspacing="0" cellpadding="0" '.$table_align.' class="imgtext-table">'.$tablecode;
|
|
+ $tablecode = '<table'.($tableWidth?' width="'.$tableWidth.'"':'').' border="0" cellspacing="0" cellpadding="0" '.$table_align.' class="imgtext-table">'.$tablecode;
|
|
if ($editIconsHTML) { // IF this value is not long since reset.
|
|
$tablecode.='<tr><td colspan="'.$colspan.'">'.$editIconsHTML.'</td></tr>';
|
|
$editIconsHTML='';
|
|
@@ -1092,31 +1082,12 @@
|
|
}
|
|
|
|
$spaceBelowAbove = intval($this->stdWrap($conf['spaceBelowAbove'],$conf['spaceBelowAbove.']));
|
|
- //depending on the alignment for above/below, three different variants of the enclosing div are needed with position specific classes
|
|
switch ($contentPosition) {
|
|
case '0': // above
|
|
- if ($align=='center') {
|
|
- $output= '<div class="imageblock imageorient-0" style="text-align:'.$align.';">'.$tablecode.'</div>'.$this->wrapSpace($content, $spaceBelowAbove.'|0');
|
|
- }
|
|
- if ($align=='right') {
|
|
- $output= '<div class="imageblock imageorient-1" style="text-align:'.$align.';">'.$tablecode.'<div style="clear: right;"></div></div>'.$this->wrapSpace($content, $spaceBelowAbove.'|0');
|
|
- }
|
|
- if ($align=='left') {
|
|
- $output= '<div class="imageblock imageorient-2" style="text-align:'.$align.';">'.$tablecode.'</div>'.$this->wrapSpace($content, $spaceBelowAbove.'|0');
|
|
- }
|
|
- //$output= '<div class="imageblock" style="text-align:'.$align.';">'.$tablecode.'</div>'.$this->wrapSpace($content, $spaceBelowAbove.'|0');
|
|
+ $output= '<div style="text-align:'.$align.';">'.$tablecode.'</div>'.$this->wrapSpace($content, $spaceBelowAbove.'|0');
|
|
break;
|
|
case '8': // below
|
|
- if ($align=='center') {
|
|
- $output= $this->wrapSpace($content, $spaceBelowAbove.'|0').'<div class="imageblock imageorient-0" style="text-align:'.$align.';">'.$tablecode.'</div>';
|
|
- }
|
|
- if ($align=='right') {
|
|
- $output= $this->wrapSpace($content, $spaceBelowAbove.'|0').'<div class="imageblock imageorient-1" style="text-align:'.$align.';">'.$tablecode.'<div style="clear: right;"></div></div>';
|
|
- }
|
|
- if ($align=='left') {
|
|
- $output= $this->wrapSpace($content, $spaceBelowAbove.'|0').'<div class="imageblock imageorient-2" style="text-align:'.$align.';">'.$tablecode.'</div>';
|
|
- }
|
|
- //$output= $this->wrapSpace($content, '0|'.$spaceBelowAbove).'<div style="text-align:'.$align.';">'.$tablecode.'</div>';
|
|
+ $output= $this->wrapSpace($content, '0|'.$spaceBelowAbove).'<div style="text-align:'.$align.';">'.$tablecode.'</div>';
|
|
break;
|
|
case '16': // in text
|
|
$output= $tablecode.$content;
|