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

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 팝업의 경우 내용에 맞춰 현 윈도우의 크기를 조절해줌 
  * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ

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<tags.length; i++) {
+        var key = tags[i];
+        if(obj_ret[key]) continue;
         try {
-            obj_ret[tags[i]] = xmlDoc.getElementsByTagName(tags[i])[0].firstChild.nodeValue;
+            obj_ret[key] = xmlDoc.getElementsByTagName(tags[i])[0].firstChild.nodeValue;
         } catch(e) {
-            obj_ret[tags[i]] = "";
+            obj_ret[key] = "";
         }
     }
     return obj_ret;

common/js/xml_js_filter.js

@@ -17,11 +17,17 @@ var target_type_list = new Array();
 function filterAlertMessage(ret_obj) {
     var error = ret_obj["error"];
     var message = ret_obj["message"];
+    var act = ret_obj["act"];
     var redirect_url = ret_obj["redirect_url"];
     var url = location.href;
-    if(url.substr(-1)=='#') url = url.substr(0,url.length-1);
-    if(typeof(message)!='undefined'&&message&&message!='success') alert(message);
-    if(typeof(redirect_url)!='undefined'&&redirect_url) url = redirect_url;
+
+    if(url.substr(-1)=="#") url = url.substr(0,url.length-1);
+
+    if(typeof(message)!="undefined"&&message&&message!="success") alert(message);
+
+    if(typeof(act)!="undefined" && act) url = location.href.setQuery("act", act);
+    else if(typeof(redirect_url)!="undefined" && redirect_url) url = redirect_url;
+
     location.href = url;
 }
 

modules/comment/tpl/comment_list.html

@@ -51,7 +51,6 @@
 <div>
     <form action="./" method="get">
         <input type="hidden" name="module" value="{$module}" />
-        <input type="hidden" name="mo" value="{$mo}" />
         <input type="hidden" name="act" value="{$act}" />
 
         <div>
@@ -63,7 +62,7 @@
             </select>
             <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
             <input type="submit" value="{$lang->cmd_search}" />
-            <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','module',$module,'mo',$mo,'act',$act)}'"/>
+            <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','module',$module,'act',$act)}'"/>
         </div>
     </form>
 </div>

modules/document/tpl/document_list.html

@@ -1,6 +1,6 @@
 <!--%import("filter/delete_checked.xml")-->
 
-<!-- 게시판 정보 -->
+<!-- 문서 정보 -->
 <div>
     {$lang->document_count} : {number_format($total_count)}, 
     {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
@@ -71,7 +71,7 @@
             </select>
             <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
             <input type="submit" value="{$lang->cmd_search}" />
-            <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','module',$module,'mo',$mo,'act',$act)}'"/>
+            <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('','module',$module,'act',$act)}'"/>
         </div>
     </form>
 </div>

modules/editor/conf/info.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module version="0.1">
-  <title xml:lang="ko">위지윅 에디터 </title>
-  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">제로</name>
-    <description xml:lang="ko">위지윅 에디터를 출력하거나 에디터 컴포넌트들을 관리/중계하는 모듈입니다.</description>
-  </author>
+    <title xml:lang="ko">위지윅 에디터 </title>
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">제로</name>
+        <description xml:lang="ko">위지윅 에디터를 출력하거나 에디터 컴포넌트들을 관리/중계하는 모듈입니다.</description>
+    </author>
 </module>

modules/editor/tpl/admin_index.html

@@ -1,4 +1,4 @@
-<!--%import("js/admin.js")-->
+<!--%import("js/editor_admin.js")-->
 
 <table border="1">
 <tr>

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;
     }
 

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");
 }

modules/editor/tpl/lang/ko.lang.php

@@ -1,8 +1,8 @@
 <?php
   /**
-   * @file   : editor/lang/ko.lang.php
-   * @author : zero <zero@nzeo.com>
-   * @desc   : 한국어 언어팩 (기본적인 내용만 수록)
+   * @file   modules/editor/tpl/lang/ko.lang.php
+   * @author zero <zero@nzeo.com>
+   * @brief  한국어 언어팩 (기본적인 내용만 수록)
    **/
 
   $lang->edit->fontname = '폰트';