merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,8 +1,11 @@
<load target="../../modules/admin/tpl/css/admin.css" />
<load target="../../modules/admin/tpl/css/admin.bootstrap.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=='en'" target="../../modules/admin/tpl/css/admin_en.css" usecdn="true" />
<div class="x popup">
{$content}
</div>
<script type="text/javascript">
<script>
jQuery(window).load(setFixedPopupSize);
var _isPoped = true;
</script>