From 4e461986e4adbc8a814237ea99acf76efc8fd080 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 28 Sep 2010 04:32:59 +0000
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=EC=9D=B4=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=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/sandbox@7717 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../m.skins/default/filter/openid_login.xml   |  5 +---
 modules/message/m.skins/default/message.js    | 25 -------------------
 .../m.skins/default/system_message.html       | 14 +++++++----
 .../message/skins/default/system_message.html |  1 +
 4 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100644 modules/message/m.skins/default/message.js

diff --git a/modules/message/m.skins/default/filter/openid_login.xml b/modules/message/m.skins/default/filter/openid_login.xml
index a924c15d8..9b99b0dc3 100644
--- a/modules/message/m.skins/default/filter/openid_login.xml
+++ b/modules/message/m.skins/default/filter/openid_login.xml
@@ -3,8 +3,5 @@
         <node target="openid" required="true" />
     </form>
     <parameter />
-    <response callback_func="completeMessageOpenIDLogin">
-        <tag name="error" />
-        <tag name="message" />
-    </response>
+    <response />
 </filter>
diff --git a/modules/message/m.skins/default/message.js b/modules/message/m.skins/default/message.js
deleted file mode 100644
index 72d88e266..000000000
--- a/modules/message/m.skins/default/message.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 로그인 후 */
-function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
-    var url =  current_url.setQuery('act','');
-    location.href = url;
-}
-/* 오픈아이디 로그인 후 */
-function completeMessageOpenIDLogin(ret_obj, response_tags) {
-    var redirect_url =  ret_obj['redirect_url'];
-    location.href = redirect_url;
-}
-/* 로그인 폼 토글 */
-$(function($){
-	var gLogin = $('#gLogin');
-	var oLogin = $('#oLogin');
-	oLogin.hide();
-	$('a[href=#oLogin]').click(function(){
-		gLogin.hide();
-		oLogin.show();
-	});
-	$('a[href=#gLogin]').click(function(){
-		gLogin.show();
-		oLogin.hide();
-	});
-});
-
diff --git a/modules/message/m.skins/default/system_message.html b/modules/message/m.skins/default/system_message.html
index da0525008..483f96c8e 100644
--- a/modules/message/m.skins/default/system_message.html
+++ b/modules/message/m.skins/default/system_message.html
@@ -1,16 +1,20 @@
 <!--%import("message.css")-->
-<!--%import("../../common/js/jquery.js")-->
 <div class="bd">
 	<div class="hx h2">
 		<h2>{$system_message}</h2>
 	</div>
 	<div class="co">
 		<!--@if(!$is_logged)-->
+        {@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/x.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
 		<!--%import("./filter/login.xml")-->
 		<!--%import("./filter/openid_login.xml")-->
-		<!--%import("./message.js")-->
 		<div class="mLogin" id="gLogin">
-			<form action="./" method="post" onsubmit="return doLogin(this, message_login)" id="gForm" class="ff">
+			<form action="./" method="post" onsubmit="return procFilter(this, message_login)" id="gForm" class="ff">
 				<fieldset>
 					<ul>
 						<li><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" value="" /></li>
@@ -34,7 +38,7 @@
 		<!-- OpenID -->
 		<!--@if($member_config->enable_openid=='Y')-->
 		<div class="mLogin" id="oLogin">
-			<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm" class="ff">
+			<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="oForm" class="ff">
 				<fieldset>
 					<ul>
 						<li><label for="openid">Open ID</label><input type="text" name="openid" id="openid" value="" /></li>
@@ -56,4 +60,4 @@
 		</div>
 		<!--@end-->
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html
index 989013c50..71f7dc475 100644
--- a/modules/message/skins/default/system_message.html
+++ b/modules/message/skins/default/system_message.html
@@ -3,6 +3,7 @@
 <div id="loginAccess" class="gLogin">
 	<h1>{$system_message}</h1>
 	<!--@if(!$is_logged)-->
+    <!--%import("../../../../common/js/jquery.js")-->
 	<!--%import("./filter/login.xml")-->
 	<!--%import("./filter/openid_login.xml")-->
 	<!--%import("./message.js")-->