From 5f38afe37e3c2300cf4a7326b3589cfda748dac5 Mon Sep 17 00:00:00 2001 From: taggon Date: Thu, 10 Feb 2011 06:16:36 +0000 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EB=A1=A4=EB=B0=B1?= 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@8085 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/lang/en.lang.php | 1 - modules/editor/lang/es.lang.php | 1 - modules/editor/lang/fr.lang.php | 1 - modules/editor/lang/jp.lang.php | 1 - modules/editor/lang/ko.lang.php | 1 - modules/editor/lang/ru.lang.php | 1 - modules/editor/lang/vi.lang.php | 1 - modules/editor/lang/zh-CN.lang.php | 1 - modules/editor/lang/zh-TW.lang.php | 1 - modules/editor/skins/dreditor/js/DrEditor.js | 35 +++++---- .../login_info/skins/xe_official/js/login.js | 42 ++++++----- .../skins/xe_official/login_form.html | 72 +++++++++++-------- 12 files changed, 81 insertions(+), 77 deletions(-) diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php index 7ce5a9de4..78ddb081d 100644 --- a/modules/editor/lang/en.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php index e9a2b2079..76c761182 100644 --- a/modules/editor/lang/es.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> \ No newline at end of file diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php index 9353c8365..3d62a0cff 100644 --- a/modules/editor/lang/fr.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> \ No newline at end of file diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php index 3b055fca3..b393c356d 100644 --- a/modules/editor/lang/jp.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index 9318f459c..6e4e59be8 100644 --- a/modules/editor/lang/ko.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> \ No newline at end of file diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php index 8e57e7d6f..9dca84645 100644 --- a/modules/editor/lang/ru.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> \ No newline at end of file diff --git a/modules/editor/lang/vi.lang.php b/modules/editor/lang/vi.lang.php index f864b8915..e24823878 100644 --- a/modules/editor/lang/vi.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> \ No newline at end of file diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php index 38fb4e595..f1d7efc0d 100644 --- a/modules/editor/lang/zh-CN.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php index 41e6c3e5a..bd0f19ab5 100644 --- a/modules/editor/lang/zh-TW.lang.php +++ b/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 = '도구 모음 더보기/접기'; ?> \ No newline at end of file diff --git a/modules/editor/skins/dreditor/js/DrEditor.js b/modules/editor/skins/dreditor/js/DrEditor.js index 58ddfb1ed..51470a3f6 100644 --- a/modules/editor/skins/dreditor/js/DrEditor.js +++ b/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 - .contents() - .each(function(){ - var $this = $(this); + div.contents().each(function(){ + var t = $(this); - if(this.nodeType == 3 || $this.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) { - if( $this.is('br,img') || $.trim($this.text()) ) { - if(!node) div.before(node = $('

')); - node.append(this); - } else { - $this.remove(); - } - return true; - } + if(this.nodeType == 3 || t.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) { + if( t.is('br,img') || $.trim(t.text()) ) { + if(!node) div.before(node = $('

')); + node.append(this); + } else { + t.remove(); + } + return true; + } - div.before($this); - node = null; - }) - .end() - .remove(); + div.before(t); + node = null; + }); + + div.remove(); }); }, API_OPEN_TXT_EDITOR : function(sender, params) { @@ -963,7 +961,6 @@ var TextWriter = xe.createPlugin('TextWriter', { if(save) { var newBox = $('

').html( cfg.xpress.getIR() ); - if (newBox.find('>p')) box.remove(); this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'TXT']); } else { diff --git a/widgets/login_info/skins/xe_official/js/login.js b/widgets/login_info/skins/xe_official/js/login.js index 770c82a19..7e44a5637 100644 --- a/widgets/login_info/skins/xe_official/js/login.js +++ b/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(); - $('#keepid').click(function(){ if(this.checked) return confirm(keep_signed_msg) }); - - /* focus on login form */ - if (!$(document).scrollTop()) $('#fo_login_widget input[name=user_id]').focus(); - - // show/hide openid form - $('#use_open_id,#use_open_id_2').click(function(){ - if($('#login').toggle().is(':visible')) { - $('#openid_login').hide(); - $('#use_open_id,#use_open_id_2').removeAttr('checked'); - } else { - $('#openid_login').show(); - $('#use_open_id_2').attr('checked', 'checked'); - } - }); -}); \ No newline at end of file +/* 오픈 아이디 폼 변환 */ +function toggleLoginForm(obj) { + if(xGetElementById('login').style.display != "none") { + xGetElementById('login').style.display = "none"; + xGetElementById('openid_login').style.display = "block"; + xGetElementById('use_open_id_2').checked = true; + } else { + xGetElementById('openid_login').style.display = "none"; + xGetElementById('login').style.display = "block"; + xGetElementById('use_open_id').checked = false; + xGetElementById('use_open_id_2').checked = false; + } +} diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html index 960d617b8..e6e49db8b 100644 --- a/widgets/login_info/skins/xe_official/login_form.html +++ b/widgets/login_info/skins/xe_official/login_form.html @@ -7,43 +7,52 @@ - - - + + + + + -