From 4ead81754f2a2f260fdb323f2e37bd41411059d7 Mon Sep 17 00:00:00 2001 From: taggon Date: Fri, 29 Jul 2011 06:20:40 +0000 Subject: [PATCH] Modify administrative interface style. Add a selected language indicator git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8698 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/display/HTMLDisplayHandler.php | 8 ++++++-- common/tpl/common_layout.html | 7 +++++-- modules/admin/tpl/_spHeader.html | 11 ++++++----- modules/admin/tpl/css/admin.css | 20 ++++++++++++-------- modules/admin/tpl/img/checked.png | Bin 0 -> 149 bytes modules/admin/tpl/js/theme.js | 2 +- modules/admin/tpl/theme.html | 7 +++---- 7 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 modules/admin/tpl/img/checked.png diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index d823ff420..6a120d993 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -157,7 +157,9 @@ class HTMLDisplayHandler { function _loadJSCSS() { - $oContext =& Context::getInstance(); + $oContext =& Context::getInstance(); + $lang_type = Context::getLangType(); + // add common JS/CSS files if(__DEBUG__) { $oContext->addJsFile('./common/js/jquery.js', false, '', -100000); @@ -179,9 +181,11 @@ class HTMLDisplayHandler { if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){ if(__DEBUG__) { $oContext->addCSSFile('./modules/admin/tpl/css/admin.css', false, 'all', '', 100000); + $oContext->addCSSFile("./modules/admin/tpl/css/admin_{$lang_type}.css", false, 'all', '', 100000); $oContext->addJsFile('./modules/admin/tpl/js/admin.js'); } else { - $oContext->addCSSFile('./modules/admin/tpl/css/admin.min.css', false, 'all', '',10000); + $oContext->addCSSFile('./modules/admin/tpl/css/admin.min.css', false, 'all', '', 100000); + $oContext->addCSSFile("./modules/admin/tpl/css/admin_{$lang_type}.min.css", false, 'all', '',10000); $oContext->addJsFile('./modules/admin/tpl/js/admin.js'); } } diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 2888dfed9..d83093077 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -1,10 +1,13 @@ -{@ $db_info = Context::getDBInfo() } +{@ + $db_info = Context::getDBInfo(); + $lang_type = Context::getLangType(); +} - + diff --git a/modules/admin/tpl/_spHeader.html b/modules/admin/tpl/_spHeader.html index e9fc230be..cc9bba378 100644 --- a/modules/admin/tpl/_spHeader.html +++ b/modules/admin/tpl/_spHeader.html @@ -4,24 +4,25 @@

XE Super Admin

Move to Site -
-

Move to Site

+