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

@ -3,7 +3,7 @@
<div class="wArea fold">
<fieldset>
<legend>{$lang->edit->fold}</legend>
<input name="" type="text" class="inputText" value="" title="{$lang->edit->fold_default}" />
<input name="" type="text" class="iText" value="" title="{$lang->edit->fold_default}" />
<div class="buttonArea">
<span class="buttonGray medium strong"><button type="button"><img src="iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
<span class="buttonGray medium"><button type="button"><img src="buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>