diff --git a/common/js/common.js b/common/js/common.js index 775b01f04..3cbb3e76c 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -83,6 +83,36 @@ function winopen(url, target, attribute) { if(target != "_blank") winopen_list[target] = win; } +/** + * @brief 팝업으로만 띄우기 + * common/tpl/popup_layout.html이 요청되는 제로보드 XE내의 팝업일 경우에 사용 + **/ +function popopen(url, target) { + if(typeof(target)=="undefined") target = "_blank"; + winopen(url, target, "left=10,top=10,width=10,height=10,scrollbars=no,resizable=no,toolbars=no"); +} + +/** + * @brief 메일 보내기용 + **/ +function sendMailTo(to) { + location.href="mailto:"+to; +} + +/** + * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움) + **/ +function move_url(url, open_wnidow) { + if(!url) return false; + if(typeof(open_wnidow)=='undefined') open_wnidow = 'N'; + if(open_wnidow=='Y') { + winopen(url); + } else { + location.href=url; + } + return false; +} + /** * @brief 특정 div(or span...)의 display옵션 토글 **/ @@ -196,27 +226,6 @@ function svc_folder_close(id) { folder_obj.style.display = "none"; } -/** - * @brief 메일 보내기용 - **/ -function sendMailTo(to) { - location.href="mailto:"+to; -} - -/** - * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움) - **/ -function move_url(url, open_wnidow) { - if(!url) return false; - if(typeof(open_wnidow)=='undefined') open_wnidow = 'N'; - if(open_wnidow=='Y') { - winopen(url); - } else { - location.href=url; - } - return false; -} - /** * @brief 팝업의 경우 내용에 맞춰 현 윈도우의 크기를 조절해줌 * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js index 12c53651f..36b0ae797 100644 --- a/common/js/xml_handler.js +++ b/common/js/xml_handler.js @@ -19,8 +19,6 @@ function exec_xml(module, act, params, callback_func, response_tags, callback_fu if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = new Array('error','message'); - response_tags[response_tags.length] = "redirect_url"; - if(show_waiting_message) { var waiting_obj = xGetElementById("waitingforserverresponse"); waiting_obj.style.visibility = "visible"; @@ -126,15 +124,18 @@ function xml_handlerGetResponseXML() { function xml_handlerToZMsgObject(xmlDoc, tags) { if(!xmlDoc) return null; - if(!tags) { - tags = new Array("error","message"); - } + if(!tags) tags = new Array("error","message"); + tags[tags.length] = "redirect_url"; + tags[tags.length] = "act"; + var obj_ret = new Array(); for(var i=0; i
-
@@ -63,7 +62,7 @@ - +
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index d862d3c63..68f3406a1 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -1,6 +1,6 @@ - +
{$lang->document_count} : {number_format($total_count)}, {$lang->page_count} : {number_format($page)} / {number_format($total_page)} @@ -71,7 +71,7 @@ - +
diff --git a/modules/editor/conf/info.xml b/modules/editor/conf/info.xml index 731cdd445..c8230b0f5 100644 --- a/modules/editor/conf/info.xml +++ b/modules/editor/conf/info.xml @@ -1,8 +1,8 @@ - 위지윅 에디터 - - 제로 - 위지윅 에디터를 출력하거나 에디터 컴포넌트들을 관리/중계하는 모듈입니다. - + 위지윅 에디터 + + 제로 + 위지윅 에디터를 출력하거나 에디터 컴포넌트들을 관리/중계하는 모듈입니다. + diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html index fb41f8353..901958120 100644 --- a/modules/editor/tpl/admin_index.html +++ b/modules/editor/tpl/admin_index.html @@ -1,4 +1,4 @@ - + diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index caa8ccf8c..d52651eb0 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -371,7 +371,7 @@ function openComponent(component_name, upload_target_srl, manual_url) { var popup_url = "./?module=editor&act=dispEditorPopup&upload_target_srl="+upload_target_srl+"&component="+component_name; if(typeof(manual_url)!="undefined" && manual_url) popup_url += "&manual_url="+escape(manual_url); - winopen(popup_url, 'editorComponent', 'left=10,top=10,width=10,height=10,toolbars=no,scrollbars=no'); + popopen(popup_url, 'editorComponent'); } // 더블클릭 이벤트 발생시에 본문내에 포함된 컴포넌트를 찾는 함수 @@ -396,7 +396,7 @@ function editorSearchComponent(evt) { var upload_target_srl = tobj.getAttribute("upload_target_srl"); var plugin = obj.getAttribute("plugin"); editorPrevNode = obj; - winopen("?module=plugin&act=dispPluginGenerateCodeInPage&selected_plugin="+plugin+"&module_srl="+upload_target_srl,'GenerateCodeInPage','left=10,top10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no'); + popopen("?module=plugin&act=dispPluginGenerateCodeInPage&selected_plugin="+plugin+"&module_srl="+upload_target_srl,'GenerateCodeInPage'); return; } diff --git a/modules/editor/tpl/js/admin.js b/modules/editor/tpl/js/editor_admin.js similarity index 83% rename from modules/editor/tpl/js/admin.js rename to modules/editor/tpl/js/editor_admin.js index 9aa389915..9f0279e70 100644 --- a/modules/editor/tpl/js/admin.js +++ b/modules/editor/tpl/js/editor_admin.js @@ -32,5 +32,5 @@ function completeUpdate(ret_obj) { } function doSetupComponent(component_name) { - winopen("./?module=editor&act=dispEditorAdminSetupComponent&component_name="+component_name, "SetupComponent","width=10,height=10,scrollbars=no,resizable=no,toolbars=no"); + popopen("./?module=editor&act=dispEditorAdminSetupComponent&component_name="+component_name, "SetupComponent"); } diff --git a/modules/editor/tpl/lang/ko.lang.php b/modules/editor/tpl/lang/ko.lang.php index cbc7d32c7..a2317ab10 100644 --- a/modules/editor/tpl/lang/ko.lang.php +++ b/modules/editor/tpl/lang/ko.lang.php @@ -1,8 +1,8 @@ - * @desc : 한국어 언어팩 (기본적인 내용만 수록) + * @file modules/editor/tpl/lang/ko.lang.php + * @author zero + * @brief 한국어 언어팩 (기본적인 내용만 수록) **/ $lang->edit->fontname = '폰트';