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

@ -18,7 +18,7 @@
</tr>
<tr>
<th><div>{$lang->title}</div></th>
<td><input type="text" name="title" id="message_title" class="inputTypeText w300" value="{$source_message->title}"/></td>
<td><input type="text" name="title" id="message_title" value="{$source_message->title}"/></td>
</tr>
<tr>
<th><div>{$lang->cmd_option}</div></th>
@ -31,7 +31,7 @@
</div>
<div id="popFooter">
<span class="button black strong"><input type="submit" value="{$lang->cmd_send_message}" class="editor_button" accesskey="s" /></span>
<span class="button black strong"><input type="submit" value="{$lang->cmd_send_message}" class="editor_button" /></span>
</div>
</form>