Merge pull request #658 from kijin/pr/fix-editor-in-other-modules

쪽지 및 에디터 관련 자잘한 수정 몇 가지

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:''});
 	}
 }
 

common/tpl/popup_layout.html

@@ -4,6 +4,8 @@
     {$content}
 </div>
 <script>
-	jQuery(window).load(setFixedPopupSize);
+	jQuery(function() {
+		setTimeout(setFixedPopupSize, 500);
+	});
     var _isPoped = true;
 </script>

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;

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 = '친구 그룹 삭제';

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}

modules/communication/skins/default/messages.html

@@ -2,13 +2,10 @@
 <load target="filter/delete_checked_message.xml" />
 <load target="filter/update_allow_message.xml" />
 <div class="btnArea">
-	<form action="./" method="GET" style="margin:0;display:inline-block;*display:inline;zoom:1" onsubmit="location.href=current_url.setQuery('message_srl','').setQuery('message_type',this.message_box.options[this.message_box.selectedIndex].value); return false;">
-		<select name="message_box" style="margin:0">
-			<option loop="$lang->message_box => $key,$val" selected="selected"|cond="$key==$message_type" value="{$key}" >{$val}</option>
-		</select>
-		<input type="submit" value="{$lang->cmd_select}" class="btn" />
-	</form>
-	<form action="./" method="POST" style="margin:0;display:inline-block;*display:inline;zoom:1">
+	<div style="margin:0;display:block;float:left" class="btn-group">
+		<button loop="$lang->message_box => $key,$val" class="btn" onclick="location.href=current_url.setQuery('message_srl', '').setQuery('message_type', '{$key}'); return false;" style="font-weight:bold"|cond="$message_type == $key">{$val}</button>
+	</div>
+	<form action="./" method="POST" style="margin:0;display:block;float:right">
 		<input type="hidden" name="module" value="communication" />
 		<input type="hidden" name="act" value="procCommunicationUpdateAllowMessage" />
 		<input type="hidden" name="message_type" value="{$message_type}" />
@@ -17,6 +14,7 @@
 		</select>
 		<input type="submit" value="{$lang->cmd_save}" class="btn">
 	</form>
+	<div style="clear:both"></div>
 </div>
 <table class="table table-striped table-hover" cond="$message">
 	<tr>

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;

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')