From 1367687ee71cc6c8a4a152b32c355507e4207809 Mon Sep 17 00:00:00 2001
From: ChanMyeong <dece24@gmail.com>
Date: Fri, 2 Nov 2012 07:52:43 +0000
Subject: [PATCH] Document, Comment UI cleaning.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12041 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/comment/tpl/comment_list.html   |  28 ++-
 modules/comment/tpl/declared_list.html  |  24 ++-
 modules/comment/tpl/header.html         |   6 -
 modules/document/tpl/declared_list.html | 226 +++++++++++-------------
 modules/document/tpl/document_list.html | 110 ++++++------
 modules/document/tpl/header.html        |   2 +-
 6 files changed, 193 insertions(+), 203 deletions(-)

diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 3de446b51..e2302390e 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -4,27 +4,23 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
 xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 </script>
 <load target="js/comment_admin.js" usecdn="true" />
+<div class="x_tabbable">
+    <ul class="x_nav x_nav-tabs">
+		<li class="x_active"|cond="$search_keyword == ''"><a href="{getUrl('search_keyword','','act','dispCommentAdminList', 'Y')}">{$lang->all}</a></li>
+		<li class="x_active"|cond="$search_target == 'is_secret' && $search_keyword == 'N'"><a href="{getUrl('search_target','is_secret','search_keyword', 'N')}">{$secret_name_list['N']}</a></li>
+		<li class="x_active"|cond="$search_target == 'is_secret' && $search_keyword == 'Y'"><a href="{getUrl('search_target','is_secret','search_keyword', 'Y')}">{$secret_name_list['Y']}</a></li>
+		<li class="x_active"|cond="$search_target == 'is_published' && $search_keyword == 'N'"><a href="{getUrl('search_target','is_published','search_keyword', 'N')}">{$lang->published_name_list['N']}</a></li>
+		<li class="x_active"|cond="$search_target == 'is_published' && $search_keyword == 'Y'"><a href="{getUrl('search_target','is_published','search_keyword', 'Y')}">{$lang->published_name_list['Y']}</a></li>
+        <li><a href="{getUrl('', 'module', 'admin', 'act','dispCommentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
+    </ul>
+</div>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
 <form id="fo_list" action="./" method="post">
-	<select cond="$modules_list" id="comment_modules" name="comment_modules" title="{$lang->select_module}" onchange="location.href='{getUrl('search_target','module','search_keyword','')}&amp;search_keyword='+this.value" style="width:220px">
-		<option>{$lang->select_module}</option>
-		<!--@foreach($modules_list as $key => $node)-->
-		<option value="{$key}"<!--@if($key==$search_keyword)-->selected<!--@end-->>{$node}</option>
-		<!--@end-->
-	</select>
 	<table id="commentListTable" class="x_table x_table-striped x_table-hover">
 		<caption>
-			<a href="{getUrl('search_keyword','','act','dispCommentAdminList', 'Y')}" class="active"|cond="$search_keyword == ''">{$lang->all}</a><block cond="$search_keyword == ''">({number_format($total_count)})</block>
-			<i>|</i>
-			<a href="{getUrl('search_target','is_secret','search_keyword', 'N')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'N'">{$secret_name_list['N']}</a><block cond="$search_target == 'is_secret' && $search_keyword == 'N'">({number_format($total_count)})</block>
-			<i>|</i>
-			<a href="{getUrl('search_target','is_secret','search_keyword', 'Y')}" class="active"|cond="$search_target == 'is_secret' && $search_keyword == 'Y'">{$secret_name_list['Y']}</a><block cond="$search_target == 'is_secret' && $search_keyword == 'Y'">({number_format($total_count)})</block>
-			<i>|</i>
-			<a href="{getUrl('search_target','is_published','search_keyword', 'N')}" class="active"|cond="$search_target == 'is_published' && $search_keyword == 'N'">{$lang->published_name_list['N']}</a><block cond="$search_target == 'is_published' && $search_keyword == 'N'">({number_format($total_count)})</block>
-			<i>|</i>
-			<a href="{getUrl('search_target','is_published','search_keyword', 'Y')}" class="active"|cond="$search_target == 'is_published' && $search_keyword == 'Y'">{$lang->published_name_list['Y']}</a><block cond="$search_target == 'is_published' && $search_keyword == 'Y'">({number_format($total_count)})</block>
+			{$lang->all}({number_format($total_count)})
 			<div class="x_pull-right">
 				<a href="#listManager" class="x_btn modalAnchor" onclick="getCommentList();">{$lang->comment_manager}...</a>
 			</div>
