From 87d725b8be856d6f3b4870b1ed02b61b1ac9dcc6 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Sat, 10 Apr 2021 18:06:52 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=8F=85=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=9C=B0=20=EA=B2=BD=EC=9A=B0=20=EB=94=94?=
 =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ncenterlite/ncenterlite.view.php      |  2 +
 .../skins/default/unsubscribe.html            | 72 +++++++++----------
 .../skins/default_bottom/unsubscribe.html     | 68 +++++++++---------
 3 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/modules/ncenterlite/ncenterlite.view.php b/modules/ncenterlite/ncenterlite.view.php
index 47c701bf1..01fbef50a 100644
--- a/modules/ncenterlite/ncenterlite.view.php
+++ b/modules/ncenterlite/ncenterlite.view.php
@@ -143,6 +143,8 @@ class ncenterliteView extends ncenterlite
 	
 	function dispNcenterliteInsertUnsubscribe()
 	{
+		$this->setLayoutFile('popup_layout');
+		
 		/** @var ncenterliteModel $oNcenterliteModel */
 		$oNcenterliteModel = getModel('ncenterlite');
 		$target_srl = Context::get('target_srl');
diff --git a/modules/ncenterlite/skins/default/unsubscribe.html b/modules/ncenterlite/skins/default/unsubscribe.html
index 5e00723ae..340fbb4d0 100644
--- a/modules/ncenterlite/skins/default/unsubscribe.html
+++ b/modules/ncenterlite/skins/default/unsubscribe.html
@@ -1,14 +1,13 @@
 <load target="../../../member/skins/default/css/member.css" />
-<include target="../../../member/skins/default/common_header.html" />
 <div class="xm">
 
-	<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default/unsubscribe/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default_bottom/unsubscribe/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
 	<form ruleset="insertConfig" action="./" method="post" class="form-horizontal" id="fo_ncenterlite">
 		<input type="hidden" name="module" value="ncenterlite" />
 		<input type="hidden" name="act" value="procNcenterliteInsertUnsubscribe" />
-		<input type="hidden" name="xe_validator_id" value="modules/ncenterlite/skins/default/unsubscribe/1" />
+		<input type="hidden" name="xe_validator_id" value="modules/ncenterlite/skins/default_bottom/unsubscribe/1" />
 		<!--@if($unsubscribeData)-->
 		<input type="hidden" name="target_srl" value="{$unsubscribeData->target_srl}" />
 		<input type="hidden" name="unsubscribe_srl" value="{$unsubscribeData->unsubscribe_srl}" />
@@ -18,46 +17,45 @@
 		<input type="hidden" name="unsubscribe_srl" value="{$unsubscribe_srl}" />
 		<input type="hidden" name="unsubscribe_type" value="{$unsubscribe_type}" />
 		<!--@end-->
-		<section class="section">
-			<div class="control-group">
-				<label class="control-label">{lang('ncenterlite_content_type')}</label>
+
+		<div class="x_modal-header">
+			<h1>{$lang->ncenterlite_cmd_unsubscribe_settings}</h1>
+		</div>
+
+		<blockquote>
+			<section class="target_article">
+				<h1>
+					{$type}
+				</h1>
+				<p>
+					<!--@if($unsubscribeData)-->
+					{escape($unsubscribeData->text, false)}
+					<!--@else-->
+					{escape($text, false)}
+					<!--@end-->
+				</p>
+			</section>
+		</blockquote>
+
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->this_message_unsubscribe}</label>
+			<div class="x_controls">
 				<div class="controls">
-					<p>
-						{$type}
-					</p>
-				</div>
-			</div>
-			<div class="control-group">
-				<label class="control-label">{lang('content')}</label>
-				<div class="controls">
-					<p>
-						<!--@if($unsubscribeData)-->
-						{escape($unsubscribeData->text, false)}
-						<!--@else-->
-						{escape($text, false)}
-						<!--@end-->
-					</p>
-				</div>
-			</div>
-			
-			<div class="control-group">
-				<label class="control-label">{$lang->this_message_unsubscribe}</label>
-				<div class="controls">
-					<label class="inline">
-						<input type="radio" name="value" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
+					<label class="inline" for="unsubscribe_value_y">
+						<input type="radio" name="value" id="unsubscribe_value_y" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
 					</label>
