From 58ed59a79a50f8919ac3b2105d29a93cb0357b9e Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 3 Dec 2007 05:47:32 +0000
Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=8B=9C=20=EC=9C=84=EC=A0=AF=EB=B0=95=EC=8A=A4?=
 =?UTF-8?q?=EB=8A=94=20=ED=85=8C=EB=91=90=EB=A6=AC=EB=A5=BC=20=ED=8C=8C?=
 =?UTF-8?q?=EB=9E=80=EC=83=89=EC=9C=BC=EB=A1=9C=20=ED=95=98=EA=B3=A0,=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=9D=84=20=EC=99=BC=EC=AA=BD=20=EC=83=81?=
 =?UTF-8?q?=EB=8B=A8=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=EC=8B=9C?=
 =?UTF-8?q?=ED=82=B4(=EC=9C=84=EC=A0=AF=EA=B3=BC=20=EA=B2=B9=EC=B9=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D)?=
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@3140 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/widget/WidgetHandler.class.php |  2 +-
 modules/widget/tpl/css/widget.css      |  7 +++++
 modules/widget/tpl/js/widget.js        | 38 +++++++++++++++-----------
 modules/widget/tpl/widget_layer.html   |  8 +++---
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index 48fd65729..4e576b4e9 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -73,7 +73,7 @@
                 $widget_padding_top = $args->widget_padding_top;
                 $widget_padding_bottom = $args->widget_padding_bottom;
                 if($include_info) {
-                    $tpl = sprintf('<div class="widgetOutput" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s"><div class="widgetCopy"></div><div class="widgetSize"></div><div class="widgetRemove"></div><div class="widgetResize"></div><div class="widgetResizeLeft"></div><div class="widgetBorder"><div class="nullWidget" style="padding:%s %s %s %s;">', $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left);
+                    $tpl = sprintf('<div class="widgetOutput" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s"><div class="widgetBoxCopy"></div><div class="widgetBoxSize"></div><div class="widgetBoxRemove"></div><div class="widgetBoxResize"></div><div class="widgetBoxResizeLeft"></div><div class="widgetBoxBorder"><div class="nullWidget" style="padding:%s %s %s %s;">', $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left);
                 } else {
                     $tpl = sprintf('<div style="overflow:hidden;%s;"><div style="padding:%s %s %s %s;"><div>%s', $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, $body);
                 }
diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css
index b21977244..f1e234da1 100644
--- a/modules/widget/tpl/css/widget.css
+++ b/modules/widget/tpl/css/widget.css
@@ -20,6 +20,13 @@
 .widgetOutput .widgetResize { background:transparent url("../images/btn_resize.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:1px; right:1px; cursor:pointer; z-index:1000;}
 .widgetOutput .widgetResizeLeft { background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:0; left:1px; cursor:pointer; z-index:1000;}
 
+.widgetOutput .widgetBoxBorder { border:1px dotted #267BEE; z-index:999; }
+.widgetOutput .widgetBoxCopy { background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px; width:14px; height:14px; position:absolute; top:1px; left:1px; cursor:pointer; z-index:1000;}
+.widgetOutput .widgetBoxSize { background:transparent url("../images/widget_size.gif") no-repeat 1px 1px; width:14px; height:14px; position:absolute; top:1px; left:15px; cursor:pointer; z-index:1000;}
+.widgetOutput .widgetBoxRemove { background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px; width:14px; height:14px; position:absolute; top:1px; left:30px; cursor:pointer; z-index:1000;}
+.widgetOutput .widgetBoxResize { background:transparent url("../images/btn_resize.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:1px; right:1px; cursor:pointer; z-index:1000;}
+.widgetOutput .widgetBoxResizeLeft { background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:0; left:1px; cursor:pointer; z-index:1000;}
+
 #pageSizeLayer { width:500px; overflow:hidden; border:1px solid #888888; background:#FFFFFF; z-index:2000; position:absolute; }
 #pageSizeLayer table { border:0; width:100%; table-layout:fixed; }
 #pageSizeLayer table th { padding:4px 0 4px 0; background-color:#DEDEDE; text-align:center; color:#888888;}
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 30953cf5e..5ffd0f3e7 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -112,7 +112,7 @@ function getContentWidgetCode(childObj, widget) {
 function getWidgetBoxCode(childObj, widget) {
     var cobj = childObj.firstChild;
     while(cobj) {
-        if(cobj.className == "widgetBorder") {
+        if(cobj.className == "widgetBorder" || cobj.className == "widgetBoxBorder") {
             var c2obj = cobj.firstChild;
             while(c2obj) {
                 if(c2obj.className == "nullWidget") {
@@ -200,12 +200,12 @@ function completeAddContent(ret_obj) {
 function doAddWidgetBox() {
     var tpl = ''+
     '<div class="widgetOutput" style="float:left;width:100%;height:12px;" widget="widgetBox" >'+
-        '<div class="widgetCopy"></div>'+
-        '<div class="widgetSize"></div>'+
-        '<div class="widgetRemove"></div>'+
-        '<div class="widgetResize"></div>'+
-        '<div class="widgetResizeLeft"></div>'+
-        '<div class="widgetBorder">'+
+        '<div class="widgetBoxCopy"></div>'+
+        '<div class="widgetBoxSize"></div>'+
+        '<div class="widgetBoxRemove"></div>'+
+        '<div class="widgetBoxResize"></div>'+
+        '<div class="widgetBoxResizeLeft"></div>'+
+        '<div class="widgetBoxBorder">'+
             '<div class="nullWidget" style="width:100%;height:100px;"></div>'+
             '<div class="clear"></div>'+
         '</div>'+
@@ -234,6 +234,12 @@ function doFitBorderSize() {
         xHeight(obj, xHeight(obj.parentNode));
         obj.parentNode.style.clear = '';
     }
+    var obj_list = xGetElementsByClassName('widgetBoxBorder', zonePageObj);
+    for(var i=0;i<obj_list.length;i++) {
+        var obj = obj_list[i];
+        xHeight(obj, xHeight(obj.parentNode));
+        obj.parentNode.style.clear = '';
+    }
 }
 
 var selectedWidget = null;
@@ -263,7 +269,7 @@ function doCheckWidget(e) {
         else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget,'GenerateCodeInPage');
         return;
     // 위젯 복사
-    } else if(obj.className == 'widgetCopy') {
+    } else if(obj.className == 'widgetCopy' || obj.className == 'widgetBoxCopy') {
         var p_obj = obj.parentNode;
         if(p_obj.className == 'widgetOutput') {
             var dummy = xCreateElement("DIV");
@@ -289,7 +295,7 @@ function doCheckWidget(e) {
         return;
 
     // 위젯 사이트/ 여백 조절
-    } else if(obj.className == 'widgetSize') {
+    } else if(obj.className == 'widgetSize' || obj.className == 'widgetBoxSize') {
         var p_obj = obj.parentNode;
         var widget = p_obj.getAttribute("widget");
         if(!widget) return;
@@ -297,7 +303,7 @@ function doCheckWidget(e) {
         doShowWidgetSizeSetup(evt.pageX, evt.pageY, selectedWidget);
         return;
     // 위젯 제거
-    } else if(obj.className == 'widgetRemove') {
+    } else if(obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') {
         var p_obj = obj.parentNode;
         var widget = p_obj.getAttribute("widget");
         if(confirm(confirm_delete_msg)) p_obj.parentNode.removeChild(p_obj);
@@ -332,11 +338,11 @@ function doCheckWidgetDrag(e) {
 
     doHideWidgetSizeSetup();
 
-    if(obj.className == 'widgetSetup' || obj.className == 'widgetCopy' || obj.className == 'widgetSize' || obj.className == 'widgetRemove') return;
+    if(obj.className == 'widgetSetup' || obj.className == 'widgetCopy' || obj.className == 'widgetBoxCopy' || obj.className == 'widgetSize' || obj.className == 'widgetBoxSize' || obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') return;
 
     p_obj = obj;
     while(p_obj) {
-        if(p_obj.className == 'widgetOutput' || p_obj.className == 'widgetResize' || p_obj.className == 'widgetResizeLeft') {
+        if(p_obj.className == 'widgetOutput' || p_obj.className == 'widgetResize' || p_obj.className == 'widgetResizeLeft' || p_obj.className == 'widgetBoxResize' || p_obj.className == 'widgetBoxResizeLeft') {
             widgetDragEnable(p_obj, widgetDragStart, widgetDrag, widgetDragEnd);
             widgetMouseDown(e);
             return;
@@ -506,7 +512,7 @@ function doApplyWidgetSize(fo_obj) {
 
         var borderObj = selectedSizeWidget.firstChild;
         while(borderObj) {
-            if(borderObj.nodeName == "DIV" && borderObj.className == "widgetBorder") {
+            if(borderObj.nodeName == "DIV" && (borderObj.className == "widgetBorder" || borderObj.className == "widgetBoxBorder")) {
                 var contentObj = borderObj.firstChild;
                 while(contentObj) {
                     if(contentObj.nodeName == "DIV") {
@@ -621,7 +627,7 @@ function widgetDragEnable(obj, funcDragStart, funcDrag, funcDragEnd) {
 
 // 드래그를 시작할때 호출되는 함수 (이동되는 형태를 보여주기 위한 작업을 함)
 function widgetDragStart(tobj, px, py) { 
-    if(tobj.className == 'widgetResize' || tobj.className == 'widgetResizeLeft' ) return;
+    if(tobj.className == 'widgetResize' || tobj.className == 'widgetResizeLeft' || tobj.className == 'widgetBoxResize' || tobj.className == 'widgetBoxResizeLeft') return;
     var obj = widgetGetTmpObject(tobj);
 
     xInnerHtml(obj, xInnerHtml(tobj));
@@ -655,7 +661,7 @@ function widgetDrag(tobj, dx, dy) {
     if(!float) float = 'left';
 
     // 위젯 리사이즈 (우측)
-    if(tobj.className == 'widgetResize') {
+    if(tobj.className == 'widgetResize' || tobj.className == 'widgetBoxResize') {
         if(nx < sx+minWidth) nx = sx+minWidth;
         if(nx > zoneRight) nx = zoneRight;
 
@@ -677,7 +683,7 @@ function widgetDrag(tobj, dx, dy) {
         xHeight(tobj.parentNode, new_height);
 
     // 위젯 리사이즈 (좌측)
-    } else if(tobj.className == 'widgetResizeLeft') {
+    } else if(tobj.className == 'widgetResizeLeft' || tobj.className == 'widgetBoxResizeLeft') {
 
         if(nx < zoneLeft) nx = zoneLeft;
 
diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html
index 05070289e..6437bbff2 100644
--- a/modules/widget/tpl/widget_layer.html
+++ b/modules/widget/tpl/widget_layer.html
@@ -47,7 +47,7 @@
                     <option value="solid">{$lang->cmd_widget_border_solid}</option>
                     <option value="dotted">{$lang->cmd_widget_border_dotted}</option>
                 </select>
-                #<input type="text" name="border_top_color" value="" class="color_input" maxlength="6"/>
+                <input type="text" name="border_top_color" value="" class="color_input" maxlength="6"/>
             </td>
         </tr>
         <tr>
@@ -57,7 +57,7 @@
                     <option value="solid">{$lang->cmd_widget_border_solid}</option>
                     <option value="dotted">{$lang->cmd_widget_border_dotted}</option>
                 </select>
-                #<input type="text" name="border_left_color" value="" class="color_input" maxlength="6"/>
+                <input type="text" name="border_left_color" value="" class="color_input" maxlength="6"/>
             </td>
             <td class="tRight">
                 <input type="text" name="border_right_thick" value="" class="small_input" />px
@@ -65,7 +65,7 @@
                     <option value="solid">{$lang->cmd_widget_border_solid}</option>
                     <option value="dotted">{$lang->cmd_widget_border_dotted}</option>
                 </select>
-                #<input type="text" name="border_right_color" value="" class="color_input" maxlength="6"/>
+                <input type="text" name="border_right_color" value="" class="color_input" maxlength="6"/>
             </td>
         </tr>
         <tr>
@@ -75,7 +75,7 @@
                     <option value="solid">{$lang->cmd_widget_border_solid}</option>
                     <option value="dotted">{$lang->cmd_widget_border_dotted}</option>
                 </select>
-                #<input type="text" name="border_bottom_color" value="" class="color_input" maxlength="6"/>
+                <input type="text" name="border_bottom_color" value="" class="color_input" maxlength="6"/>
             </td>
         </tr>
         <tr>