#18773235 Remove x-functions in the login widget skin.

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

widgets/login_info/skins/xe_official/js/login.js

@@ -1,14 +1,3 @@
-/* 로그인 영역에 포커스 */
-function doFocusUserId(fo_id) {
-    if(xScrollTop()) return;
-    var fo_obj = xGetElementById(fo_id);
-    if(fo_obj.user_id) {
-        try{
-            fo_obj.user_id.focus();
-        } catch(e) {};
-    }
-}
-
 /* 로그인 후 */
 function completeLogin(ret_obj, response_tags, params, fo_obj) {
     var url =  current_url.setQuery('act','');
@@ -21,16 +10,27 @@ function completeOpenIDLogin(ret_obj, response_tags) {
     location.href = redirect_url;
 }
 
-/* 오픈 아이디 폼 변환 */
+jQuery(function($){
-function toggleLoginForm(obj) {
+	// keep signed?
-    if(xGetElementById('login').style.display != "none") {
+	$('#keep_signed').click(function(){ if(this.checked) return confirm(xe.lang.about_keep_signed) });
-        xGetElementById('login').style.display = "none";
+
-        xGetElementById('openid_login').style.display = "block";
+	// toggle login form
-        xGetElementById('use_open_id_2').checked = true;
+	var $chk_openid =
-    } else {
+	$('#use_open_id,#use_open_id_2').click(function(){
-        xGetElementById('openid_login').style.display = "none";
+		$('#login').toggle().is(':hidden')?
-        xGetElementById('login').style.display = "block";
+			$chk_openid.attr('checked','checked') : 
-        xGetElementById('use_open_id').checked = false;
+			$chk_openid.removeAttr('checked');
-        xGetElementById('use_open_id_2').checked = false;
+
+		$('#openid_login').toggle();
+	});
+
+	// hide openid login form
+	$('#openid_login').hide();
+
+	// focus userid input box
+	if (!$(document).scrollTop()) {
+		try {
+			$('#fo_login_widget > input[name=user_id]').focus();
+		} catch(e){};
 	}
-}
+});

widgets/login_info/skins/xe_official/login_form.html

@@ -11,14 +11,10 @@
 <!--%import("./filter/openid_login.xml")-->
 <!--%import("./js/login.js")-->
 
-<script type="text/javascript">
-    var keep_signed_msg = "{$lang->about_keep_signed}";
-    xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
-</script>
-
 <fieldset id="login" class="login_{$colorset}">
 <legend>{$lang->cmd_login}</legend>
-<form action="./" method="post" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
+<form id="fo_login_widget" action="./" method="post">
+	<input type="hidden" name="_filter" value="widget_login" />
 
     <div class="idpwWrap">
         <div class="idpw">
@@ -27,20 +23,18 @@
         </div>
         <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
     </div>
-    <!--@if($member_config->enable_ssl=='Y')-->
+    <p cond="$member_config->enable_ssl=='Y'" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
-    <p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
         <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
     </p>
-    <!--@end-->
     <p class="save">
-        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
+        <input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
-        <label for="keepid">{$lang->keep_signed}</label>
+        <label for="keep_signed">{$lang->keep_signed}</label>
 
-        <!--@if($member_config->enable_openid=='Y')-->
+		<block cond="$member_config->enable_openid=='Y'">
         <br />
-        <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
+        <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" />
         <label for="use_open_id">Open ID</label>
-        <!--@end-->
+		</block>
     </p>
     <ul class="help">
         <li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
@@ -51,10 +45,10 @@
 </fieldset>
 
 <!-- OpenID -->
-<!--@if($member_config->enable_openid=='Y')-->
+<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;" cond="$member_config->enable_openid=='Y'">
-<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
 <legend>{$lang->cmd_login}</legend>
-  <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
+	<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post">
+	<input type="hidden" name="_filter" value="openid_login" />
       <div class="idpwWrap">
         <div class="idpw">
           <p>{$lang->openid}</p>
@@ -63,13 +57,12 @@
         <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
       </div>
       <p class="save">
-          <input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>
+          <input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" />
           <label for="use_open_id_2">Open ID</label>
       </p>
   </form>
 </fieldset>
-<!--@end-->
 
 <script type="text/javascript">
-  xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
+xe.lang.about_keep_signed = '{$lang->about_keep_signed}';
 </script>