- using the styles for htmlarea for the readonly version (div) too

- autom. adding px to numerical width and height values for the table
This commit is contained in:
Ralf Becker 2005-05-20 16:49:54 +00:00
parent 5b1996b1f1
commit c59b7c4aca

View File

@ -588,6 +588,8 @@
$this->html->formatOptions($grid['span'],',class')/*TEST-RB,$no_table_tr*/); $this->html->formatOptions($grid['span'],',class')/*TEST-RB,$no_table_tr*/);
if (!empty($overflow)) { if (!empty($overflow)) {
if (is_numeric($height)) $height .= 'px';
if (is_numeric($width)) $width .= 'px';
$div_style=' style="'.($width?"width: $width; ":'').($height ? "height: $height; ":'')."overflow: $overflow;\""; $div_style=' style="'.($width?"width: $width; ":'').($height ? "height: $height; ":'')."overflow: $overflow;\"";
$html = $this->html->div($html,$div_style); $html = $this->html->div($html,$div_style);
} }
@ -805,9 +807,10 @@
} }
break; break;
case 'htmlarea': // Multiline formatted Text Input, size: [inline styles for the widget][,plugins (comma-sep.)] case 'htmlarea': // Multiline formatted Text Input, size: [inline styles for the widget][,plugins (comma-sep.)]
list($styles,$plugins) = explode(',',$cell_options,2);
if (!$styles) $styles = 'width: 100%; min-width: 500px; height: 300px;'; // default HTMLarea style in html-class
if (!$readonly) if (!$readonly)
{ {
list($styles,$plugins) = explode(',',$cell_options,2);
$html .= $this->html->htmlarea($form_name,$value,$styles,'',$plugins,'',true); $html .= $this->html->htmlarea($form_name,$value,$styles,'',$plugins,'',true);
$GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = array( $GLOBALS['phpgw_info']['etemplate']['to_process'][$form_name] = array(
'type' => $cell['type'], 'type' => $cell['type'],