다른 변경사항 롤백

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

modules/editor/lang/en.lang.php

@@ -275,5 +275,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/es.lang.php

@@ -271,5 +271,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/fr.lang.php

@@ -275,5 +275,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/jp.lang.php

@@ -277,5 +277,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/ko.lang.php

@@ -277,5 +277,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/ru.lang.php

@@ -277,5 +277,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/vi.lang.php

@@ -278,5 +278,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/zh-CN.lang.php

@@ -277,5 +277,4 @@
 	$lang->edit->autosave_mins_ago = '%d분 전';
 	
 	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/lang/zh-TW.lang.php

@@ -278,5 +278,4 @@
 	$lang->edit->autosave_mins_ago = '%d分前';
 	
 	$lang->edit->upload_not_enough_quota   = '已超過上傳大小限制無法上傳附檔。';
-	$lang->edit->toolbar_moreless = '도구 모음 더보기/접기';
 ?>

modules/editor/skins/dreditor/js/DrEditor.js

@@ -895,26 +895,24 @@ var TextWriter = xe.createPlugin('TextWriter', {
 		obj.children('div._txt').each(function(){
 			var div = $(this), node = null;
 
-			div
+			div.contents().each(function(){
-				.contents()
+				var t = $(this);
-					.each(function(){
-						var $this = $(this);
 
-						if(this.nodeType == 3 || $this.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) {
+				if(this.nodeType == 3 || t.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) {
-							if( $this.is('br,img') || $.trim($this.text()) ) {
+					if( t.is('br,img') || $.trim(t.text()) ) {
-								if(!node) div.before(node = $('<p>'));
+						if(!node) div.before(node = $('<p>'));
-								node.append(this);
+						node.append(this);
-							} else {
+					} else {
-								$this.remove();
+						t.remove();
-							}
+					}
-							return true;
+					return true;
-						}
+				}
 
-						div.before($this);
+				div.before(t);
-						node = null;
+				node = null;
-					})
+			});
-					.end()
+
-				.remove();
+			div.remove();
 		});
 	},
 	API_OPEN_TXT_EDITOR : function(sender, params) {
@@ -963,7 +961,6 @@ var TextWriter = xe.createPlugin('TextWriter', {
 
 		if(save) {
 			var newBox  = $('<div>').html( cfg.xpress.getIR() );
-			if (newBox.find('>p'))
 			box.remove();
 			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'TXT']);
 		} else {

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

@@ -1,3 +1,14 @@
+/* 로그인 영역에 포커스 */
+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','');
@@ -10,21 +21,16 @@ function completeOpenIDLogin(ret_obj, response_tags) {
     location.href = redirect_url;
 }
 
-jQuery(function($){
+/* 오픈 아이디 폼 변환 */
-	$('#openid_login').hide();
+function toggleLoginForm(obj) {
-	$('#keepid').click(function(){ if(this.checked) return confirm(keep_signed_msg) });
+    if(xGetElementById('login').style.display != "none") {
-
+        xGetElementById('login').style.display = "none";
-	/* focus on login form */
+        xGetElementById('openid_login').style.display = "block";
-	if (!$(document).scrollTop()) $('#fo_login_widget input[name=user_id]').focus();
+        xGetElementById('use_open_id_2').checked = true;
-	
+    } else {
-	// show/hide openid form
+        xGetElementById('openid_login').style.display = "none";
-	$('#use_open_id,#use_open_id_2').click(function(){
+        xGetElementById('login').style.display = "block";
-		if($('#login').toggle().is(':visible')) {
+        xGetElementById('use_open_id').checked = false;
-			$('#openid_login').hide();
+        xGetElementById('use_open_id_2').checked = false;
-			$('#use_open_id,#use_open_id_2').removeAttr('checked');
+    }
-		} else {
+}
-			$('#openid_login').show();
-			$('#use_open_id_2').attr('checked', 'checked');
-		}
-	});
-});

widgets/login_info/skins/xe_official/login_form.html

@@ -7,43 +7,52 @@
     <!--%import("css/default.css")-->
 <!--@end-->
 
-<load target="./filter/login.xml" />
+<!--%import("./filter/login.xml")-->
-<load target="./filter/openid_login.xml" />
+<!--%import("./filter/openid_login.xml")-->
-<load target="./js/login.js" />
+<!--%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">
-	<div class="idpwWrap">
-		<div class="idpw">
-			<input name="user_id" type="text" title="user id" />
-			<input name="password" type="password" title="password" />
-		</div>
-		<input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
-	</div>
-	<p class="securitySignIn SSL"|cond="$ssl_mode" class="securitySignIn noneSSL"|cond="!$ssl_mode" cond="$member_config->enable_ssl=='Y'">
-		<a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
-	</p>
-	<p class="save">
-		<input type="checkbox" name="keep_signed" id="keepid" value="Y" />
-		<label for="keepid">{$lang->keep_signed}</label>
 
-		<block cond="$member_config->enable_openid=='Y'">
+    <div class="idpwWrap">
-		<br />
+        <div class="idpw">
-		<input name="use_open_id" id="use_open_id" type="checkbox" value="Y" />
+            <input name="user_id" type="text" title="user id" />
-		<label for="use_open_id">Open ID</label>
+            <input name="password" type="password" title="password" />
-		</block>
+        </div>
-	</p>
+        <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
-	<ul class="help">
+    </div>
-		<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+    <!--@if($member_config->enable_ssl=='Y')-->
-		<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
+    <p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
-		<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
+        <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
-	</ul>
+    </p>
+    <!--@end-->
+    <p class="save">
+        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
+        <label for="keepid">{$lang->keep_signed}</label>
+
+        <!--@if($member_config->enable_openid=='Y')-->
+        <br />
+        <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
+        <label for="use_open_id">Open ID</label>
+        <!--@end-->
+    </p>
+    <ul class="help">
+        <li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+        <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
+        <li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
+    </ul>
 </form> 
 </fieldset>
 
 <!-- OpenID -->
-<fieldset id="openid_login" class="openid_login_{$colorset}" cond="$member_config->enable_openid=='Y'">
+<!--@if($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)" >
       <div class="idpwWrap">
@@ -54,12 +63,13 @@
         <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"/>
+          <input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>
           <label for="use_open_id_2">Open ID</label>
       </p>
   </form>
 </fieldset>
+<!--@end-->
 
 <script type="text/javascript">
-var keep_signed_msg = "{$lang->about_keep_signed}";
+  xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
-</script>
+</script>