From 644ed8eb0570dd8d4390d4050f61a5a9b0155f9f Mon Sep 17 00:00:00 2001
From: MinSoo Kim <misol.kr@gmail.com>
Date: Thu, 28 Jan 2016 03:59:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B3=A0=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80,=20=EB=AA=A8=EB=B0=94=EC=9D=BC?=
 =?UTF-8?q?=20=EC=8B=A0=EA=B3=A0=20=ED=99=98=EA=B2=BD=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 신고 사유를 선택지 중 선택할 수 있게 함
- 팝업 메뉴의 스타일을 개선하여 모바일에서 적절하게 터치할 수 있게 함.
---
 common/css/xe.css                             | 35 +++++++++++++------
 common/js/common.js                           |  2 +-
 modules/document/document.controller.php      |  5 ++-
 modules/document/lang/lang.xml                | 34 ++++++++++++++++++
 modules/document/tpl/css/declare_document.css | 12 +++++++
 modules/document/tpl/declare_document.html    | 29 +++++++++++++--
 6 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100644 modules/document/tpl/css/declare_document.css

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 = $('<div id="popup_menu_area" tabindex="0" style="display:none;z-index:9999" />').appendTo(document.body);
+		if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;" />').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 @@
 		<value xml:lang="ko"><![CDATA[신고 이유]]></value>
 		<value xml:lang="en"><![CDATA[Reason]]></value>
 	</item>
+	<item name="improper_document_reasons" type="array">
+		<item name="advertisement">
+			<value xml:lang="ko"><![CDATA[주제나 흐름에 맞지 않는 광고 글입니다.]]></value>
+			<value xml:lang="en"><![CDATA[Advertisements that do not fit the topics or themes.]]></value>
+		</item>
+		<item name="theme">
+			<value xml:lang="ko"><![CDATA[주제에 맞지 않는 글입니다.]]></value>
+			<value xml:lang="en"><![CDATA[Posts that do not fit the topics or themes.]]></value>
+		</item>
+		<item name="bad_word">
+			<value xml:lang="ko"><![CDATA[과도한 욕설을 담고 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Too much bad words.]]></value>
+		</item>
+		<item name="violence">
+			<value xml:lang="ko"><![CDATA[폭력적인 내용을 담고 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Violence.]]></value>
+		</item>
+		<item name="racism">
+			<value xml:lang="ko"><![CDATA[인종차별적인 내용을 담고 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Racism.]]></value>
+		</item>
+		<item name="pornography">
+			<value xml:lang="ko"><![CDATA[음란물을 포함하고 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Pornography.]]></value>
+		</item>
+		<item name="privacy">
+			<value xml:lang="ko"><![CDATA[민감한 개인정보가 노출 되어있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Privacy issue.]]></value>
+		</item>
+		<item name="others">
+			<value xml:lang="ko"><![CDATA[기타(직접작성)]]></value>
+			<value xml:lang="en"><![CDATA[Others (Write your own)]]></value>
+		</item>
+	</item>
 	<item name="about_improper_document_declare">
 		<value xml:lang="ko"><![CDATA[게시글 신고 사유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.]]></value>
 		<value xml:lang="en"><![CDATA[Write here the reason you report this article as an improper document.]]></value>
diff --git a/modules/document/tpl/css/declare_document.css b/modules/document/tpl/css/declare_document.css
new file mode 100644
index 000000000..2d1bd7235
--- /dev/null
+++ b/modules/document/tpl/css/declare_document.css
@@ -0,0 +1,12 @@
+@charset "UTF-8";
+div.xe_mobile {
+	display:none!important;
+}
+section.declare_document{
+	position:relative;
+	display:block;
+}
+section.declare_document select,section.declare_document textarea{
+	width: 100%;
+	display:block;
+}
\ No newline at end of file
diff --git a/modules/document/tpl/declare_document.html b/modules/document/tpl/declare_document.html
index 9456b5cef..44cf13295 100644
--- a/modules/document/tpl/declare_document.html
+++ b/modules/document/tpl/declare_document.html
@@ -1,7 +1,9 @@
+{@Context::addMetaTag('viewport', 'width=device-width, user-scalable=no', FALSE);}
+<load target="./css/declare_document.css" />
 <div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/document/tpl/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-<section class="section">
+<section class="declare_document">
 	<h1>{$lang->improper_document_declare}</h1>
 	<form action="./" method="post" id="fo_component" ruleset="insertDeclare">
 		<input type="hidden" name="module" value="document" />
@@ -15,8 +17,11 @@
 				<p>{$target_document->getSummary(200)}</p>
 			</section>
 		</blockquote>
-		<label class="x_control-label" for="declare_message">{$lang->improper_document_declare_reason}</label>
+		<label class="x_control-label" for="message_option">{$lang->improper_document_declare_reason}</label>
 		<div class="x_controls">
+			<select name="message_option" id="message_option">
+				<option loop="$lang->improper_document_reasons => $key,$text" value="{$key}">{$text}</option>
+			</select>
 			<textarea name="declare_message" id="declare_message"></textarea>
 			<p>{$lang->about_improper_document_declare}<p>
 		</div>
@@ -28,5 +33,23 @@
 	</form>
 </section>
 <script>
-	jQuery(window).load(setFixedPopupSize);
+(function($){
+	var msg_area = $('textarea[name="declare_message"]');
+	$('select[name="message_option"]').change(function(){
+		var option = {
+			duration:200,
+			complete: function(){setFixedPopupSize();}
+		}
+		if ($(this).val()==='others') {
+			msg_area.slideDown(option);
+
+		}
+		else {
+			msg_area.slideUp(option);
+			setFixedPopupSize();
+		}
+	});
+	msg_area.hide();
+	$(window).load(setFixedPopupSize);
+})(jQuery);
 </script>
\ No newline at end of file