-					<label class="inline">
-						<input type="radio" name="value" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
+					<label class="inline" for="unsubscribe_value_n">
+						<input type="radio" name="value" id="unsubscribe_value_n" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
 					</label>
 					<p>{$lang->about_this_message_unsubscribe}</p>
 				</div>
 			</div>
-		</section>
-		<div class="clearfix btnArea">
-			<div class="pull-right">
-				<button class="btn btn-primary" type="submit">{$lang->cmd_registration}</button>
-			</div>
+		</div>
+
+		<div class="x_modal-footer">
+			<span class="x_btn-group x_pull-right">
+				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_registration}</button>
+			</span>
 		</div>
 	</form>
 </div>
-<include target="../../../member/skins/default/common_footer.html" />
diff --git a/modules/ncenterlite/skins/default_bottom/unsubscribe.html b/modules/ncenterlite/skins/default_bottom/unsubscribe.html
index 71d0f9dde..f4faf4ad1 100644
--- a/modules/ncenterlite/skins/default_bottom/unsubscribe.html
+++ b/modules/ncenterlite/skins/default_bottom/unsubscribe.html
@@ -1,5 +1,4 @@
 <load target="../../../member/skins/default/css/member.css" />
-<include target="../../../member/skins/default/common_header.html" />
 <div class="xm">
 
 	<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/ncenterlite/skins/default_bottom/unsubscribe/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
@@ -18,46 +17,45 @@
 		<input type="hidden" name="unsubscribe_srl" value="{$unsubscribe_srl}" />
 		<input type="hidden" name="unsubscribe_type" value="{$unsubscribe_type}" />
 		<!--@end-->
-		<section class="section">
-			<div class="control-group">
-				<label class="control-label">{lang('ncenterlite_content_type')}</label>
+		
+		<div class="x_modal-header">
+			<h1>{$lang->ncenterlite_cmd_unsubscribe_settings}</h1>
+		</div>
+		
+		<blockquote>
+			<section class="target_article">
+				<h1>
+					{$type}
+				</h1>
+				<p>
+					<!--@if($unsubscribeData)-->
+					{escape($unsubscribeData->text, false)}
+					<!--@else-->
+					{escape($text, false)}
+					<!--@end-->
+				</p>
+			</section>
+		</blockquote>
+
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->this_message_unsubscribe}</label>
+			<div class="x_controls">
 				<div class="controls">
-					<p>
-						{$type}
-					</p>
-				</div>
-			</div>
-			<div class="control-group">
-				<label class="control-label">{lang('content')}</label>
-				<div class="controls">
-					<p>
-						<!--@if($unsubscribeData)-->
-						{escape($unsubscribeData->text, false)}
-						<!--@else-->
-						{escape($text, false)}
-						<!--@end-->
-					</p>
-				</div>
-			</div>
-			
-			<div class="control-group">
-				<label class="control-label">{$lang->this_message_unsubscribe}</label>
-				<div class="controls">
-					<label class="inline">
-						<input type="radio" name="value" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
+					<label class="inline" for="unsubscribe_value_y">
+						<input type="radio" name="value" id="unsubscribe_value_y" value="Y" checked="checked"|cond="$unsubscribeData->value != 'N'" /> {$lang->ncenterlite_to_unsubscribe}
 					</label>
-					<label class="inline">
-						<input type="radio" name="value" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
+					<label class="inline" for="unsubscribe_value_n">
+						<input type="radio" name="value" id="unsubscribe_value_n" value="N" checked="checked"|cond="$unsubscribeData->value == 'N'" /> {$lang->ncenterlite_subscribe}
 					</label>
 					<p>{$lang->about_this_message_unsubscribe}</p>
 				</div>
 			</div>
-		</section>
-		<div class="clearfix btnArea">
-			<div class="pull-right">
-				<button class="btn btn-primary" type="submit">{$lang->cmd_registration}</button>
-			</div>
+		</div>
+
+		<div class="x_modal-footer">
+			<span class="x_btn-group x_pull-right">
+				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_registration}</button>
+			</span>
 		</div>
 	</form>
 </div>
-<include target="../../../member/skins/default/common_footer.html" />