From 90a5d3e96300e3983da923190e31ed5c80c04e4c Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Wed, 8 Aug 2018 12:56:59 +0900
Subject: [PATCH] =?UTF-8?q?mid=EB=A1=9C=20admin/manager=20=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B5=AC=EB=B6=84=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/admin/tpl/_footer.html | 17 +++++++++--------
 modules/admin/tpl/_header.html | 14 ++++++--------
 modules/admin/tpl/layout.html  |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/modules/admin/tpl/_footer.html b/modules/admin/tpl/_footer.html
index 219e305de..4884a4c03 100644
--- a/modules/admin/tpl/_footer.html
+++ b/modules/admin/tpl/_footer.html
@@ -1,6 +1,6 @@
 	</div>
 	<!-- /BODY -->
-	<footer class="footer">
+	<footer class="footer" cond="$logged_info->is_admin === 'Y'">
 		<p class="power">
 			Powered by <strong>Rhymix {__XE_VERSION__}</strong>
 			<!--@if(isset($released_version))-->
@@ -8,13 +8,14 @@
 			<!--@end-->
 		</p>
 		<p class="cache">
-			<button type="button" class="x_btn-link" onclick="doResetAdminMenu();">{$lang->cmd_admin_menu_reset}</button> <span class="vr">|</span>  
-			<button type="button" class="x_btn-link" onclick="doRecompileCacheFile();">{$lang->cmd_remake_cache}</button> <span class="vr">|</span> 
-			<button type="button" class="x_btn-link" onclick="doClearSession();">{$lang->cmd_clear_session}</button> <span class="vr">|</span> 
-			<a href="./index.php?module=admin&act=dispAdminViewServerEnv" style="vertical-align:middle">{$lang->cmd_view_server_env}</a> <span class="vr">|</span> 
-			<a href="https://github.com/rhymix/rhymix/issues" target="_blank" style="vertical-align:middle">{$lang->bug_report}</a>
+			<button type="button" class="x_btn-link" onclick="doResetAdminMenu();">{lang('admin.cmd_admin_menu_reset')}</button> <span class="vr">|</span>  
+			<button type="button" class="x_btn-link" onclick="doRecompileCacheFile();">{lang('common.cmd_remake_cache')}</button> <span class="vr">|</span> 
+			<button type="button" class="x_btn-link" onclick="doClearSession();">{lang('admin.cmd_clear_session')}</button> <span class="vr">|</span> 
+			<a href="./index.php?module=admin&act=dispAdminViewServerEnv" style="vertical-align:middle">{lang('admin.cmd_view_server_env')}</a> <span class="vr">|</span> 
+			<a href="https://github.com/rhymix/rhymix/issues" target="_blank" style="vertical-align:middle">{lang('admin.bug_report')}</a>
 		</p>
+		<load target="../../session/tpl/js/session.js" />
 	</footer>
 </div>
-<load target="./js/config.js" usecdn="true" />
-<load target="../../session/tpl/js/session.js" usecdn="true" />
+<load target="./js/config.js" />
+
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
index 3e99143db..420402b11 100644
--- a/modules/admin/tpl/_header.html
+++ b/modules/admin/tpl/_header.html
@@ -17,16 +17,14 @@
 <div class="x">
 <p class="skipNav"><a href="#content">{$lang->skip_to_content}</a></p>
 	<header class="header">
-		<!--@if($module === 'admin')-->
+		<!--@if($mid)-->
+		<h1>module manager</h1>
+		<a href="{getUrl('', 'module', 'admin', 'act', $act, 'module_srl', $module_info->module_srl)}" cond="$logged_info->is_admin === 'Y'">Admin Panel</a>
+		<!--@else-->
 		<h1>
 			<a href="{getUrl('','module','admin')}"><img cond="$gnb_title_info->adminLogo" src="{getUrl('')}{$gnb_title_info->adminLogo}" alt="{$gnb_title_info->adminTitle}" /> {$gnb_title_info->adminTitle}</a>
 		</h1>
 		<p class="site"><a href="{$xe_default_url}">{$xe_default_url}</a></p>
-		<!--@else-->
-		<h1>
-			module manager
-		</h1>
-		<a href="{getUrl('', 'module', 'admin', 'act', $act, 'module_srl', $module_info->module_srl)}" cond="$logged_info->is_admin === 'Y'">Admin Panel</a>
 		<!--@end-->
 		<div class="account">
 			<ul>
@@ -41,9 +39,9 @@
 		</div>
 	</header>
 	<!-- BODY -->
-	<div class="body <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'close')-->wide<!--@end-->" style="padding-left:0"|cond="$module !== 'admin'">
+	<div class="body <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'close')-->wide<!--@end-->" style="padding-left:0"|cond="$mid">
 		<!-- GNB -->
-		<nav class="gnb <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'open')-->open<!--@end-->" id="gnb" cond="$module === 'admin'">
+		<nav class="gnb <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'open')-->open<!--@end-->" id="gnb" cond="!$mid">
 			<a href="#gnbNav"><i class="x_icon-align-justify x_icon-white"></i><b></b> Menu Open/Close</a>
 			<ul id="gnbNav" class="ex">
 			<script>
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index 8e497e4fd..f9435b70a 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -8,5 +8,5 @@
 	</div>
 	{$content}
 </div>
-<include target="./_footer.html" cond="$module === 'admin'" />
+<include target="./_footer.html" />