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

@ -14,8 +14,8 @@
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset>
<ul class="idpw">
<li><input type="text" name="user_id" id="uid" value="" class="inputText" title="{$lang->user_id}" /></li>
<li><input type="password" name="password" id="upw" value="" class="inputText" title="{$lang->password}" /></li>
<li><input type="text" name="user_id" id="uid" value="" class="iText" title="{$lang->user_id}" /></li>
<li><input type="password" name="password" id="upw" value="" class="iText" title="{$lang->password}" /></li>
</ul>
<div class="buttonArea">
<p class="keeping">
@ -38,6 +38,6 @@
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
</div>
<div class="logOut" cond="!$is_logged && $module != 'admin'">
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}</a></span>
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}...</a></span>
</div>
</div>