From 62619acd118541a91a3da0d22c702a9b2132d54d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 16 Nov 2007 11:23:34 +0000
Subject: [PATCH] =?UTF-8?q?=EC=9C=84=EC=A0=AF=EC=9D=98=20=EB=B0=B0?=
 =?UTF-8?q?=EA=B2=BD=EC=A7=80=EC=A0=95=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=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/sandbox@2986 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/widget/tpl/js/widget.js      | 10 ++++++----
 modules/widget/tpl/widget_layer.html |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index aed3f4f08..91bdb33aa 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -407,8 +407,8 @@ function doShowWidgetSizeSetup(px, py, obj) {
     if(pos) {
         pos = pos.split(' ');
         if(pos.length==2) {
-            formObj.background_x.value = _getInt(pos[0]);
-            formObj.background_y.value = _getInt(pos[1]);
+            formObj.background_x.value = pos[0];
+            formObj.background_y.value = pos[1];
         }
     }
 
@@ -477,7 +477,9 @@ function doApplyWidgetSize(fo_obj) {
         selectedSizeWidget.style.borderLeft = _getBorderStyle(fo_obj.border_left_color, fo_obj.border_left_thick, fo_obj.border_left_type);
         selectedSizeWidget.style.borderRight = _getBorderStyle(fo_obj.border_right_color, fo_obj.border_right_thick, fo_obj.border_right_type);
 
-        selectedSizeWidget.style.backgroundColor = _getBGColorStyle(fo_obj.background_color);
+        if(!fo_obj.background_color.value || fo_obj.background_color.value == 'transparent') selectedSizeWidget.style.backgroundColor = 'transparent';
+        else selectedSizeWidget.style.backgroundColor = _getBGColorStyle(fo_obj.background_color);
+
         var image_url = fo_obj.background_image_url.value;
         if(image_url) selectedSizeWidget.style.backgroundImage = "url("+image_url+")";
         else selectedSizeWidget.style.backgroundImage = 'none';
@@ -490,7 +492,7 @@ function doApplyWidgetSize(fo_obj) {
         }
 
 
-        selectedSizeWidget.style.backgroundPosition = _getInt(fo_obj.background_x.value)+'px'+ ' '+_getInt(fo_obj.background_y.value)+'px';
+        selectedSizeWidget.style.backgroundPosition = fo_obj.background_x.value+' '+fo_obj.background_y.value;
 
         var borderObj = selectedSizeWidget.firstChild;
         while(borderObj) {
diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html
index 8fdb099f0..5b3669774 100644
--- a/modules/widget/tpl/widget_layer.html
+++ b/modules/widget/tpl/widget_layer.html
@@ -69,7 +69,7 @@
         </tr>
         <tr>
             <th class="line">{$lang->cmd_widget_background_color}</th>
-            <td colspan="2" class="line">#<input type="text" name="background_color" value="" class="color_input" maxlength="6"/></td>
+            <td colspan="2" class="line"><input type="text" name="background_color" value="" class="input" /></td>
         </tr>
         <tr>
             <th class="line">{$lang->cmd_widget_background_image_url}</th>
@@ -84,10 +84,10 @@
                     </select>
                 </div>
                 <div>
-                    {$lang->cmd_widget_background_image_x} : <input type="text" name="background_x" value="0" class="small_input" />px 
+                    {$lang->cmd_widget_background_image_x} : <input type="text" name="background_x" value="0" class="input" />
                 </div>
                 <div>
-                    {$lang->cmd_widget_background_image_y} : <input type="text" name="background_y" value="0" class="small_input" />px 
+                    {$lang->cmd_widget_background_image_y} : <input type="text" name="background_y" value="0" class="input" />
                 </div>
             </td>
         </tr>