@@ -119,7 +115,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	<input type="hidden" name="act" value="{$act}" />
 	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="error_return_url" value="" />
-	<select name="search_target" title="{$lang->search_target}">
+	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach($lang->search_target_list as $key => $val)-->
 		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
 		<!--@end-->
diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html
index 76d74e66a..4d78e482b 100644
--- a/modules/comment/tpl/declared_list.html
+++ b/modules/comment/tpl/declared_list.html
@@ -1,4 +1,16 @@
-<include target="header.html" />
+<div class="x_page-header">
+	<h1>{$lang->comment} {$lang->cmd_management}</h1>
+</div>
+<div class="x_tabbable">
+    <ul class="x_nav x_nav-tabs">
+		<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword','','act','dispCommentAdminList', 'Y')}">{$lang->all}</a></li>
+		<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target','is_secret','search_keyword', 'N')}">{$status_name_list['PUBLIC']}</a></li>
+		<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target','is_secret','search_keyword', 'Y')}">{$status_name_list['SECRET']}</a></li>
+		<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target','is_published','search_keyword', 'N')}">{$lang->published_name_list['N']}</a></li>
+		<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target','is_published','search_keyword', 'Y')}">{$lang->published_name_list['Y']}</a></li>
+        <li class="x_active"><a href="{getUrl('', 'module', 'admin', 'act','dispCommentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
+    </ul>
+</div>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
@@ -22,6 +34,16 @@
 				<th scope="col" style="width:15px"><input type="checkbox" /></th>
 			</tr>
 		</thead>
+		<tfoot>
+			<tr>
+				<th scope="col">{$lang->comment}</th>
+				<th scope="col">{$lang->user_name}</th>
+				<th scope="col">{$lang->date}</th>
+				<th scope="col">{$lang->cmd_declare}</th>
+				<th scope="col">{$lang->ipaddress}</th>
+				<th scope="col" style="width:15px"><input type="checkbox" /></th>
+			</tr>
+		</tfoot>
 		<tbody>
 			<tr loop="$comment_list => $no, $oComment">
 				<td><a href="{getUrl('','document_srl',$oComment->get('document_srl'))}#comment_{$oComment->get('comment_srl')}" onclick="window.open(this.href);return false;">{$oComment->getSummary(100)}</a></td>
diff --git a/modules/comment/tpl/header.html b/modules/comment/tpl/header.html
index 20fff0a9f..76a1e8cbd 100644
--- a/modules/comment/tpl/header.html
+++ b/modules/comment/tpl/header.html
@@ -2,9 +2,3 @@
 <div class="x_page-header">
 	<h1>{$lang->comment} {$lang->cmd_management}</h1>
 </div>
-<div class="x_tabbable">
-    <ul class="x_nav x_nav-tabs">
-        <li <!--@if($act=='dispCommentAdminList')-->class="x_active"<!--@end-->><a href="{getUrl('act','dispCommentAdminList')}">{$lang->comment_list}</a></li>
-        <li <!--@if($act=='dispCommentAdminDeclared')-->class="x_active"<!--@end-->><a href="{getUrl('act','dispCommentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
-    </ul>
-</div>
diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html
index 868947d48..5eeba9718 100644
--- a/modules/document/tpl/declared_list.html
+++ b/modules/document/tpl/declared_list.html
@@ -3,136 +3,73 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
 xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 </script>
 <load target="js/document_admin.js" usecdn="true" />
-<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
-<p>{$XE_VALIDATOR_MESSAGE}</p>
+<div class="x_page-header">
+	<h1>{$lang->cmd_declared_list}</h1>
 </div>
-	<form id="fo_list" action="./" method="get">
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form id="fo_list" action="./" method="get">
 	<input type="hidden" name="module" value="document" />
 	<input type="hidden" name="page" value="{$page}" />
