From 5e6bac19c6271c632dd6ccb2a6a863d0363a421e Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Thu, 27 Sep 2012 11:41:53 +0000
Subject: [PATCH] issue 2454 [Admin UI Refactoring] Content >Admin setup

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11563 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/tpl/admin_setup.html           | 97 +++++++++++---------
 modules/rss/tpl/rss_admin_index.html         |  6 +-
 modules/spamfilter/tpl/denied_ip_list.html   |  2 +-
 modules/spamfilter/tpl/denied_word_list.html |  2 +-
 modules/spamfilter/tpl/header.html           |  6 +-
 5 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/modules/admin/tpl/admin_setup.html b/modules/admin/tpl/admin_setup.html
index f23484d42..a177c18df 100644
--- a/modules/admin/tpl/admin_setup.html
+++ b/modules/admin/tpl/admin_setup.html
@@ -2,33 +2,41 @@
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-<h1 class="h1">{$lang->admin_setup}</h1>
-<form action="./" method="post" enctype="multipart/form-data">
-	<input type="hidden" name="module" value="admin" />
-	<input type="hidden" name="act" value="procAdminUpdateConfig" />
-	<fieldset class="section">
-		<h2 class="h2">{$lang->admin_title}</h2>
-		<ul class="form">
-			<li>
-				<p class="q"><label for="adminLogo">{$lang->admin_logo}</label></p>
-				<p class="a">
-					<!--@if($config_object->adminLogo)-->
-					<img src="{getUrl('').$config_object->adminLogo}" />
-					<button type="submit" value="procAdminDeleteLogo" name="act" class="text">{$lang->cmd_delete}</button>
-					<!--@else-->
-					<img src="{getUrl('')}{$gnb_title_info->adminLogo}" />
-					<!--@end-->
-				</p>
-				<p class="a"><input type="file" name="adminLogo" id="adminLogo" /></p>
-			</li>
-			<li>
-				<p class="q"><label for="adminTitle">{$lang->admin_title}</label></p>
-				<p class="a"><input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" /></p>
-			</li>
-		</ul>
-		<p class="btnArea"><span class="btn small"><button value="procAdminUpdateConfig" name="act" type="submit">{$lang->cmd_save}</button></span></p>
+<div class="x_page-header">
+	<h1>{$lang->admin_setup}</h1>
+</div>
+<section class="section">
+	<h1>{$lang->admin_title}</h1>
+	<form action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal">
+		<input type="hidden" name="module" value="admin" />
+		<input type="hidden" name="act" value="procAdminUpdateConfig" />
+		<div class="x_control-group">
+			<label class="x_control-label" for="adminLogo">{$lang->admin_logo}</label>
+			<div class="x_controls">
+				<!--@if($config_object->adminLogo)-->
+				<img src="{getUrl('').$config_object->adminLogo}" />
+				<button type="submit" value="procAdminDeleteLogo" name="act" class="x_btn">{$lang->cmd_delete}</button>
+				<!--@else-->
+				<img src="{getUrl('')}{$gnb_title_info->adminLogo}" />
+				<!--@end-->
+				<input type="file" name="adminLogo" id="adminLogo" />
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label class="x_control-label" for="adminTitle">{$lang->admin_title}</label>
+			<div class="x_controls">
+				<input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" />
+			</div>
+		</div>
+		<div class="x_clearfix btnArea">
+			<div class="x_pull-right">
+				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+			</div>
+		</div>
 	</fieldset>
 </form>
+
+</section>
 <form id="listForm" action="./" class="siteMap" method="post">
 	<input type="hidden" name="module" value="admin" />
 	<input type="hidden" name="act" value="procMenuAdminDeleteItem" />
@@ -60,26 +68,33 @@
 	</div>
 	</fieldset>
 </form>
-<div class="modal" id="editMenu">
-	<div class="fg">
-		<form id="editForm" action="./" class="form">
+
+<!--// Modal -->
+<div class="x_modal" id="editMenu">
+	<form id="editForm" action="./" class="x_form-horizontal">
+	<div class="x_modal-header">
+		<h3>{$lang->admin_menu_add}</h3>
+	</div>
+	<div class="x_modal-body">
 		<input type="hidden" name="module" value="menu" />
 		<input type="hidden" name="act" value="procMenuAdminInsertItemForAdminMenu" />
 		<input type="hidden" name="menu_srl" value="{$menu_srl}" />
 		<input type="hidden" name="parent_srl" value="" />
-			<h2 class="h2">{$lang->admin_menu_add}</h2>
-			<ul>
-				<li>
-					<p class="q"><label for="menuNameList">{$lang->module}</label></p>
-					<div class="a">
-						<select name="menu_name" id="menuNameList">
-						</select>
-					</div>
-				</li>
-			</ul>
-			<div class="btnArea">
-				<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		<div class="x_control-group">
+			<div class="x_control-group">
+				<label class="x_control-label" for="menuNameList">{$lang->module}</label>
+				<div class="x_controls">
+					<select name="menu_name" id="menuNameList">
+					</select>
+				</div>
 			</div>
-		</form>
+		</div>
 	</div>
+	<div class="x_modal-footer">
+		<button type="button" class="x_btn x_pull-left" data-hide="#exModal-1">Close</button>
+		<span class="x_btn-group x_pull-right">
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+		</span>
+	</div>
+	</form>
 </div>
diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html
index fd5e73882..7205c2253 100644
--- a/modules/rss/tpl/rss_admin_index.html
+++ b/modules/rss/tpl/rss_admin_index.html
@@ -1,9 +1,9 @@
-<div class="x_page-header">
-	<h1>RSS</h1>
-</div>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<div class="x_page-header">
+	<h1>RSS</h1>
+</div>
 <section class="section">
 	<h1>{$lang->total_feed} {$lang->cmd_management}</h1>
 	<form ruleset="insertRssConfig" action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal">
diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html
index 57ae7f686..994e510f2 100644
--- a/modules/spamfilter/tpl/denied_ip_list.html
+++ b/modules/spamfilter/tpl/denied_ip_list.html
@@ -35,7 +35,7 @@
 		</div>
 		<div class="x_clearfix btnArea">
 			<div class="x_pull-left">
-				<button type="submit" class="x_btn x_btn-info">{$lang->add}</button>
+				<button type="submit" class="x_btn x_btn-primary">{$lang->add}</button>
 			</div>
 		</div>
 	</form>
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html
index 2173d82fe..9a9750328 100644
--- a/modules/spamfilter/tpl/denied_word_list.html
+++ b/modules/spamfilter/tpl/denied_word_list.html
@@ -37,7 +37,7 @@
 		</div>
 		<div class="x_clearfix btnArea">
 			<div class="x_pull-left">
-				<button type="submit" class="x_btn x_btn-info">{$lang->add}</button>
+				<button type="submit" class="x_btn x_btn-primary">{$lang->add}</button>
 			</div>
 		</div>
 	</form>
diff --git a/modules/spamfilter/tpl/header.html b/modules/spamfilter/tpl/header.html
index aa14bf08b..e28c58f9b 100644
--- a/modules/spamfilter/tpl/header.html
+++ b/modules/spamfilter/tpl/header.html
@@ -1,7 +1,7 @@
 <load target="js/spamfilter_admin.js" usecdn="true" />
-<div class="x_page-header">
-	<h1>{$lang->spamfilter}</h1>
-</div>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
     <p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<div class="x_page-header">
+	<h1>{$lang->spamfilter}</h1>
+</div>