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

issue 2878, fixed a bug. does not resize on popup layout.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12627 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-31 02:20:42 +00:00
parent bcb1afcab0
commit 2f6ae4b70c
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
classes/display/HTMLDisplayHandler.php
View file

@ -93,6 +93,21 @@ class HTMLDisplayHandler
if(!$layout_file) $layout_file = 'default_layout'; if(!$layout_file) $layout_file = 'default_layout';
$output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file); $output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
// if popup_layout, remove admin bar.
$realLayoutPath = FileHandler::getRealPath($layout_path);
if(substr($realLayoutPath, -1) != '/')
{
$realLayoutPath .= '/';
}
$pathInfo = pathinfo($layout_file);
$onlyLayoutFile = $pathInfo['filename'];
if($realLayoutPath === _XE_PATH_ . 'common/tpl/' && $onlyLayoutFile === 'popup_layout')
{
Context::set('admin_bar', 'false');
}
if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start; if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always')) if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))

2
common/tpl/popup_layout.html
View file

@ -2,7 +2,7 @@
<load target="../../modules/admin/tpl/css/admin.min.css" usecdn="true" /> <load target="../../modules/admin/tpl/css/admin.min.css" usecdn="true" />
<load cond="$lang_type=='ko'" target="../../modules/admin/tpl/css/admin_ko.css" usecdn="true" /> <load cond="$lang_type=='ko'" target="../../modules/admin/tpl/css/admin_ko.css" usecdn="true" />
<load cond="$lang_type=='en'" target="../../modules/admin/tpl/css/admin_en.css" usecdn="true" /> <load cond="$lang_type=='en'" target="../../modules/admin/tpl/css/admin_en.css" usecdn="true" />
<div class="x"> <div class="x popup">
{$content} {$content}
</div> </div>
<script> <script>