-		<div class="x_page-header">
-		<h1>{$lang->cmd_declared_list}</h1>
-		</div>
-		<div class="table even">
-			<div class="x_tabbable">
-				<ul class="x_nav x_nav-tabs">
-					<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">{$lang->all}</a></li>
-					<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}</a></li>
-					<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}</a></li>
-					<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}</a></li>
-					<li class="x_active"><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
-				</ul>
-			</div>
-			<table width="100%" id="documentListTable">
-				<caption>
-					{$lang->all} ({number_format($total_count)})
-					<div class="x_pull-right">
-						<a href="#manageForm" class="x_btn modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a>
-					</div>
-				</caption>
-				<thead>
-					<tr>
-						<th scope="col" class="title">{$lang->title}</th>
-						<th scope="col" class="nowr">{$lang->writer}</th>
-						<th scope="col" class="nowr">{$lang->cmd_declare}</th>
-						<th scope="col" class="nowr">{$lang->readed_count}</th>
-						<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
-						<th scope="col" class="nowr">{$lang->date}</th>
-						<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr>
-						<th scope="col" class="title">{$lang->title}</th>
-						<th scope="col" class="nowr">{$lang->writer}</th>
-						<th scope="col" class="nowr">{$lang->cmd_declare}</th>
-						<th scope="col" class="nowr">{$lang->readed_count}</th>
-						<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
-						<th scope="col" class="nowr">{$lang->date}</th>
-						<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
-					</tr>
-				</tfoot>
-				<tbody>
-					<!--@foreach($document_list as $no => $oDocument)-->
-					<tr>
-						<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank">{$oDocument->getTitle()}</a></td>
-						<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
-						<td class="nowr">{$oDocument->get('declared_count')}</td>
-						<td class="nowr">{$oDocument->get('readed_count')}</td>
-						<td class="nowr">{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
-						<td class="nowr">{$oDocument->getRegdate("Y-m-d H:i")}</td>
-						<td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
-					</tr>
-					<!--@end-->
-				</tbody>
-			</table>
+	<div class="x_tabbable">
+		<ul class="x_nav x_nav-tabs">
+			<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">{$lang->all}</a></li>
+			<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}</a></li>
+			<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}</a></li>
+			<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}</a></li>
+			<li class="x_active"><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
+		</ul>
+	</div>
+	<table class="x_table x_table-striped x_table-hover" id="documentListTable">
+		<caption>
+			{$lang->all} ({number_format($total_count)})
 			<div class="x_pull-right">
-				<a href="#manageForm" class="x_btn modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
+				<a href="#manageForm" class="x_btn modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a>
 			</div>
