From 45c4da14e21e4588584b3dc3d7568b4b87367a82 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 4 Jul 2020 00:22:13 +0900
Subject: [PATCH] Fix #1318 comment report form template

---
 modules/comment/tpl/css/declare_comment.css | 22 +++---
 modules/comment/tpl/declare_comment.html    | 86 ++++++++++-----------
 2 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/modules/comment/tpl/css/declare_comment.css b/modules/comment/tpl/css/declare_comment.css
index 5e6e52041..983d0d1af 100644
--- a/modules/comment/tpl/css/declare_comment.css
+++ b/modules/comment/tpl/css/declare_comment.css
@@ -2,18 +2,16 @@
 div.xe_mobile {
 	display:none!important;
 }
-section.declare_comment{
-	display:block;
+select#message_option {
+	clear: both;
+	width: 90%;
+	margin-bottom: 8px;
 }
-section.declare_comment label{
-	font-weight: bold;
-}
-section.declare_comment select,section.declare_comment textarea{
-	box-sizing:border-box;
-	height:auto;
+
+textarea#declare_message {
 	width: 100%;
-	padding:7px;
-	font-size: 11pt;
-	line-height: normal;
-	display:block;
+	height: 80px;
+	margin-bottom: 8px;
+	box-sizing: border-box;
+	display: none;
 }
\ No newline at end of file
diff --git a/modules/comment/tpl/declare_comment.html b/modules/comment/tpl/declare_comment.html
index 2740be0e1..5ce687458 100644
--- a/modules/comment/tpl/declare_comment.html
+++ b/modules/comment/tpl/declare_comment.html
@@ -1,56 +1,54 @@
 {@Context::addMetaTag('viewport', 'width=device-width, user-scalable=no', FALSE);}
 <load target="./css/declare_comment.css" />
-<script cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/1'">
-	alert("{$XE_VALIDATOR_MESSAGE}");
-	window.close();
-</script>
-<section class="declare_comment">
-	<h1>{$lang->improper_comment_declare}</h1>
-	<form action="./" method="post" id="fo_component" ruleset="insertDeclare">
-		<input type="hidden" name="module" value="comment" />
-		<input type="hidden" name="act" value="procCommentDeclare" />
-		<input type="hidden" name="target_srl" value="{$target_srl}" />
-		<input type="hidden" name="success_return_url" value="{getUrl('', 'act', $act, 'target_srl', $target_srl)}" />
-		<input type="hidden" name="xe_validator_id" value="modules/comment/tpl/1" />
+<form action="./" method="post" id="fo_component" ruleset="insertDeclare">
+	<input type="hidden" name="module" value="comment" />
+	<input type="hidden" name="act" value="procCommentDeclare" />
+	<input type="hidden" name="target_srl" value="{$target_srl}" />
+	<input type="hidden" name="success_return_url" value="{getUrl('', 'act', $act, 'target_srl', $target_srl)}" />
+	<input type="hidden" name="xe_validator_id" value="modules/comment/tpl/1" />
+	<div class="x_modal-header">
+		<h1>{$lang->improper_comment_declare} <!--@if($type == 'cancel')-->{$lang->cmd_cancel}<!--@end--></h1>
+	</div>
+	<div class="x_modal-body x_form-horizontal" style="max-height:none">
 		<blockquote>
 			<section class="target_article">
 				<h1>{$lang->replies}</h1>
 				<p>{$target_comment->getSummary(200)}</p>
 			</section>
 		</blockquote>
-		<label class="x_control-label" for="message_option">{$lang->improper_comment_declare_reason}</label>
-		<div class="x_controls">
-			<select name="message_option" id="message_option">
-				<option loop="$lang->improper_comment_reasons => $key,$text" value="{$key}">{$text}</option>
-			</select>
-			<textarea name="declare_message" id="declare_message"></textarea>
-			<p>{$lang->about_improper_comment_declare}<p>
-		</div>
-		<div class="x_clearfix btnArea">
-			<div class="x_pull-right">
-				<button type="submit" class="x_btn x_btn-primary" />{$lang->cmd_submit}</button>
+		<div class="x_control-group">
+			<label class="x_control-label" for="message_option">{$lang->improper_comment_declare_reason}</label>
+			<div class="x_controls">
+				<select name="message_option" id="message_option">
+					<option loop="$lang->improper_comment_reasons => $key,$text" value="{$key}">{$text}</option>
+				</select>
+				<textarea name="declare_message" id="declare_message"></textarea>
+				<p>{$lang->about_improper_comment_declare}<p>
 			</div>
 		</div>
-	</form>
-</section>
+		<div class="x_modal-footer">
+			<span class="x_btn-group x_pull-right">
+				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_submit}</button>
+			</span>
+		</div>
+	</div>
+</form>
+<script cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/1'">
+	alert("{$XE_VALIDATOR_MESSAGE}");
+	window.close();
+</script>
 <script>
-(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);
+	(function($){
+		$(function() {
 			setFixedPopupSize();
-		}
-	});
-	msg_area.hide();
-	$(document).load(setFixedPopupSize);
-})(jQuery);
-</script>
\ No newline at end of file
+			$('select[name="message_option"]').change(function(){
+				if ($(this).val()==='others') {
+					$('#declare_message').show();
+				} else {
+					$('#declare_message').hide();
+				}
+				setFixedPopupSize();
+			});
+		});
+	})(jQuery);
+</script>