diff --git a/common/css/xe.css b/common/css/xe.css index 1c186ff08..de39e72c3 100644 --- a/common/css/xe.css +++ b/common/css/xe.css @@ -63,14 +63,16 @@ a img { /* Popup Menu Area */ #popup_menu_area { position: absolute; + z-index:9999; margin: 10px 0; - padding: 10px; - border: 1px solid #e9e9e9; - border-radius: 3px; + padding: 0; + border: 1px solid #eeeeee; + border-radius: 2px; font-size: 12px; - box-shadow: 0 0 6px #666; - filter: progid: DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5); + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); background: #fff; + min-width:80px; + outline:none; } #popup_menu_area ul { margin: 0; @@ -80,20 +82,31 @@ a img { #popup_menu_area li { margin: 0; padding: 0; - line-height: 1.25; + line-height: 1.5; } #popup_menu_area a { display: block; - padding: 1px 3px; - border-radius: 2px; + padding: 5px; text-decoration: none; - color: #333; + color: #212121; } #popup_menu_area a:hover, #popup_menu_area a:active, #popup_menu_area a:focus { - color: #fff; - background: #666; + background: #eeeeee; +} +@media screen and (max-width: 400px) { + #popup_menu_area { + min-width:120px; + max-width:95%; + font-size: 13px; + } + #popup_menu_area a { + display: block; + padding: 10px; + text-decoration: none; + color: #212121; + } } /* Message */ diff --git a/common/js/common.js b/common/js/common.js index ef829e480..29164bc60 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -945,7 +945,7 @@ jQuery(function($){ // display popup menu that contains member actions and document actions $(document).on('click', function(evt) { var $area = $('#popup_menu_area'); - if(!$area.length) $area = $('
').appendTo(document.body); + if(!$area.length) $area = $('').appendTo(document.body); // 이전에 호출되었을지 모르는 팝업메뉴 숨김 $area.hide(); diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 16abc0128..f0c35ee0f 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -194,8 +194,11 @@ class documentController extends document { if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); + $improper_document_reasons = Context::getLang('improper_document_reasons'); + $document_srl = Context::get('target_srl'); - $declare_message = Context::get('declare_message'); + $message_option = Context::get('message_option'); + $declare_message = ($message_option !== 'others' && isset($improper_document_reasons[$message_option]))? $improper_document_reasons[$message_option] : Context::get('declare_message'); if(!$document_srl) return new Object(-1, 'msg_invalid_request'); if(Context::get('success_return_url')) diff --git a/modules/document/lang/lang.xml b/modules/document/lang/lang.xml index f94be534d..6c397c3a8 100644 --- a/modules/document/lang/lang.xml +++ b/modules/document/lang/lang.xml @@ -977,6 +977,40 @@{$lang->about_improper_document_declare}