From de1684cf884223c93ae570eecd270db1c911dedf Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 13 Dec 2016 23:10:12 +0900
Subject: [PATCH] Take placeholder text out of the textarea

---
 modules/spamfilter/lang/ko.php               | 2 +-
 modules/spamfilter/tpl/denied_ip_list.html   | 5 +++--
 modules/spamfilter/tpl/denied_word_list.html | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/spamfilter/lang/ko.php b/modules/spamfilter/lang/ko.php
index 09c17244b..58bfbaab2 100644
--- a/modules/spamfilter/lang/ko.php
+++ b/modules/spamfilter/lang/ko.php
@@ -13,7 +13,7 @@ $lang->word = '키워드';
 $lang->hit = '히트';
 $lang->latest_hit = '최근 히트';
 $lang->about_interval = '지정된 시간 내에 글을 등록하지 못하게 합니다.';
-$lang->about_denied_ip = '한 줄에 하나씩 IP 주소(예: 127.0.0.1) 또는 대역(예: 127.0.0.0/24)을 입력하세요. // 뒷부분은 설명으로 저장됩니다. 예: 127.0.0.1 // 설명';
+$lang->about_denied_ip = '한 줄에 하나씩 IP 주소 또는 대역을 입력하세요. &quot;//&quot; 또는 &quot;#&quot; 뒷부분은 설명으로 저장됩니다. 예: 127.0.0.1 //설명, 127.0.0.1 #설명<br>IP 대역 표기법은 <a href="https://github.com/rhymix/rhymix-docs/blob/master/ko/misc/ipfilter.md" target="_blank">매뉴얼</a>을 참고하십시오.';
 $lang->about_denied_word = '한 줄에 하나씩 스팸 키워드를 입력하세요. (2~40자)';
 $lang->msg_alert_limited_by_config = '%d초 이내에 연속 글 작성은 금지됩니다. 계속 시도하면 IP가 차단될 수 있습니다.';
 $lang->msg_alert_limited_message_by_config = '%d초 이내에 연속 쪽지 발송은 금지됩니다. 계속 시도하면 IP가 차단될 수 있습니다.';
diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html
index 1dd83fb3c..26d1c664e 100644
--- a/modules/spamfilter/tpl/denied_ip_list.html
+++ b/modules/spamfilter/tpl/denied_ip_list.html
@@ -35,12 +35,13 @@
 			</tbody>
 		</table>
 	</form>
-	<form action="./" style="margin-right:14px" method="post">
+	<form action="./" style="margin-right:14px" method="post" class="x_form-horizontal">
 		<input type="hidden" name="act" value="procSpamfilterAdminInsertDeniedIP" />
 		<input type="hidden" name="module" value="spamfilter" />
 		<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
 		<input type="hidden" name="active" value="ip" />
-		<textarea name="ipaddress_list" title="{$lang->add_denied_ip}: {$lang->about_denied_ip}" rows="4" cols="42" style="width:100%" placeholder="{$lang->about_denied_ip}"></textarea>
+		<textarea name="ipaddress_list" title="{$lang->add_denied_ip}" rows="4" cols="42" style="width:100%"></textarea>
+		<p class="x_help-block">{$lang->about_denied_ip}</p>
 		<span class="x_pull-right" style="margin-right:-14px">
 			<button type="submit" class="x_btn x_btn-primary">{$lang->add_denied_ip}</button>
 		</span>
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html
index 579171f96..1a521141a 100644
--- a/modules/spamfilter/tpl/denied_word_list.html
+++ b/modules/spamfilter/tpl/denied_word_list.html
@@ -37,12 +37,13 @@
 			</tbody>
 		</table>
 	</form>
-	<form action="./" style="margin-right:14px" method="post">
+	<form action="./" style="margin-right:14px" method="post" class="x_form-horizontal">
 		<input type="hidden" name="act" value="procSpamfilterAdminInsertDeniedWord" />
 		<input type="hidden" name="module" value="spamfilter" />
 		<input type="hidden" name="active" value="word" />
 		<input type="hidden" name="xe_validator_id" value="modules/spamfilter/tpl/1" />
-		<textarea name="word_list" title="{$lang->add_denied_word}: {$lang->about_denied_word}" placeholder="{$lang->about_denied_word}" rows="4" cols="42" style="width:100%"></textarea>
+		<textarea name="word_list" title="{$lang->add_denied_word}" rows="4" cols="42" style="width:100%"></textarea>
+		<p class="x_help-block">{$lang->about_denied_word}</p>
 		<span class="x_pull-right" style="margin-right:-14px">
 			<button type="submit" class="x_btn x_btn-primary">{$lang->add_denied_word}</button>
 		</span>