diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js index 16f77171c..e2f9bb1e2 100644 --- a/modules/widget/tpl/js/widget_admin.js +++ b/modules/widget/tpl/js/widget_admin.js @@ -16,7 +16,6 @@ function completeGenerateCode(ret_obj) { function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) { var widget_code = ret_obj["widget_code"]; var module_srl = fo_obj.module_srl.value; - if(!opener || !widget_code || !module_srl) { window.close(); return; @@ -128,7 +127,7 @@ function doFillWidgetVars() { } - fo_obj.widget_width.value = xWidth(selected_node)+4; + fo_obj.widget_width.value = xWidth(selected_node)-6; // 컬러셋 설정 if(skin && xGetElementById("widget_colorset").options.length<1 && colorset) { diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index 1b2fc2f62..3e3369666 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -73,6 +73,10 @@
선택하시면 가로크기가 고정됩니다.
+
줄변경
+
+ 선택하시면 이 위젯은 줄을 바꾼후 출력됩니다. +
가로 크기
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 9b1a6451f..4fca29dd1 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -42,11 +42,11 @@ $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)); + if($vars->widget_cr == 'Y') $style .= "clear:left;"; $widget_code = sprintf('', $blank_img_path, $widget, implode(' ',$attribute), $style); } else { $widget_code = sprintf('', $blank_img_path, $widget, implode(' ',$attribute)); } - debugPrint($widget_code); // 코드 출력 $this->add('widget_code', $widget_code);