Fix admin relogin theme

nukeviet · Feb 15, 2014 · fe891ad · fe891ad
1 parent 71642fa
commit fe891ad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 38 deletions.
diff --git a/includes/core/admin_relogin.php b/includes/core/admin_relogin.php
@@ -106,10 +106,11 @@
 			}
 			$xtpl = new XTemplate( 'relogin.tpl', $dir_template );
 
+			$xtpl->assign( 'NV_TITLEBAR_DEFIS', NV_TITLEBAR_DEFIS );
 			$xtpl->assign( 'CHARSET', $global_config['site_charset'] );
 			$xtpl->assign( 'SITE_NAME', $global_config['site_name'] );
 			$xtpl->assign( 'PAGE_TITLE', $lang_global['admin_page'] );
-			$xtpl->assign( 'CSS', NV_BASE_SITEURL . 'themes/' . $global_config['admin_theme'] . '/css/login.css' );
+			$xtpl->assign( 'ADMIN_THEME', $global_config['admin_theme'] );
 			$xtpl->assign( 'SITELANG', NV_LANG_INTERFACE );
 			$xtpl->assign( 'NV_BASE_SITEURL', NV_BASE_SITEURL );
 			$xtpl->assign( 'LOGO_SRC', NV_BASE_SITEURL . $global_config['site_logo'] );

diff --git a/themes/admin_default/system/relogin.tpl b/themes/admin_default/system/relogin.tpl
@@ -1,5 +1,5 @@
 <!-- BEGIN: main -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset={CHARSET}" />
@@ -8,8 +8,10 @@
 		<meta name="distribution" content="global" />
 		<meta name="copyright" content="Copyright (c) {SITE_NAME}" />
 		<meta name="robots" content="noindex, nofollow" />
-		<title>{SITE_NAME} | {PAGE_TITLE}</title>
-		<link rel="stylesheet" type="text/css" href="{CSS}" />
+		<title>{SITE_NAME} {NV_TITLEBAR_DEFIS} {PAGE_TITLE}</title>
+		<link rel="stylesheet" type="text/css" href="{NV_BASE_SITEURL}themes/{ADMIN_THEME}/css/main.css" />
+		<link rel="stylesheet" type="text/css" href="{NV_BASE_SITEURL}themes/{ADMIN_THEME}/css/login.css" />
+		<link rel="stylesheet" type="text/css" href="{NV_BASE_SITEURL}themes/{ADMIN_THEME}/css/font-awesome.css" />
 		<script type="text/javascript" src="{NV_BASE_SITEURL}js/language/{SITELANG}.js"></script>
 		<script type="text/javascript">
 			function nv_checkadminlogin_submit() {
@@ -39,44 +41,24 @@
 			<div id="logo">
 				<a title="{SITE_NAME}" href="{NV_BASE_SITEURL}"><img alt="{SITE_NAME}" src="{LOGO_SRC}" width="{LOGO_WIDTH}" height="{LOGO_HEIGHT}" /></a>
 			</div>
-			<div id="login-header">
-				<div id="login-header-left"></div>
-				<div id="login-header-center">
-					<h3><strong> {LOGIN_TITLE}</h3>
-					</strong>
-				</div>
-				<div id="login-header-right"></div>
-			</div>
 			<div id="login-content">
-				<div>
-					<div>
-						{LOGIN_INFO}
-						<form class="loginform" method="post" onsubmit="return nv_checkadminlogin_submit();">
-							<ul>
-								<li>
-									<label> {N_PASSWORD}: </label>
-									<input name="nv_password" type="password" id="password" />
-								</li>
-							</ul>
-							<input name="redirect" value="{REDIRECT}" type="hidden"/>
-							<input name="save" id="save" type="hidden" value="1" />
-							<input class="submitform" type="submit" value="{N_SUBMIT}" />
-						</form>
-						<p class="right" style="padding:10px;">
-							<a class="lostpass" href="javascript:void(0);" onclick="nv_admin_logout();">{NV_LOGOUT}</a>
+				<h3>{LOGIN_TITLE}</h3>
+				<div class="inner-message">{LOGIN_INFO}</div>
+					<form class="loginform" method="post" onsubmit="return nv_checkadminlogin_submit();">
+						<p>
+							<label for="nv_password">{N_PASSWORD}:</label>
+							<input class="input-big" name="nv_password" type="password" id="password" />
 						</p>
-					</div>
-				</div>
-			</div>
-			<div id="login-footer">
-				<div id="login-footer-left"></div>
-				<div id="login-footer-center"></div>
-				<div id="login-footer-right"></div>
+						<input name="redirect" value="{REDIRECT}" type="hidden"/>
+						<input name="save" id="save" type="hidden" value="1" />
+						<input class="submitform button-h" type="submit" value="{N_SUBMIT}" />
+					</form>
+					<p class="right" style="padding:10px;">
+						<a class="lostpass" href="javascript:void(0);" onclick="nv_admin_logout();">{NV_LOGOUT}</a>
+					</p>
 			</div>
 			<div id="copyright">
-				<p>
-					Copyright &copy; <a href="{NV_BASE_SITEURL}" title="{SITE_NAME}">{SITE_NAME}</a>. All rights reserved.
-				</p>
+				<p>Copyright &copy; <a href="{NV_BASE_SITEURL}" title="{SITE_NAME}">{SITE_NAME}</a>. All rights reserved.</p>
 			</div>
 		</div>
 	</body>