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('
', $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('
', $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('
%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 = ''+ '
'+ - '
'+ - '
'+ - '
'+ - '
'+ - '
'+ - '
'+ + '
'+ + '
'+ + '
'+ + '
'+ + '
'+ + '
'+ '
'+ '
'+ '
'+ @@ -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 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 @@ - # + @@ -57,7 +57,7 @@ - # + px @@ -65,7 +65,7 @@ - # + @@ -75,7 +75,7 @@ - # +