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 cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">{$lang->cmd_login}</h1>
<h1 class="h1">{$lang->cmd_login}...</h1>
<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
<input type="hidden" name="act" value="procMemberLogin" />