Merge pull request #943 from bjrambo/pr/display-to-send

메세지 보낼때 수신거부인지 확인하여 경고 메세지를 띄움.
This commit is contained in:
BJRambo 2017-11-21 01:05:24 +09:00 committed by GitHub
commit cb2920bc99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 100 additions and 1 deletions

View file

@ -189,6 +189,24 @@ class communicationMobile extends communicationView
}
Context::set('receiver_info', $receiver_info);
// set a signiture by calling getEditor of the editor module
$oEditorModel = getModel('editor');
$option = $oEditorModel->getEditorConfig();
$option->primary_key_name = 'receiver_srl';
$option->content_key_name = 'content';
$option->allow_fileupload = FALSE;
$option->enable_autosave = FALSE;
$option->enable_default_component = TRUE; // FALSE;
$option->enable_component = FALSE;
$option->resizable = FALSE;
$option->disable_html = TRUE;
$option->height = 300;
$option->skin = $this->config->editor_skin;
$option->colorset = $this->config->editor_colorset;
$editor = $oEditorModel->getEditor($logged_info->member_srl, $option);
Context::set('editor', $editor);
$this->setTemplateFile('send_message');
}

View file

@ -43,3 +43,7 @@ $lang->cmd_manage_base = '기본 정보';
$lang->alert_new_message_arrived = '%d개의 새로운 메시지가 도착하였습니다. 확인하시겠습니까?';
$lang->enable_communication_friend = '친구기능 사용';
$lang->enable_communication_message = '쪽지기능 사용';
$lang->warning = '알려드립니다!';
$lang->msg_allow_message_friend = '현재 회원님은 친구에게만 수신 가능한 상태입니다.';
$lang->msg_allow_meesage_Block = '현재 회원님은 수신거부 상태입니다.';
$lang->msg_allow_message_please = '전송하는 쪽지에 대한 답변을 받기 위해서는 모두에게 전송을 허용해야합니다.';

View file

@ -126,3 +126,22 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
.sh select{width:80px;font-size:14px;margin:0 0 5px 0}
.sh input[type=text]{width:160px;margin:0;font-size:14px;padding:5px}
.sh .shbn{width:28px;height:28px;border:1px solid #666;background:#777 url(../img/mx.png) no-repeat 5px -60px;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;cursor:pointer}
/**
* warning label from modules\admin\tpl\css\admin.bootstrap.css
*/
.warning_label{
display:inline-block;
margin-top:10px;
padding:2px 4px;
font-size:11.844px;
font-weight:bold;
line-height:14px;
color:#ffffff;
text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);
-webkit-border-radius:3px;
-moz-border-radius:3px;
border-radius:3px;
box-sizing:border-box;
}
.warning_label-important{background-color:#b94a48}

View file

@ -7,6 +7,16 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/m.skins/default/send_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="warning_label warning_label-important" cond="$logged_info->allow_message !== 'Y'">
{$lang->warning}
<br>
<!--@if($logged_info->allow_message == 'F')-->
{$lang->msg_allow_message_friend}
<!--@elseif($logged_info->allow_message == 'N')-->
{$lang->msg_allow_meesage_Block}
<!--@end-->
<br>{$lang->msg_allow_message_please}
</div>
<form ruleset="sendMessage" action="./" method="post" class="ff" id="fo_comm">
<input type="hidden" name="module" value="communication" />
<input type="hidden" name="is_popup" value="Y" />

View file

@ -465,3 +465,21 @@ script, style
}
}
/**
* warning label from modules\admin\tpl\css\admin.bootstrap.css
*/
.warning_label{
display:inline-block;
margin:5px 15px !important;
padding:2px 4px;
font-size:11.844px;
font-weight:bold;
line-height:14px;
color:#ffffff;
text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);
-webkit-border-radius:3px;
-moz-border-radius:3px;
border-radius:3px;
box-sizing:border-box;
}
.warning_label-important{background-color:#b94a48}

View file

@ -6,6 +6,16 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/rx_prn/send_message/1'" class="rx_prn-notice {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="warning_label warning_label-important" cond="$logged_info->allow_message !== 'Y'">
{$lang->warning}
<br>
<!--@if($logged_info->allow_message == 'F')-->
{$lang->msg_allow_message_friend}
<!--@elseif($logged_info->allow_message == 'N')-->
{$lang->msg_allow_meesage_Block}
<!--@end-->
<br>{$lang->msg_allow_message_please}
</div>
<form ruleset="sendMessage" action="./" method="post">
<input type="hidden" name="module" value="communication" />
<input type="hidden" name="act" value="procCommunicationSendMessage" />

View file

@ -5,6 +5,16 @@
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/communication/skins/default/send_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="x_label x_label-important" cond="$logged_info->allow_message !== 'Y'">
{$lang->warning}
<br>
<!--@if($logged_info->allow_message == 'F')-->
{$lang->msg_allow_message_friend}
<!--@elseif($logged_info->allow_message == 'N')-->
{$lang->msg_allow_meesage_Block}
<!--@end-->
<br>{$lang->msg_allow_message_please}
</div>
<form ruleset="sendMessage" action="./" method="post">
<input type="hidden" name="module" value="communication" />
<input type="hidden" name="act" value="procCommunicationSendMessage" />

View file

@ -18,6 +18,16 @@
<input type="text" name="title" id="message_title" value="{$source_message->title}" />
<label for="message_send_mail"><input type="checkbox" value="Y" name="send_mail" id="message_send_mail" /> {$lang->cmd_send_mail}</label>
<div class="rx_member-notice info">{$lang->msg_send_mail_privacy}</div>
<div class="rx_member-notice info" cond="$logged_info->allow_message !== 'Y'">
{$lang->warning}
<br>
<!--@if($logged_info->allow_message == 'F')-->
{$lang->msg_allow_message_friend}
<!--@elseif($logged_info->allow_message == 'N')-->
{$lang->msg_allow_meesage_Block}
<!--@end-->
<br>{$lang->msg_allow_message_please}
</div>
</div>
{$editor}
<div class="control-group">
@ -25,4 +35,4 @@
</div>
</form>
</section>
<include target="./common_footer.html" />
<include target="./common_footer.html" />