From 4b107d24a666f0aa918f7b72108219151c638705 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 30 Jul 2007 07:50:31 +0000 Subject: [PATCH] =?UTF-8?q?=EC=9C=84=EC=A0=AF=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=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/trunk@2083 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/widget/WidgetHandler.class.php | 44 +++++++++++++---- common/css/default.css | 2 +- common/tpl/images/widget.gif | Bin 1082 -> 8856 bytes common/tpl/images/widget_bg.jpg | Bin 0 -> 25064 bytes common/tpl/images/widget_text.gif | Bin 0 -> 970 bytes modules/widget/lang/ko.lang.php | 4 +- modules/widget/tpl/js/widget_admin.js | 15 +++++- modules/widget/tpl/widget_generate_code.html | 46 ++++++++++++++++++ .../tpl/widget_generate_code_in_page.html | 25 +++++++--- modules/widget/widget.controller.php | 25 ++++++---- 10 files changed, 130 insertions(+), 31 deletions(-) create mode 100755 common/tpl/images/widget_bg.jpg create mode 100755 common/tpl/images/widget_text.gif diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index 4f7ef704f..ce11a2c7b 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -47,21 +47,45 @@ $output = $oWidget->proc($args); } - $style = ""; - $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left); - if($args->widget_fix_width == 'Y') { - $style .= sprintf("%s:%spx;", "width", trim($args->widget_width)); + $widget_width_type = strtolower($args->widget_width_type); + if(!$widget_width_type||!in_array($widget_width_type,array("px","%"))) $widget_width_type = "px"; + + + if($widget_width_type == "px") { + + $style = "overflow:hidden;"; + $style .= sprintf("%s:%s%s;", "width", $args->widget_width - $args->widget_margin_right - $args->widget_margin_left, $widget_width_type); + $style .= sprintf("margin-top:%dpx;margin-bottom:%dpx;", $args->widget_margin_top, $args->widget_margin_bottom); + + + $inner_style = sprintf("margin-left:%dpx;margin-right:%dpx;", $args->widget_margin_left, $args->widget_margin_right); + + if($args->widget_position) { + $style .= sprintf("%s:%s;", "float", $args->widget_position); + $output = sprintf('
%s
',$style, $inner_style, $output); + } else { + $style .= "float:left;"; + $output = sprintf('
%s
',$style, $inner_style, $output); + } - if($args->widget_position) { - $style .= sprintf("%s:%s;", "float", trim($args->widget_position)); - $output = sprintf('
%s
',$style, $output); } else { - $style .= "float:left;"; - $output = sprintf('
%s
',$style, $output); + + $style = sprintf("overflow:hidden;%s:%s%s;", "width", $args->widget_width, $widget_width_type); + + $output = sprintf('
%s
', $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left, $output); + + if($args->widget_position) { + $style .= sprintf("%s:%s;", "float", $args->widget_position); + $output = sprintf('
%s
',$style, $output); + } else { + $style .= "float:left;"; + $output = sprintf('
%s
',$style, $output); + } } + } else { - $output = sprintf('
%s
',$style, $output); + $output = sprintf('
%s
', $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left, $output); } if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start; diff --git a/common/css/default.css b/common/css/default.css index 832217788..8faeb9911 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -60,7 +60,7 @@ a.bold { font-weight:bold; } .folder_closer { display: none; } .folder_area { display: none; } -.zbxe_widget_output { background:url(../tpl/images/widget.gif) no-repeat center; background-color:#FFFFFF; border:3px dotted #039311; display:block; } +.zbxe_widget_output { background-image:url(../tpl/images/widget_text.gif) no-repeat center bottom; display:block;} .member_signature { margin-top:10px; border:1px solid #DDDDDD; padding:10px; } #waitingforserverresponse { display:inline; border:2px solid #444444; background-color:#FFFFFF; padding:15px 20px 13px 20px; font-weight:bold; color:#444444; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; } diff --git a/common/tpl/images/widget.gif b/common/tpl/images/widget.gif index 384b415a361dcbfa08dd6201dda6753dcff5533a..ccd3ea82c1e2d9e8423b409e8fdadc953966416b 100644 GIT binary patch literal 8856 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%0At3LRV1y3;0Y z$i@{i_G>(HFt1<4`Z3(FulrS_3FQ3s^j>D;hTb#G zZUI&LiVTI)9<#m=QnM-yu$`u1M>owHiTA=YnQd-a#TO@hQ%$;Gcr!>}{u zCDD2*G~PYjc34)!*x(J@!m!`?jDFJT_iLHw-UfGceXS$FI!xc{b+`KQXng{#QGg|z q7B7y4Px6NJKs-BL+?BxW_T9NN>-h7k%C5~VrtLM&Z{E-a<^Lb9d`Tz( literal 0 HcmV?d00001 diff --git a/common/tpl/images/widget_text.gif b/common/tpl/images/widget_text.gif new file mode 100755 index 0000000000000000000000000000000000000000..ad260736b0a87ce3117ffb44f3a5d30009c93152 GIT binary patch literal 970 zcmV;*12z0dNk%w1Vcq~w0Du7i|NsC0|NkNR1OWg50RSuj0002q08an_0{@JUsmtvT zBLuWsiL>6k`wxbPMFQf9rs}Gc6&tuOOxLz8Q*dtH{tx8vdMaMT_(XQ-k*Ju& z*r@Rc2_!j*w`Yk|ndz{}sTcSeW+*B|=D83jhl;StYCy{1^g2Zn6PsE)gWIAzgXSA- zduc};iYi=d?0XwJkxT^(ExbJZVC6ZjDyz*a-QC*#!n)0k=_-zCo^HJk{w?0@+(|xH z$*$gu->#p&}-enU5h#;w8@^ralk}RSsW&ijZ@>`e>q#KVT z!v$oP>!ih$6IF&3sSswdi|rUGqj`|zOqm}m<}?{{ATE?Fcls=;6DiM_Ntq&S>8)J7 zmrZ*%eaa6aJ(~fSMmwss=*Ou)!BRCFEm2poV_%{DN=vP`t85=}&9`=`UI|j?{yRwa zCpDgg|CZGV*zH@HqwxAgTNi51Q;H!2J&aSwWviLfKE6wIvs21v5gV;+*)ZqGo=b~n z3Jq&m(wIBTc6x14!o;p$YgRqZ@k`o9tHneucQ;bE#NFtYyc7BJ-i3iDy#4!`x;4#l zcgMYzcWu_#_m#)+y$7~f>Az|hU;O=P<;x$_HEW$nL5bAQ`~P;In{f2CHr{_p`Iet) zHQARRf$;?hpK|{3#ocyY+{0gi6W)j3bPtA5S%nb>cUF5FB&VT)Dz1{^freaInu(Ek z_@RRJ^*1AqRRxs?FETbZVp!qLr(=gj#^zOx?Ez@xaf)q&nsM1t7}|feEtzAG;IZal zjU7l=WrJ5{h+|*&nb{(hX}>pXqI?#Dddh@a%d@`voQ+kXj*;XXOfY!IVE|Gmb#~?`lWhmq*i?@ zWu;=4YHF)GWJGB^xsJ4-n|acDYOKG$v+FdPBB|=7oS_~oY_Z5X>ua*h&WdNKi!}>v zw6q9b9Vx|)kCw1I*vrnum0lN!3m_|?&|vSNBCyZEZR@31Sb8)mVk z#CqusV0sI%z5~-S=)w-S(eT3(3sU677S|B*#TtW{@x~sXXzj-${{v*jBX2zEv?s5O s-LRvwJaV}(&rEH)G}FA>%{r6H>dr75~>Q#RUKWJ25cpX8-^I literal 0 HcmV?d00001 diff --git a/modules/widget/lang/ko.lang.php b/modules/widget/lang/ko.lang.php index 8472b6531..bd9a150c7 100644 --- a/modules/widget/lang/ko.lang.php +++ b/modules/widget/lang/ko.lang.php @@ -26,9 +26,9 @@ $lang->widget_margin_bottom = '아래 '; $lang->widget_margin_left= '왼쪽'; $lang->about_widget_fix_width = '선택하시면 가로크기가 고정됩니다.'; - $lang->about_widget_width = '가로 크기를 선택해주세요.'; + $lang->about_widget_width = '가로 크기를 입력해주세요.'; $lang->about_widget_position = '한 줄에 여러개의 위젯을 나열하고 싶을때에는 위치를 선택해주세요.'; - $lang->about_widget_margin = '한 줄에 여러개의 위젯을 나열하고 싶을때에는 위치를 선택해주세요.'; + $lang->about_widget_margin = '지정된 위젯의 상하좌우 여백을 지정할 수 있습니다'; $lang->about_widget_cache = '지정된 시간동안 캐시된 데이터를 이용할 수 있습니다.'; $lang->generated_code = '생성된 코드'; diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js index 8c24a15fd..f0a99f223 100644 --- a/modules/widget/tpl/js/widget_admin.js +++ b/modules/widget/tpl/js/widget_admin.js @@ -133,14 +133,18 @@ function doFillWidgetVars() { } +/* var marginLeft = 0; if(selected_node.style.marginLeft) marginLeft = parseInt(selected_node.style.marginLeft.replace(/px$/,''),10); var marginRight = 0; if(selected_node.style.marginRight) marginRight = parseInt(selected_node.style.marginRight.replace(/px$/,''),10); var border = 0; if(selected_node.style.border) border= parseInt(selected_node.style.boarder.replace(/px$/,''),10); +*/ - fo_obj.widget_width.value = xWidth(selected_node) + marginLeft + marginRight - 6; + var width_type = "px"; + if(selected_node.getAttribute("widget_width_type")=="%") width_type = "%"; + else fo_obj.widget_width.value = xWidth(selected_node); // 컬러셋 설정 if(skin && xGetElementById("widget_colorset").options.length<1 && colorset) { @@ -150,3 +154,12 @@ function doFillWidgetVars() { // widget sequence 설정 fo_obj.widget_sequence.value = widget_sequence; } + +function checkFixType(obj) { + var val = obj.options[obj.selectedIndex].value; + if(val != "px") { + var fo_obj = xGetElementById("fo_widget"); + var width = fo_obj.widget_width.value; + if(width>100) fo_obj.widget_width.value = 100; + } +} diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html index 10dc19ef3..47fec730f 100644 --- a/modules/widget/tpl/widget_generate_code.html +++ b/modules/widget/tpl/widget_generate_code.html @@ -76,6 +76,52 @@ + + {$lang->widget_margin} + + + + + + + + + + + + +
{$lang->widget_margin_top} px
{$lang->widget_margin_left} px{$lang->widget_margin_right} px
{$lang->widget_margin_bottom} px
+

{$lang->about_widget_margin}

+ + + + {$lang->widget_fix_width} + + {$lang->about_widget_fix_width} + + + + {$lang->widget_width} + + + +

{$lang->about_widget_width}

+ + + + {$lang->widget_position} + + +

{$lang->about_widget_position}

+ + {$lang->generated_code} diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index 6f408b11c..0ec4ef3a1 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -81,12 +81,19 @@ {$lang->widget_margin} - {$lang->widget_margin_top} px - {$lang->widget_margin_right} px - {$lang->widget_margin_bottom} px - {$lang->widget_margin_left} px -
- {$lang->about_widget_margin} + + + + + + + + + + + +
{$lang->widget_margin_top} px
{$lang->widget_margin_left} px{$lang->widget_margin_right} px
{$lang->widget_margin_bottom} px
+

{$lang->about_widget_margin}

@@ -103,7 +110,11 @@ {$lang->widget_width} - px + +

{$lang->about_widget_width}

diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index 192bc951a..d90cf5302 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -21,12 +21,18 @@ $vars = Context::getRequestVars(); $widget = $vars->selected_widget; - $blank_img_path = "./common/tpl/images/blank.gif"; + $blank_img_path = Context::getRequestUri()."common/tpl/images/widget_bg.jpg"; unset($vars->module); unset($vars->act); unset($vars->selected_widget); + if($vars->widget_sequence) { + $cache_path = './files/cache/widget_cache/'; + $cache_file = sprintf('%s%d.%s.cache', $cache_path, $vars->widget_sequence, Context::getLangType()); + @unlink($cache_file); + } + $vars->widget_sequence = getNextSequence(); if(!$vars->widget_cache) $vars->widget_cache = 0; @@ -38,18 +44,17 @@ } } - - $style = ""; - $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_fix_width == 'Y') { - $vars->widget_width = $vars->widget_width - $vars->widget_margin_left - $vars->widget_margin_right; - $style .= sprintf("%s:%spx;", "width", trim($vars->widget_width)); - if($vars->widget_position) $style .= sprintf("%s:%s;", "float", trim($vars->widget_position)); - else $style .= "float:left;"; + $widget_width_type = strtolower($vars->widget_width_type); + if(!$widget_width_type||!in_array($widget_width_type,array("px","%"))) $widget_width_type = "px"; + + $style .= sprintf("%s:%s%s;", "width", trim($vars->widget_width), $widget_width_type); + + //if($vars->widget_position) $style .= sprintf("%s:%s;", "float", trim($vars->widget_position)); + //else $style .= "float:left;"; $widget_code = sprintf('', $blank_img_path, $widget, implode(' ',$attribute), $style); } else { - $widget_code = sprintf('', $blank_img_path, $style, $widget, implode(' ',$attribute)); + $widget_code = sprintf('', "100%", $blank_img_path, $style, $widget, implode(' ',$attribute)); } $cache_path = './files/cache/widget_cache/';