merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -1,6 +1,6 @@
<include target="./common_header.html" />
<load target="filter/find_member_account.xml" />
<h1 class="h1">{$lang->cmd_find_member_account}</h1>
<h2 class="h2">{$lang->cmd_find_member_account_with_email}</h2>
<p>{$lang->about_find_member_account}</p>
<form action="./" method="get" class="form" onsubmit="return procFilter(this, find_member_account)">
<input type="hidden" name="mid" value="{$mid}" />
@ -17,7 +17,7 @@
</div>
</form>
<!--@if(count($lang->find_account_question_items)>1)-->
<h1 class="h1">{$lang->cmd_find_member_account}</h1>
<h2 class="h2">{$lang->cmd_find_member_account_with_email_question}</h2>
<p>{$lang->about_find_account_question}</p>
<form action="./" method="get" class="form" ruleset="@find_member_account_by_question">
<input type="hidden" name="module" value="member" />

View file

@ -5,11 +5,11 @@
</div>
<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="success_return_url" value="{$referer_url}" />
<input type="hidden" name="act" value="procMemberLogin" />
<ul>
<li>
<p class="q"><label for="uid">{$lang->user_id}</label></p>
<p class="q"><label for="uid"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label></p>
<p class="a"><input type="text" name="user_id" id="uid" value="" /></p>
</li>
<li>

View file

@ -45,8 +45,8 @@
<li>
<p class="q">{$lang->allow_mailing}</p>
<p class="a">
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <label for="mailingYes">{$lang->cmd_yes}</label>
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> <label for="mailingNo">{$lang->cmd_no}</label>
</p>
</li>
<li>