From 5ceebcd3a3bd30ddc8bc1e5e8f44c052c9d639cf Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 9 Aug 2007 03:42:59 +0000
Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=90=20=EC=9C=84=EC=A0=AF=20=EC=B6=94=EA=B0=80=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/trunk@2266 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/widget/WidgetHandler.class.php | 6 ++----
 modules/widget/widget.controller.php   | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index ce11a2c7b..c079ef8b6 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -57,8 +57,6 @@
                     $style = "overflow:hidden;";
                     $style .= sprintf("%s:%s%s;", "width", $args->widget_width - $args->widget_margin_right - $args->widget_margin_left, $widget_width_type);
                     $style .= sprintf("margin-top:%dpx;margin-bottom:%dpx;", $args->widget_margin_top, $args->widget_margin_bottom);
-
-
                     $inner_style = sprintf("margin-left:%dpx;margin-right:%dpx;", $args->widget_margin_left, $args->widget_margin_right);
 
                     if($args->widget_position) {
@@ -71,7 +69,7 @@
 
                 } else {
 
-                    $style = sprintf("overflow:hidden;%s:%s%s;", "width", $args->widget_width, $widget_width_type);
+                    $style = sprintf("padding:0;overflow:hidden;%s:%s%s;", "width", $args->widget_width, $widget_width_type);
 
                     $output = sprintf('<div style="margin:%dpx %dpx %dpx %dpx;">%s</div>', $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left, $output);
 
@@ -85,7 +83,7 @@
                 }
 
             } else {
-                $output = sprintf('<div style="margin:%dpx %dpx %dpx %dpx;">%s</div>', $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left, $output);
+                $output = sprintf('<div style="margin:%dpx %dpx %dpx %dpx;padding:0;clear:both;">%s</div>', $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left, $output);
             }
 
             if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 3954add30..51e71ee20 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -54,6 +54,7 @@
                 else $style .= "float:left;";
                 $widget_code = sprintf('<img src="%s" height="100" class="zbxe_widget_output" widget="%s" %s style="%s" />', $blank_img_path, $widget, implode(' ',$attribute), $style);
             } else {
+                $style = "clear:both;";
                 $widget_code = sprintf('<img width="%s" height="100" src="%s" class="zbxe_widget_output" style="%s" widget="%s" %s />', "100%", $blank_img_path, $style, $widget, implode(' ',$attribute));
             }