merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -13,7 +13,7 @@
<table width="100%" border="1" cellspacing="0">
<tr>
<th scope="row"><div>{$lang->component_name}</div></th>
<td>{$component->component_name} ver. {$component->version}</td>
<td>{$component->title}({$component->component_name}) ver. {$component->version}</td>
</tr>
<tr>
<th scope="row"><div>{$lang->component_author}</div></th>
@ -84,6 +84,7 @@
</table>
</div>
<div class="btnArea">
<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispEditorAdminIndex')}" >{$lang->cmd_back}</a></span>
<span class="btn"><input type="submit" value="{$lang->cmd_apply}" /></span>
</div>
</form>