git-svn-id: http://xe-core.googlecode.com/svn/trunk@1861 201d5d3c-b55e-5fd7-737f-ddc643e51545

This commit is contained in:
zero 2007-07-04 05:45:16 +00:00
parent be2471b75d
commit e53edbf87f
2 changed files with 13 additions and 4 deletions

View file

@ -47,9 +47,18 @@
$output = $oWidget->proc($args);
}
if($args->style) {
$args->style = preg_replace("/height([^;]*);/i","",$args->style);
$output = sprintf("<div style=\"%s\">%s</div>", $args->style, $output);
if($args->widget_fix_width == 'Y') {
$style = "";
$style .= sprintf("%s:%spx;", "width", trim($args->widget_width));
$style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left);
if($args->widget_position) {
$style .= sprintf("%s:%s;", "float", trim($args->widget_position));
$output = sprintf('<div style="%s">%s</div>',$style, $output);
} else {
$style .= "float:left;";
$output = sprintf('<div class="clear"></div><div style="%s">%s</div>',$style, $output);
}
}
if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;

View file

@ -46,7 +46,7 @@
$style .= sprintf("%s:%spx;", "width", trim($vars->widget_width));
$style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $vars->widget_margin_top, $vars->widget_margin_right,$vars->widget_margin_bottom,$vars->widget_margin_left);
if($vars->widget_position) $style .= sprintf("%s:%s;", "float", trim($vars->widget_position));
else $style .= "clear:left;";
else $style .= "float:left;";
$widget_code = sprintf('<img src="%s" class="zbxe_widget_output" widget="%s" %s style="%s" />', $blank_img_path, $widget, implode(' ',$attribute), $style);
} else {
$widget_code = sprintf('<img width="100" height="100" src="%s" class="zbxe_widget_output" widget="%s" %s />', $blank_img_path, $widget, implode(' ',$attribute));