merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -1,5 +1,4 @@
<load target="./js/document_admin.js" usecdn="true" />
<load target="./css/document.css" usecdn="true" />
{$content}
<div class="btnArea">
<span class="btn"><button type="button" onclick="window.close();return false;">{$lang->cmd_close}</button></span>