merge from 1.5.2.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-23 05:49:16 +00:00
parent c727926d9e
commit 9bf08cf3df
26 changed files with 110 additions and 97 deletions

View file

@ -36,7 +36,7 @@
<p class="q">{$lang->password} <em style="color:red">*</em></p>
<p class="a">
<input type="hidden" name="password" value="{$member_info->password}" />
<input type="password" name="reset_password" value="" />
<input type="text" name="reset_password" value="" />
</p>
</li>
<li cond="!$member_srl">

View file

@ -1,7 +1,7 @@
<load target="css/mlogin.css" usecdn="true" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->cmd_login}...</h2>
<h2>{$lang->cmd_login}</h2>
</div>
<form action="./" method="POST" class="ff">
<input type="hidden" name="module" value="member" />
@ -13,7 +13,7 @@
</ul>
<div class="bna">
<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}...</button></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
</div>
</form>
</div>