fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

위젯의 내부여백 기능 추가

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2993 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2007-11-19 03:05:20 +00:00
parent 503c57d67c
commit 3144756e6f
13 changed files with 129 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

38
classes/widget/WidgetHandler.class.php
View file

@ -54,28 +54,28 @@
if($widget == 'widgetContent') { if($widget == 'widgetContent') {
$style = $args->style; $style = $args->style;
$body = base64_decode($args->body); $body = base64_decode($args->body);
$widget_margin_left = $args->widget_margin_left; $widget_padding_left = $args->widget_padding_left;
$widget_margin_right = $args->widget_margin_right; $widget_padding_right = $args->widget_padding_right;
$widget_margin_top = $args->widget_margin_top; $widget_padding_top = $args->widget_padding_top;
$widget_margin_bottom = $args->widget_margin_bottom; $widget_padding_bottom = $args->widget_padding_bottom;
if($include_info) { if($include_info) {
$oWidgetController = &getController('widget'); $oWidgetController = &getController('widget');
$tpl = $oWidgetController->transEditorContent($body, $args); $tpl = $oWidgetController->transEditorContent($body, $args);
} else { } else {
$tpl = sprintf('<div style="overflow:hidden;%s"><div style="margin:%s %s %s %s;">%s</div></div>', $style, $widget_margin_top, $widget_margin_right, $widget_margin_bottom, $widget_margin_left, $body); $tpl = sprintf('<div style="overflow:hidden;%s"><div style="padding:%s %s %s %s;">%s</div></div>', $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, $body);
} }
return $tpl; return $tpl;
// widget Box일 경우 간단히 변경만 시도함 // widget Box일 경우 간단히 변경만 시도함
} else if($widget == 'widgetBox') { } else if($widget == 'widgetBox') {
$style = $args->style; $style = $args->style;
$widget_margin_left = $args->widget_margin_left; $widget_padding_left = $args->widget_padding_left;
$widget_margin_right = $args->widget_margin_right; $widget_padding_right = $args->widget_padding_right;
$widget_margin_top = $args->widget_margin_top; $widget_padding_top = $args->widget_padding_top;
$widget_margin_bottom = $args->widget_margin_bottom; $widget_padding_bottom = $args->widget_padding_bottom;
if($include_info) { if($include_info) {
$tpl = sprintf('<div class="widgetOutput" widget="widgetBox" style="%s;" widget_margin_top="%s" widget_margin_right="%s" widget_margin_bottom="%s" widget_margin_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="margin:%s %s %s %s;">', $style, $widget_margin_top, $widget_margin_right, $widget_margin_bottom, $widget_margin_left, $widget_margin_top, $widget_margin_right, $widget_margin_bottom, $widget_margin_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="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);
} else { } else {
$tpl = sprintf('<div style="overflow:hidden;%s;"><div style="margin:%s %s %s %s;"><div>%s', $style, $widget_margin_top, $widget_margin_right, $widget_margin_bottom, $widget_margin_left, $body); $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);
} }
return $tpl; return $tpl;
} }
@ -91,12 +91,12 @@
if(!$oWidget) return; if(!$oWidget) return;
// 위젯 output을 생성하기 위한 변수 설정 // 위젯 output을 생성하기 위한 변수 설정
$widget_margin_top = $args->widget_margin_top; $widget_padding_top = $args->widget_padding_top;
$widget_margin_bottom = $args->widget_margin_bottom; $widget_padding_bottom = $args->widget_padding_bottom;
$widget_margin_left = $args->widget_margin_left; $widget_padding_left = $args->widget_padding_left;
$widget_margin_right = $args->widget_margin_right; $widget_padding_right = $args->widget_padding_right;
$inner_style = sprintf("margin:%dpx %dpx %dpx %dpx !important; padding:none !important;", $widget_margin_top, $widget_margin_right, $widget_margin_bottom, $widget_margin_left); $inner_style = sprintf("padding:%dpx %dpx %dpx %dpx !important; padding:none !important;", $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left);
/** /**
* 출력을 위해 위젯 내용을 div로 꾸밈 * 출력을 위해 위젯 내용을 div로 꾸밈
@ -143,8 +143,8 @@
if(!$html) $html = '&nbsp;'; if(!$html) $html = '&nbsp;';
$output = sprintf( $output = sprintf(
'<style type="text/css">%s</style>'. '<div class="widgetClass"><style type="text/css">%s</style></div>'.
'<div class="widgetOutput" style="%s" widget_margin_top="%s" widget_margin_right="%s" widget_margin_bottom="%s" widget_margin_left="%s" widget="%s" %s >'. '<div class="widgetOutput" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
'<div class="widgetSetup"></div>'. '<div class="widgetSetup"></div>'.
'<div class="widgetCopy"></div>'. '<div class="widgetCopy"></div>'.
'<div class="widgetSize"></div>'. '<div class="widgetSize"></div>'.
@ -159,7 +159,7 @@
'</div>', '</div>',
$css_header, $css_header,
$args->style, $args->style,
$widget_margin_top, $widget_margin_right, $widget_margin_bottom, $widget_margin_left, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,
$widget, implode(' ',$attribute), $widget, implode(' ',$attribute),
$inner_style, $inner_style,
$html $html

2
common/js/common.js
View file

@ -780,7 +780,7 @@ function transRGB2Hex(value) {
var color = parseInt(value_list[i],10).toString(16); var color = parseInt(value_list[i],10).toString(16);
hex += color; hex += color;
} }
return hex; return '#'+hex;
} }
/** /**

3
modules/widget/lang/en.lang.php
View file

@ -49,7 +49,8 @@
$lang->cmd_widget_align = "위젯 정렬"; $lang->cmd_widget_align = "위젯 정렬";
$lang->cmd_widget_align_left = "왼쪽"; $lang->cmd_widget_align_left = "왼쪽";
$lang->cmd_widget_align_right = "오른쪽"; $lang->cmd_widget_align_right = "오른쪽";
$lang->cmd_widget_margin = "위젯 여백"; $lang->cmd_widget_margin = "외부 여백";
$lang->cmd_widget_padding = "내부 여백";
$lang->cmd_widget_border = "위젯 테두리"; $lang->cmd_widget_border = "위젯 테두리";
$lang->cmd_widget_border_solid = "실선"; $lang->cmd_widget_border_solid = "실선";
$lang->cmd_widget_border_dotted = "점선"; $lang->cmd_widget_border_dotted = "점선";

3
modules/widget/lang/es.lang.php
View file

@ -49,7 +49,8 @@
$lang->cmd_widget_align = "위젯 정렬"; $lang->cmd_widget_align = "위젯 정렬";
$lang->cmd_widget_align_left = "왼쪽"; $lang->cmd_widget_align_left = "왼쪽";
$lang->cmd_widget_align_right = "오른쪽"; $lang->cmd_widget_align_right = "오른쪽";
$lang->cmd_widget_margin = "위젯 여백"; $lang->cmd_widget_margin = "외부 여백";
$lang->cmd_widget_padding = "내부 여백";
$lang->cmd_widget_border = "위젯 테두리"; $lang->cmd_widget_border = "위젯 테두리";
$lang->cmd_widget_border_solid = "실선"; $lang->cmd_widget_border_solid = "실선";
$lang->cmd_widget_border_dotted = "점선"; $lang->cmd_widget_border_dotted = "점선";

3
modules/widget/lang/jp.lang.php
View file

@ -49,7 +49,8 @@
$lang->cmd_widget_align = "위젯 정렬"; $lang->cmd_widget_align = "위젯 정렬";
$lang->cmd_widget_align_left = "왼쪽"; $lang->cmd_widget_align_left = "왼쪽";
$lang->cmd_widget_align_right = "오른쪽"; $lang->cmd_widget_align_right = "오른쪽";
$lang->cmd_widget_margin = "위젯 여백"; $lang->cmd_widget_margin = "외부 여백";
$lang->cmd_widget_padding = "내부 여백";
$lang->cmd_widget_border = "위젯 테두리"; $lang->cmd_widget_border = "위젯 테두리";
$lang->cmd_widget_border_solid = "실선"; $lang->cmd_widget_border_solid = "실선";
$lang->cmd_widget_border_dotted = "점선"; $lang->cmd_widget_border_dotted = "점선";

5
modules/widget/lang/ko.lang.php
View file

@ -20,7 +20,7 @@
$lang->widget_position_none = '줄바꿈'; $lang->widget_position_none = '줄바꿈';
$lang->widget_position_left = '왼쪽'; $lang->widget_position_left = '왼쪽';
$lang->widget_position_right = '오른쪽'; $lang->widget_position_right = '오른쪽';
$lang->widget_margin = '여백'; $lang->widget_margin = '외부 여백';
$lang->widget_margin_top = '위'; $lang->widget_margin_top = '위';
$lang->widget_margin_right = '오른쪽'; $lang->widget_margin_right = '오른쪽';
$lang->widget_margin_bottom = '아래 '; $lang->widget_margin_bottom = '아래 ';
@ -49,7 +49,8 @@
$lang->cmd_widget_align = "위젯 정렬"; $lang->cmd_widget_align = "위젯 정렬";
$lang->cmd_widget_align_left = "왼쪽"; $lang->cmd_widget_align_left = "왼쪽";
$lang->cmd_widget_align_right = "오른쪽"; $lang->cmd_widget_align_right = "오른쪽";
$lang->cmd_widget_margin = "위젯 여백"; $lang->cmd_widget_margin = "외부 여백";
$lang->cmd_widget_padding = "내부 여백";
$lang->cmd_widget_border = "위젯 테두리"; $lang->cmd_widget_border = "위젯 테두리";
$lang->cmd_widget_border_solid = "실선"; $lang->cmd_widget_border_solid = "실선";
$lang->cmd_widget_border_dotted = "점선"; $lang->cmd_widget_border_dotted = "점선";

3
modules/widget/lang/zh-CN.lang.php
View file

@ -49,7 +49,8 @@
$lang->cmd_widget_align = "위젯 정렬"; $lang->cmd_widget_align = "위젯 정렬";
$lang->cmd_widget_align_left = "왼쪽"; $lang->cmd_widget_align_left = "왼쪽";
$lang->cmd_widget_align_right = "오른쪽"; $lang->cmd_widget_align_right = "오른쪽";
$lang->cmd_widget_margin = "위젯 여백"; $lang->cmd_widget_margin = "외부 여백";
$lang->cmd_widget_padding = "내부 여백";
$lang->cmd_widget_border = "위젯 테두리"; $lang->cmd_widget_border = "위젯 테두리";
$lang->cmd_widget_border_solid = "실선"; $lang->cmd_widget_border_solid = "실선";
$lang->cmd_widget_border_dotted = "점선"; $lang->cmd_widget_border_dotted = "점선";

8
modules/widget/tpl/add_content_widget.html
View file

@ -8,10 +8,10 @@
<input type="hidden" name="mid" value="{$module_info->mid}" /> <input type="hidden" name="mid" value="{$module_info->mid}" />
<input type="hidden" name="module_srl" value="{$module_srl}" /> <input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="style" value="float:left;padding:none;margin:none;width:100%;" /> <input type="hidden" name="style" value="float:left;padding:none;margin:none;width:100%;" />
<input type="hidden" name="widget_margin_left" value="" /> <input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="widget_margin_right" value="" /> <input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="widget_margin_top" value="" /> <input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="widget_margin_bottom" value="" /> <input type="hidden" name="widget_padding_bottom" value="" />
<div class="editor"> <div class="editor">
{$editor} {$editor}

98
modules/widget/tpl/js/widget.js
View file

@ -23,11 +23,11 @@ function setFloat(obj, fl) {
else obj.style.cssFloat = fl; else obj.style.cssFloat = fl;
} }
// margin값을 구하는 함수 (없을 경우 0으로 세팅), zbxe의 위젯에서만 사용 // padding값을 구하는 함수 (없을 경우 0으로 세팅), zbxe의 위젯에서만 사용
function getMargin(obj, direct) { function getPadding(obj, direct) {
var margin = obj.getAttribute("widget_margin_"+direct); var padding = obj.getAttribute("widget_padding_"+direct);
if(!margin || margin == null) margin = 0; if(!padding || padding == null) padding = 0;
return margin; return padding;
} }
@ -102,7 +102,7 @@ function getContentWidgetCode(childObj, widget) {
while(cobj) { while(cobj) {
if(cobj.nodeName == "DIV" && cobj.className == "widgetContent") { if(cobj.nodeName == "DIV" && cobj.className == "widgetContent") {
var body = xInnerHtml(cobj); var body = xInnerHtml(cobj);
return '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" widget_margin_left="'+getMargin(childObj,'left')+'" widget_margin_right="'+getMargin(childObj, 'right')+'" widget_margin_top="'+getMargin(childObj, 'top')+'" widget_margin_bottom="'+getMargin(childObj,'bottom')+'" />'; return '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" />';
} }
cobj = cobj.nextSibling; cobj = cobj.nextSibling;
} }
@ -117,7 +117,7 @@ function getWidgetBoxCode(childObj, widget) {
while(c2obj) { while(c2obj) {
if(c2obj.className == "nullWidget") { if(c2obj.className == "nullWidget") {
var body = getWidgetContent(c2obj); var body = getWidgetContent(c2obj);
return '<div widget="widgetBox" style="'+getStyle(childObj)+'" widget_margin_left="'+getMargin(childObj,'left')+'" widget_margin_right="'+getMargin(childObj,'right')+'" widget_margin_top="'+getMargin(childObj, 'top')+'" widget_margin_bottom="'+getMargin(childObj, 'bottom')+'"><div><div>'+body+'<div class="clear"></div></div></div></div>'; return '<div widget="widgetBox" style="'+getStyle(childObj)+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj,'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj, 'bottom')+'"><div><div>'+body+'<div class="clear"></div></div></div></div>';
} }
c2obj = c2obj.nextSibling; c2obj = c2obj.nextSibling;
} }
@ -158,10 +158,10 @@ function doSyncPageContent() {
var fo_obj = xGetElementById("content_fo"); var fo_obj = xGetElementById("content_fo");
var sel_obj = opener.selectedWidget; var sel_obj = opener.selectedWidget;
fo_obj.style.value = getStyle(opener.selectedWidget); fo_obj.style.value = getStyle(opener.selectedWidget);
fo_obj.widget_margin_left.value = getMargin(sel_obj, 'left'); fo_obj.widget_padding_left.value = getPadding(sel_obj, 'left');
fo_obj.widget_margin_right.value = getMargin(sel_obj,'right'); fo_obj.widget_padding_right.value = getPadding(sel_obj,'right');
fo_obj.widget_margin_bottom.value = getMargin(sel_obj,'bottom'); fo_obj.widget_padding_bottom.value = getPadding(sel_obj,'bottom');
fo_obj.widget_margin_top.value = getMargin(sel_obj,'top'); fo_obj.widget_padding_top.value = getPadding(sel_obj,'top');
var obj = sel_obj.firstChild; var obj = sel_obj.firstChild;
while(obj && obj.className != "widgetContent") obj = obj.nextSibling; while(obj && obj.className != "widgetContent") obj = obj.nextSibling;
@ -365,10 +365,14 @@ function doShowWidgetSizeSetup(px, py, obj) {
formObj.width.value = obj.style.width; formObj.width.value = obj.style.width;
formObj.height.value = obj.style.height; formObj.height.value = obj.style.height;
formObj.margin_left.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_left')); formObj.padding_left.value = _getInt(selectedSizeWidget.getAttribute('widget_padding_left'));
formObj.margin_right.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_right')); formObj.padding_right.value = _getInt(selectedSizeWidget.getAttribute('widget_padding_right'));
formObj.margin_top.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_top')); formObj.padding_top.value = _getInt(selectedSizeWidget.getAttribute('widget_padding_top'));
formObj.margin_bottom.value = _getInt(selectedSizeWidget.getAttribute('widget_margin_bottom')); formObj.padding_bottom.value = _getInt(selectedSizeWidget.getAttribute('widget_padding_bottom'));
formObj.margin_left.value = _getInt(selectedSizeWidget.style.marginLeft);
formObj.margin_right.value = _getInt(selectedSizeWidget.style.marginRight);
formObj.margin_top.value = _getInt(selectedSizeWidget.style.marginTop);
formObj.margin_bottom.value = _getInt(selectedSizeWidget.style.marginBottom);
var widget_align = getFloat(selectedSizeWidget); var widget_align = getFloat(selectedSizeWidget);
if(widget_align == "left") formObj.widget_align.selectedIndex = 0; if(widget_align == "left") formObj.widget_align.selectedIndex = 0;
@ -431,11 +435,11 @@ function doHideWidgetSizeSetup() {
} }
function _getSize(value) { function _getSize(value) {
if(!value) return; if(!value) return 0;
var type = "px"; var type = "px";
if(value.lastIndexOf("%")>=0) type = "%"; if(value.lastIndexOf("%")>=0) type = "%";
var num = parseInt(value,10); var num = parseInt(value,10);
if(num<1) return; if(num<1) return 0;
if(type == "%" && num > 100) num = 100; if(type == "%" && num > 100) num = 100;
return ""+num+type; return ""+num+type;
} }
@ -455,7 +459,7 @@ function _getBorderStyle(fld_color, fld_thick, fld_type) {
} }
function _getBGColorStyle(fld_color) { function _getBGColorStyle(fld_color) {
var color = fld_color.value; var color = fld_color.replace(/^#/,'');
if(!color) color = '#FFFFFF'; if(!color) color = '#FFFFFF';
else color = '#'+color; else color = '#'+color;
return color; return color;
@ -476,9 +480,13 @@ function doApplyWidgetSize(fo_obj) {
selectedSizeWidget.style.borderBottom = _getBorderStyle(fo_obj.border_bottom_color, fo_obj.border_bottom_thick, fo_obj.border_bottom_type); selectedSizeWidget.style.borderBottom = _getBorderStyle(fo_obj.border_bottom_color, fo_obj.border_bottom_thick, fo_obj.border_bottom_type);
selectedSizeWidget.style.borderLeft = _getBorderStyle(fo_obj.border_left_color, fo_obj.border_left_thick, fo_obj.border_left_type); 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.borderRight = _getBorderStyle(fo_obj.border_right_color, fo_obj.border_right_thick, fo_obj.border_right_type);
selectedSizeWidget.style.marginTop = _getSize(fo_obj.margin_top.value);
selectedSizeWidget.style.marginRight = _getSize(fo_obj.margin_right.value);
selectedSizeWidget.style.marginBottom = _getSize(fo_obj.margin_bottom.value);
selectedSizeWidget.style.marginLeft = _getSize(fo_obj.margin_left.value);
if(!fo_obj.background_color.value || fo_obj.background_color.value == 'transparent') selectedSizeWidget.style.backgroundColor = 'transparent'; 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); else selectedSizeWidget.style.backgroundColor = _getBGColorStyle(fo_obj.background_color.value);
var image_url = fo_obj.background_image_url.value; var image_url = fo_obj.background_image_url.value;
if(image_url) selectedSizeWidget.style.backgroundImage = "url("+image_url+")"; if(image_url) selectedSizeWidget.style.backgroundImage = "url("+image_url+")";
@ -500,41 +508,41 @@ function doApplyWidgetSize(fo_obj) {
var contentObj = borderObj.firstChild; var contentObj = borderObj.firstChild;
while(contentObj) { while(contentObj) {
if(contentObj.nodeName == "DIV") { if(contentObj.nodeName == "DIV") {
contentObj.style.margin = ""; contentObj.style.padding = "";
var marginLeft = _getSize(fo_obj.margin_left.value); var paddingLeft = _getSize(fo_obj.padding_left.value);
if(marginLeft) { if(paddingLeft) {
contentObj.style.marginLeft = marginLeft; contentObj.style.paddingLeft = paddingLeft;
selectedSizeWidget.setAttribute('widget_margin_left', marginLeft); selectedSizeWidget.setAttribute('widget_padding_left', paddingLeft);
} else { } else {
contentObj.style.marginLeft = ''; contentObj.style.paddingLeft = '';
selectedSizeWidget.setAttribute('widget_margin_left', ''); selectedSizeWidget.setAttribute('widget_padding_left', '');
} }
var marginRight = _getSize(fo_obj.margin_right.value); var paddingRight = _getSize(fo_obj.padding_right.value);
if(marginRight) { if(paddingRight) {
contentObj.style.marginRight = marginRight; contentObj.style.paddingRight = paddingRight;
selectedSizeWidget.setAttribute('widget_margin_right', marginRight); selectedSizeWidget.setAttribute('widget_padding_right', paddingRight);
} else { } else {
contentObj.style.marginRight = ''; contentObj.style.paddingRight = '';
selectedSizeWidget.setAttribute('widget_margin_right', ''); selectedSizeWidget.setAttribute('widget_padding_right', '');
} }
var marginTop = _getSize(fo_obj.margin_top.value); var paddingTop = _getSize(fo_obj.padding_top.value);
if(marginTop) { if(paddingTop) {
contentObj.style.marginTop = marginTop; contentObj.style.paddingTop = paddingTop;
selectedSizeWidget.setAttribute('widget_margin_top', marginTop); selectedSizeWidget.setAttribute('widget_padding_top', paddingTop);
} else { } else {
contentObj.style.marginTop = ''; contentObj.style.paddingTop = '';
selectedSizeWidget.setAttribute('widget_margin_top', ''); selectedSizeWidget.setAttribute('widget_padding_top', '');
} }
var marginBottom = _getSize(fo_obj.margin_bottom.value); var paddingBottom = _getSize(fo_obj.padding_bottom.value);
if(marginBottom) { if(paddingBottom) {
contentObj.style.marginBottom = marginBottom; contentObj.style.paddingBottom = paddingBottom;
selectedSizeWidget.setAttribute('widget_margin_bottom', marginBottom); selectedSizeWidget.setAttribute('widget_padding_bottom', paddingBottom);
} else { } else {
contentObj.style.marginBottom = ''; contentObj.style.paddingBottom = '';
selectedSizeWidget.setAttribute('widget_margin_bottom', ''); selectedSizeWidget.setAttribute('widget_padding_bottom', '');
} }
break; break;
@ -567,8 +575,8 @@ function widgetCreateTmpObject(obj) {
tmpObj.id = id + '_tmp'; tmpObj.id = id + '_tmp';
tmpObj.className = obj.className; tmpObj.className = obj.className;
tmpObj.style.overflow = 'hidden'; tmpObj.style.overflow = 'hidden';
tmpObj.style.margin= '0px';
tmpObj.style.padding = '0px'; tmpObj.style.padding = '0px';
tmpObj.style.margin = '0px';
tmpObj.style.width = obj.style.width; tmpObj.style.width = obj.style.width;
tmpObj.style.display = 'none'; tmpObj.style.display = 'none';

23
modules/widget/tpl/js/widget_admin.js
View file

@ -19,6 +19,21 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
window.close(); window.close();
return; return;
} }
var dummy = xCreateElement("DIV");
xInnerHtml(dummy, widget_code);
var cobj = dummy.firstChild;
while(cobj) {
if(cobj.className == 'widgetClass') {
opener.document.body.insertBefore(cobj, opener.document.body.firstChild);
break;
}
cobj = cobj.nextSibling;
}
widget_code = xInnerHtml(dummy);
if(selected_node && selected_node.getAttribute("widget")) { if(selected_node && selected_node.getAttribute("widget")) {
selected_node = replaceOuterHTML(selected_node, widget_code); selected_node = replaceOuterHTML(selected_node, widget_code);
if(opener.doFitBorderSize) opener.doFitBorderSize(); if(opener.doFitBorderSize) opener.doFitBorderSize();
@ -88,10 +103,10 @@ function doFillWidgetVars() {
if(typeof(style)=="object") style = style["cssText"]; if(typeof(style)=="object") style = style["cssText"];
fo_obj.style.value = style; fo_obj.style.value = style;
fo_obj.widget_margin_left.value = selected_node.getAttribute("widget_margin_left"); fo_obj.widget_padding_left.value = selected_node.getAttribute("widget_padding_left");
fo_obj.widget_margin_right.value = selected_node.getAttribute("widget_margin_right"); fo_obj.widget_padding_right.value = selected_node.getAttribute("widget_padding_right");
fo_obj.widget_margin_bottom.value = selected_node.getAttribute("widget_margin_bottom"); fo_obj.widget_padding_bottom.value = selected_node.getAttribute("widget_padding_bottom");
fo_obj.widget_margin_top.value = selected_node.getAttribute("widget_margin_top"); fo_obj.widget_padding_top.value = selected_node.getAttribute("widget_padding_top");
for(var name in fo_obj) { for(var name in fo_obj) {
var node = fo_obj[name]; var node = fo_obj[name];

8
modules/widget/tpl/widget_generate_code_in_page.html
View file

@ -8,10 +8,10 @@
<input type="hidden" name="module_srl" value="{$module_srl}" /> <input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="widget_sequence" value="" /> <input type="hidden" name="widget_sequence" value="" />
<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" /> <input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
<input type="hidden" name="widget_margin_left" value="" /> <input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="widget_margin_right" value="" /> <input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="widget_margin_top" value="" /> <input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="widget_margin_bottom" value="" /> <input type="hidden" name="widget_padding_bottom" value="" />
<div id="popHeadder"> <div id="popHeadder">
<h3>{$lang->cmd_generate_code}</h3> <h3>{$lang->cmd_generate_code}</h3>

11
modules/widget/tpl/widget_layer.html
View file

@ -28,6 +28,17 @@
<tr> <tr>
<td colspan="2" class="tCenter"><input type="text" name="margin_bottom" class="input" value="" /></td> <td colspan="2" class="tCenter"><input type="text" name="margin_bottom" class="input" value="" /></td>
</tr> </tr>
<tr>
<th rowspan="3" class="line">{$lang->cmd_widget_padding}</th>
<td colspan="2" class="line tCenter"><input type="text" name="padding_top" class="input" value="" /></td>
</tr>
<tr>
<td><input type="text" name="padding_left" class="input" value="" /></td>
<td class="tRight"><input type="text" name="padding_right" class="input" value="" /></td>
</tr>
<tr>
<td colspan="2" class="tCenter"><input type="text" name="padding_bottom" class="input" value="" /></td>
</tr>
<tr> <tr>
<th rowspan="3" class="line">{$lang->cmd_widget_border}</th> <th rowspan="3" class="line">{$lang->cmd_widget_border}</th>
<td colspan="2" class="tCenter line"> <td colspan="2" class="tCenter line">

14
modules/widget/widget.controller.php
View file

@ -134,7 +134,7 @@
**/ **/
function procWidgetAddContent() { function procWidgetAddContent() {
$content = Context::get('content'); $content = Context::get('content');
$args = Context::getRequestVars('style','widget_margin_left','widget_margin_right','widget_margin_bottom','widget_margin_top'); $args = Context::getRequestVars('style','widget_padding_left','widget_padding_right','widget_padding_bottom','widget_padding_top');
$tpl = $this->transEditorContent($content, $args); $tpl = $this->transEditorContent($content, $args);
@ -152,8 +152,8 @@
$none_widget_code = preg_replace('!<img([^\>]*)widget=([^\>]*?)\>!is', '', $content); $none_widget_code = preg_replace('!<img([^\>]*)widget=([^\>]*?)\>!is', '', $content);
$oPageAdminController = &getAdminController('page'); $oPageAdminController = &getAdminController('page');
if(trim($none_widget_code)) { if(trim($none_widget_code)) {
$args->style = "float:left;overflow:hidden;padding:none;margin:none"; $args->style = "float:left;overflow:hidden;padding:none;padding:none";
$args->widget_margin_left = $args->widget_margin_top = $args->widget_margin_right = $args->widget_margin_bottom = 0; $args->widget_padding_left = $args->widget_padding_top = $args->widget_padding_right = $args->widget_padding_bottom = 0;
$none_widget_content = $oPageAdminController->transEditorContent($none_widget_code, $args); $none_widget_content = $oPageAdminController->transEditorContent($none_widget_code, $args);
} }
*/ */
@ -247,7 +247,7 @@
$tpl = sprintf( $tpl = sprintf(
'<style type="text/css">%s</style>'. '<style type="text/css">%s</style>'.
'<div class="widgetOutput" style="%s" widget_margin_left="%s" widget_margin_right="%s" widget_margin_top="%s" widget_margin_bottom="%s" widget="widgetContent">'. '<div class="widgetOutput" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent">'.
'<div class="widgetSetup"></div>'. '<div class="widgetSetup"></div>'.
'<div class="widgetCopy"></div>'. '<div class="widgetCopy"></div>'.
'<div class="widgetSize"></div>'. '<div class="widgetSize"></div>'.
@ -255,7 +255,7 @@
'<div class="widgetResize"></div>'. '<div class="widgetResize"></div>'.
'<div class="widgetResizeLeft"></div>'. '<div class="widgetResizeLeft"></div>'.
'<div class="widgetBorder">'. '<div class="widgetBorder">'.
'<div style="margin:%s %s %s %s;">'. '<div style="padding:%s %s %s %s;">'.
'%s'. '%s'.
'</div><div class="clear"></div>'. '</div><div class="clear"></div>'.
'</div>'. '</div>'.
@ -263,8 +263,8 @@
'</div>', '</div>',
$css_header, $css_header,
$args->style, $args->style,
$args->widget_margin_left, $args->widget_margin_right, $args->widget_margin_top, $args->widget_margin_bottom, $args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
$args->widget_margin_top, $args->widget_margin_right, $args->widget_margin_bottom, $args->widget_margin_left, $args->widget_padding_top, $args->widget_padding_right, $args->widget_padding_bottom, $args->widget_padding_left,
$content, $content,
base64_encode($code) base64_encode($code)
); );