diff --git a/common/js/common.js b/common/js/common.js index a420790b0..cd79e60eb 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -511,17 +511,17 @@ function setFixedPopupSize() { if(w < 800) w = 800 + offset.left*2; - dw = $win.width(); dh = $win.height(); // Window 의 너비나 높이는 스크린의 너비나 높이보다 클 수 없다. 스크린의 너비나 높이와 내용의 너비나 높이를 비교해서 최소값을 이용한다. - if(Math.min(w, window.screen.availWidth) != dw) window.resizeBy(Math.min(w, window.screen.availWidth) - dw, 0); - if(Math.min(h, window.screen.availHeight-100) != dh) window.resizeBy(0, Math.min(h, window.screen.availHeight-100) - dh); + w = Math.min(w, window.screen.availWidth); + h = Math.min(h, window.screen.availHeight - 100); + window.resizeBy(w - dw, h - dh); - $pc.width(Math.min(w, window.screen.availWidth)-offset.left*2).css({overflow:'',height:''}); - if(Math.min(h, window.screen.availHeight-100) === window.screen.availHeight-100) { - $pc.width(Math.min(w, window.screen.availWidth)-offset.left*2-scbw).css({overflow:'',height:''}); + $pc.width(w - offset.left*2).css({overflow:'',height:''}); + if(h === window.screen.availHeight - 100) { + $pc.width(w - offset.left*2-scbw).css({overflow:'',height:''}); } } diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html index ac0d1ed18..0de748562 100644 --- a/common/tpl/popup_layout.html +++ b/common/tpl/popup_layout.html @@ -4,6 +4,8 @@ {$content} diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 28e043767..e87e4842a 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -230,7 +230,7 @@ class communicationView extends communication // set a signiture by calling getEditor of the editor module $oEditorModel = getModel('editor'); - $option = new stdClass(); + $option = $oEditorModel->getEditorConfig(); $option->primary_key_name = 'receiver_srl'; $option->content_key_name = 'content'; $option->allow_fileupload = FALSE; diff --git a/modules/communication/lang/ko.php b/modules/communication/lang/ko.php index 9b4548cdd..b54c193a7 100644 --- a/modules/communication/lang/ko.php +++ b/modules/communication/lang/ko.php @@ -3,7 +3,7 @@ $lang->communication = '커뮤니케이션'; $lang->about_communication = '회원 간의 쪽지나 친구 관리 등 커뮤니케이션 기능을 수행합니다. 이 기능을 사용하려면 [설치된 애드온] > [커뮤니케이션] 애드온을 활성화 하세요.'; $lang->allow_message = '쪽지 수신 허용'; $lang->allow_message_type['Y'] = '전체 수신'; -$lang->allow_message_type['N'] = '거부'; +$lang->allow_message_type['N'] = '수신 거부'; $lang->allow_message_type['F'] = '친구만 허용'; $lang->message_box['R'] = '받은 쪽지함'; $lang->message_box['S'] = '보낸 쪽지함'; @@ -14,12 +14,12 @@ $lang->receiver = '받는이'; $lang->friend_group = '친구 그룹'; $lang->default_friend_group = '그룹 미지정'; $lang->cmd_send_message = '쪽지 보내기'; -$lang->cmd_reply_message = '쪽지 답장'; +$lang->cmd_reply_message = '답장 보내기'; $lang->cmd_view_friend = '친구 보기'; $lang->cmd_add_friend = '친구 등록'; $lang->cmd_message_box = '쪽지함'; $lang->cmd_view_message_box = '쪽지함 보기'; -$lang->cmd_store = '보관'; +$lang->cmd_store = '보관함 이동'; $lang->cmd_add_friend_group = '친구 그룹 추가'; $lang->cmd_rename_friend_group = '친구 그룹 이름 변경'; $lang->cmd_delete_friend_group = '친구 그룹 삭제'; diff --git a/modules/communication/skins/default/css/communication.css b/modules/communication/skins/default/css/communication.css index 920d6c7fe..35d32db78 100644 --- a/modules/communication/skins/default/css/communication.css +++ b/modules/communication/skins/default/css/communication.css @@ -195,7 +195,7 @@ .xc .nav-tabs>.active>a:hover, .xc .nav-tabs>.active>a:focus{color:#555555;cursor:default;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent} /* Table */ -.xc .table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;width:100%;margin-bottom:20px} +.xc .table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;width:100%;margin-bottom:0} .xc .table th, .xc .table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd} .xc .table th{font-weight:bold} diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html index 2af0cd83c..8b7934a23 100644 --- a/modules/communication/skins/default/messages.html +++ b/modules/communication/skins/default/messages.html @@ -2,13 +2,10 @@
-
- - -
-
+
+ +
+ @@ -17,6 +14,7 @@
+
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 4ef43a246..336bcda02 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -164,8 +164,7 @@ class memberAdminView extends member Context::set('editor_skin_list', $oEditorModel->getEditorSkinList()); // get an editor - $option = new stdClass(); - $option->skin = $oEditorModel->getEditorConfig()->editor_skin; + $option = $oEditorModel->getEditorConfig(); $option->primary_key_name = 'temp_srl'; $option->content_key_name = 'agreement'; $option->allow_fileupload = false; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index a3e54dd34..147680318 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -311,7 +311,7 @@ class memberView extends member if($member_info->member_srl) { $oEditorModel = getModel('editor'); - $option = new stdClass(); + $option = $oEditorModel->getEditorConfig(); $option->primary_key_name = 'member_srl'; $option->content_key_name = 'signature'; if($member_config->member_allow_fileupload === 'Y')