fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2583 fix. Add admin.iefix.css file.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11732 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-10-16 05:56:22 +00:00
parent 2baa9f74a1
commit 9887c3210b
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
classes/display/HTMLDisplayHandler.php
View file

@ -297,26 +297,28 @@ class HTMLDisplayHandler {
$oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/css/xe.css', 'all', '', -100000), true); $oContext->loadFile(array('./common/css/xe.css', '', '', -100000), true);
} else { } else {
$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true); $oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true);
$oContext->loadFile(array('./common/css/xe.min.css', 'all', '', -100000), true); $oContext->loadFile(array('./common/css/xe.min.css', '', '', -100000), true);
} }
// for admin page, add admin css // for admin page, add admin css
if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){ if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){
if(__DEBUG__) { if(__DEBUG__) {
$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', 'all', '', 100000), true); $oContext->loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 100000), true);
$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", 'all', '', 100000), true); $oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 100000), true);
$oContext->loadFile(array("./modules/admin/tpl/css/admin.iefix.css", '', 'ie', 100000), true);
$oContext->loadFile('./modules/admin/tpl/js/admin.js', true); $oContext->loadFile('./modules/admin/tpl/js/admin.js', true);
$oContext->loadFile(array('./common/css/bootstrap.css', 'all', '', 1), true); $oContext->loadFile(array('./common/css/bootstrap.css', '', '', 1), true);
} else { } else {
$oContext->loadFile(array('./modules/admin/tpl/css/admin.min.css', 'all', '', 100000), true); $oContext->loadFile(array('./modules/admin/tpl/css/admin.min.css', '', '', 100000), true);
$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", 'all', '',10000), true); $oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '',10000), true);
$oContext->loadFile(array("./modules/admin/tpl/css/admin.iefix.min.css", '', 'ie', 100000), true);
$oContext->loadFile('./modules/admin/tpl/js/admin.min.js', true); $oContext->loadFile('./modules/admin/tpl/js/admin.min.js', true);
$oContext->loadFile(array('./common/css/bootstrap.min.css', 'all', '', 1), true); $oContext->loadFile(array('./common/css/bootstrap.min.css', '', '', 1), true);
} }
} }
} }

1
modules/admin/tpl/css/admin.iefix.css Normal file
View file

@ -0,0 +1 @@
#g11n .item textarea{height:40px}