페이지 모듈의 위젯 처리 부분 오류 없이 수정 & 컨텐츠 추가시 내용을 utf8 encode하도록 하여 문제 해결

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2962 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/widget/tpl/js/widget_admin.js

@@ -12,7 +12,7 @@ function completeGenerateCode(ret_obj) {
     zone.value = widget_code;
 } 
 
-/* 생성된 코드를 에디터에 출력 */
+/* 생성된 코드를 페이지 zone에 출력 */
 function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
     var widget_code = ret_obj["widget_code"];
     if(!opener || !widget_code) {
@@ -21,6 +21,7 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
     }
     if(selected_node  && selected_node.getAttribute("widget")) {
         selected_node = replaceOuterHTML(selected_node, widget_code);
+        if(opener.doFitBorderSize) opener.doFitBorderSize();
     } else {
         var obj = opener.xGetElementById('zonePageContent');
         xInnerHtml(obj, xInnerHtml(obj)+widget_code);
@@ -83,6 +84,10 @@ function doFillWidgetVars() {
 
     var fo_obj = xGetElementById("fo_widget");
 
+    var style = selected_node.getAttribute("style");
+    if(typeof(style)=="object") style = style["cssText"];
+    fo_obj.style.value = style;
+
     for(var name in fo_obj) {
         var node = fo_obj[name];
         if(!node || typeof(node)=="undefined") continue;
@@ -139,22 +144,6 @@ function doFillWidgetVars() {
     if(selected_node.style.border) border= parseInt(selected_node.style.boarder.replace(/px$/,''),10);
 */
     
-    var width = selected_node.style.width;
-    if(width) {
-        var width_type = width.replace(/^([0-9]+)/, '');
-        if(!width_type) width_type = 'px';
-
-        var width_value = width.replace(/([%|px]+)/,'');
-
-        fo_obj.widget_width.value = width_value;
-        if(width_type == '%') fo_obj.widget_width_type.selectedIndex = 0;
-        else fo_obj.widget_width_type.selectedIndex = 1;
-    } else {
-        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) {
         doDisplaySkinColorset(xGetElementById("widget_skin"), colorset);

modules/widget/tpl/widget_generate_code_in_page.html

@@ -7,6 +7,7 @@
 <input type="hidden" name="selected_widget" value="{$selected_widget}" />
 <input type="hidden" name="module_srl" value="{$module_srl}" />
 <input type="hidden" name="widget_sequence" value="" />
+<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
 
     <div id="popHeadder">
         <h3>{$lang->cmd_generate_code}</h3>
@@ -22,35 +23,6 @@
             <th scope="row">{$lang->widget}</th>
             <td>{$widget_info->title} ver {$widget_info->version}</td>
         </tr>
-        <tr>
-            <th scope="row">{$lang->widget_width}</th>
-            <td>
-                <input type="text" value="50" name="widget_width" size="3" class="inputTypeText" />
-                <select name="widget_width_type" onchange="checkFixType(this)">
-                    <option value="%">%</option>
-                    <option value="px">px</option>
-                </select>
-                <p>{$lang->about_widget_width}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row">{$lang->widget_margin}</th>
-            <td>
-                <table cellspacing="1" class="adminTable">
-                <tr>
-                    <td colspan="2" class="tCenter">{$lang->widget_margin_top} <input type="text" name="widget_margin_top" value="0" size="2" class="inputTypeText" />px</td>
-                </tr>
-                <tr>
-                    <td class="tCenter">{$lang->widget_margin_left} <input type="text" name="widget_margin_left" value="0" size="2" class="inputTypeText"/>px</td>
-                    <td class="tCenter">{$lang->widget_margin_right} <input type="text" name="widget_margin_right" value="0" size="2" class="inputTypeText" />px</td>
-                </tr>
-                <tr>
-                    <td colspan="2" class="tCenter">{$lang->widget_margin_bottom} <input type="text" name="widget_margin_bottom" value="0" size="2" class="inputTypeText" />px</td>
-                </tr>
-                </table>
-                <p>{$lang->about_widget_margin}</p>
-            </td>
-        </tr>
         <!--@if(count($skin_list))-->
         <tr>
             <th scope="row">{$lang->skin}</th>

modules/widget/widget.controller.php

@@ -86,10 +86,7 @@
             // args 정리
             $attribute = array();
             if($vars) {
-                $vars->widget_position = "left";
-                $vars->widget_fix_width = "Y";
                 foreach($vars as $key => $val) {
-                    if($key == 'widget_position') continue;
                     if(strpos($val,'|@|')>0) {
                         $val = str_replace('|@|',',',$val);
                         $vars->{$key} = $val;