-		</div>
-	</form>
-
-	<form action="./" method="post" class="x_modal fg" id="manageForm">
-	<input type="hidden" name="module" value="document" />
-	<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
-	<input type="hidden" name="type" value="" />
-	<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" />
-	<div class="x_modal-header">
-		<h2>{$lang->document_manager}</h2>
+		</caption>
+		<thead>
+			<tr>
+				<th scope="col" class="title">{$lang->title}</th>
+				<th scope="col" class="nowr">{$lang->writer}</th>
+				<th scope="col" class="nowr">{$lang->cmd_declare}</th>
+				<th scope="col" class="nowr">{$lang->readed_count}</th>
+				<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
+				<th scope="col" class="nowr">{$lang->date}</th>
+				<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<th scope="col" class="title">{$lang->title}</th>
+				<th scope="col" class="nowr">{$lang->writer}</th>
+				<th scope="col" class="nowr">{$lang->cmd_declare}</th>
+				<th scope="col" class="nowr">{$lang->readed_count}</th>
+				<th scope="col" class="nowr">{$lang->cmd_vote}(+/-)</th>
+				<th scope="col" class="nowr">{$lang->date}</th>
+				<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+			</tr>
+		</tfoot>
+		<tbody>
+			<!--@foreach($document_list as $no => $oDocument)-->
+			<tr>
+				<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank">{$oDocument->getTitle()}</a></td>
+				<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
+				<td class="nowr">{$oDocument->get('declared_count')}</td>
+				<td class="nowr">{$oDocument->get('readed_count')}</td>
+				<td class="nowr">{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
+				<td class="nowr">{$oDocument->getRegdate("Y-m-d H:i")}</td>
+				<td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+	<div class="x_pull-right">
+		<a href="#manageForm" class="x_btn modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
 	</div>
-	<div class="x_modal-body">
-		<div>
-			<table width="100%" id="documentManageListTable" class="x_table x_table-striped x_table-hover">
-				<caption>{$lang->selected_document} <strong id="selectedDocumentCount"></strong></caption>
-				<thead>
-					<tr>
-						<th scope="col" class="title">{$lang->title}</th>
-						<th scope="col" class="nowr">{$lang->writer}</th>
-						<th scope="col" class="nowr">{$lang->status}</th>
-					</tr>
-				</thead>
-				<tbody>
-				</tbody>
-			</table>
-		</div>
-		<p class="q"><label for="site">{$lang->selected_document_move}</label></p>
-		<div class="a">
-			<input type="text" name="site_keyword" id="site" />
-			<span class="desc"><a href="#suggestion" class="tgAnchor" onclick="getModuleList();">{$lang->find_site}</a></span>
-			<p>
-				<select name="target_module" id="module_list" style="width:290px">
-					<option>{$lang->select_module}</option>
-				</select>
-			</p>
-			<p>
-				<select name="module_srl" id="mid_list" style="width:290px">
-					<option>{$lang->select_module_id}</option>
-				</select>
-			</p>
-			<p>
-				<select id="target_category" name="target_category" style="width:290px">
-					<option>{$lang->select_category}</option>
-				</select>
-			</p>
-		</div>
-		<p class="q"><label for="message">{$lang->message_notice}</label></p>
-		<p>
-			<textarea rows="8" cols="42" name="message_content" id="message" style="width:98%"></textarea>
-		</p>
-	</div>
-	<div class="x_modal-footer">
-		<div class="x_btn-group">
-			<button type="submit" name="type" value="trash" class="x_btn x_btn-warning">{$lang->cmd_trash}</button>
-			<button type="submit" name="type" value="delete" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
-			<button type="submit" name="type" value="move" class="x_btn">{$lang->cmd_move}</button>
-			<button type="submit" name="type" value="copy" class="x_btn">{$lang->cmd_copy}</button>
-			<button type="submit" name="type" value="cancelDeclare" class="x_btn">{$lang->cmd_cancel_declare}</button>
-		</div>
-	</div>
-	</form>
+</form>
 
-	<div class="search">
-
-<form action="./" class="x_pagination x_pagination-centered">
+<form action="./" class="x_pagination" style="margin-top:-10px">
 	<input type="hidden" name="error_return_url" value="" />
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
@@ -170,4 +107,47 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
 	</ul>
 </form>
+
+<form action="./" method="post" class="x_modal" id="manageForm">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
+	<input type="hidden" name="type" value="" />
+	<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" />
+	<div class="x_modal-header">
+		<h3>{$lang->document_manager}</h3>
 	</div>
+	<div class="x_modal-body">
+		<table width="100%" id="documentManageListTable" class="x_table x_table-striped x_table-hover">
+			<caption>{$lang->selected_document} <strong id="selectedDocumentCount"></strong></caption>
+			<thead>
+				<tr>
+					<th scope="col" class="title">{$lang->title}</th>
+					<th scope="col" class="nowr">{$lang->writer}</th>
+					<th scope="col" class="nowr">{$lang->status}</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+		<div class="x_control-group">
+			<label>{$lang->selected_document_move}</label>
+			<input type="text" class="module_search" />
+		</div>
+		<div class="x_control-group" style="padding-right:14px">
+			<label for="message">{$lang->message_notice}</label>
+			<textarea rows="4" cols="42" name="message_content" id="message" style="width:100%"></textarea>
+		</div>
+	</div>
+	<div class="x_modal-footer">
+		<div class="x_btn-group x_pull-left">
+			<button type="submit" name="type" value="trash" class="x_btn">{$lang->cmd_trash}</button>
+			<button type="submit" name="type" value="delete" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
+		</div>
+		<div class="x_btn-group x_pull-right">
+			<button type="submit" name="type" value="move" class="x_btn">{$lang->cmd_move}</button>
+			<button type="submit" name="type" value="copy" class="x_btn">{$lang->cmd_copy}</button>
+			<button type="submit" name="type" value="cancelDeclare" class="x_btn">{$lang->cmd_cancel_declare}</button>
+		</div>
+	</div>
+</form>
+
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 738284e52..d78d76c8f 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -3,15 +3,15 @@ xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
 xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 </script>
 <load target="js/document_admin.js" usecdn="true" />
+<div class="x_page-header">
+	<h1>{$lang->document}</h1>
+</div>
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
 <form id="fo_list" action="./" method="get">
 	<input type="hidden" name="module" value="document" />
 	<input type="hidden" name="page" value="{$page}" />
-	<div class="x_page-header">
-		<h1>{$lang->document}</h1>
-	</div>
 	<div class="x_tabbable">
 		<ul class="x_nav x_nav-tabs">
 			<li class="x_active"|cond="$search_keyword == ''"><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">{$lang->all}</a></li>
@@ -80,59 +80,57 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<a href="#manageForm" class="x_btn modalAnchor x_pull-right" onclick="getDocumentList();">{$lang->document_manager}...</a>
 	</div>
 </form>
-<div class="x_clearfix" style="margin-top:-20px">
-	<form action="./" class="x_pagination x_pull-left">
-		<input type="hidden" name="error_return_url" value="" />
-		<input type="hidden" name="module" value="{$module}" />
-		<input type="hidden" name="act" value="{$act}" />
-		<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
-		<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
-		<ul>
-			<li class="x_disabled"|cond="!$page || $page == 1"><a href="{getUrl('page', '')}">&laquo; {$lang->first_page}</a></li>
-			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
-			{@$isGoTo = true}
-			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
-				<span cond="$isGoTo" id="goTo" class="x_input-append">
-					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
-					<button type="submit" class="x_add-on">Go</button>
-				</span>
-			</li>
-			</block>
-	
-			<!--@while($page_no = $page_navigation->getNextPage())-->
-			{@$last_page = $page_no}
-			<li class="x_active"|cond="$page_no == $page"><a  href="{getUrl('page', $page_no)}">{$page_no}</a></li>
-			<!--@end-->
-	
-			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
-			{@$isGoTo = true}
-			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
-				<span cond="$isGoTo" id="goTo" class="x_input-append">
-					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
-					<button type="submit" class="x_add-on">Go</button>
-				</span>
-			</li>
-			</block>
-			<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
-		</ul>
-	</form>
-	<form action="./" method="get" class="search center x_input-append x_pull-right">
-		<input type="hidden" name="module" value="{$module}" />
-		<input type="hidden" name="act" value="{$act}" />
-		<input type="hidden" name="module_srl" value="{$module_srl}" />
-		<input type="hidden" name="error_return_url" value="" />
-		<select name="search_target" title="{$lang->search_target}">
-			<!--@foreach($lang->search_target_list as $key => $val)-->
-			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-			<!--@end-->
-		</select>
-		<input type="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" required />
-		<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_search}</button>
-		<button class="x_btn" type="button">{$lang->cmd_cancel}</button>
-	</form>
-</div>
+<form action="./" class="x_pagination x_pull-left" style="margin:-45px 0 0 0">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+	<ul>
+		<li class="x_disabled"|cond="!$page || $page == 1"><a href="{getUrl('page', '')}">&laquo; {$lang->first_page}</a></li>
+		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<li>
+			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<span cond="$isGoTo" id="goTo" class="x_input-append">
+				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
+				<button type="submit" class="x_add-on">Go</button>
+			</span>
+		</li>
+		</block>
+
+		<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<li class="x_active"|cond="$page_no == $page"><a  href="{getUrl('page', $page_no)}">{$page_no}</a></li>
+		<!--@end-->
+
+		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<li>
+			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<span cond="$isGoTo" id="goTo" class="x_input-append">
+				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
+				<button type="submit" class="x_add-on">Go</button>
+			</span>
+		</li>
+		</block>
+		<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
+	</ul>
+</form>
+<form action="./" method="get" class="search center x_input-append x_clearfix">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="error_return_url" value="" />
+	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
+		<!--@foreach($lang->search_target_list as $key => $val)-->
+		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+		<!--@end-->
+	</select>
+	<input type="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" required />
+	<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_search}</button>
+	<button class="x_btn" type="button">{$lang->cmd_cancel}</button>
+</form>
 <form action="./" method="post" class="x_modal" id="manageForm">
 	<input type="hidden" name="module" value="document" />
 	<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
diff --git a/modules/document/tpl/header.html b/modules/document/tpl/header.html
index 8768ce297..c73b42ed1 100644
--- a/modules/document/tpl/header.html
+++ b/modules/document/tpl/header.html
@@ -1,5 +1,5 @@
 <load target="js/document_admin.js" usecdn="true" />
-<h3 class="h3">{$lang->document} {$lang->cmd_management}</h3>
+<h3>{$lang->document} {$lang->cmd_management}</h3>
 <p>
 	<a href="{getUrl('act','dispDocumentAdminList')}" class="active"|cond="$act=='dispDocumentAdminList'">{$lang->document_list}</a>
 	<i>|</i>