merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,11 +1,18 @@
<load target="css/msignup.css" usecdn="true" />
<h2 class="h2">{$lang->msg_rechecked_password}</h2>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<h2 class="hx h2">{$lang->msg_rechecked_password}</h2>
{@
$validator_ids = array(
'modules/member/m.skin/default/rechecked_password/1' => 1,
'modules/member/m.skin/default/modify_info/1' => 1
);
}
<div cond="$XE_VALIDATOR_MESSAGE && isset($validator_ids[$XE_VALIDATOR_ID])" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form class="ff" action="./index.php" method="post" ruleset="recheckedPassword">
<input type="hidden" name="act" value="procMemberModifyInfoBefore" />
<input type="hidden" name="module" value="member" />
<input type="hidden" name="xe_validator_id" value="modules/member/m.skin/default/rechecked_password/1" />
<ul>
<li>
<label for="identifier">{$identifierTitle}</label>
@ -18,7 +25,7 @@
</li>
</ul>
<div class="bna">
<input class="bn white" type="submit" value="{$lang->cmd_confirm}" />
<input class="bn dark" type="submit" value="{$lang->cmd_confirm}" />
<span class="bn white"><a href="{getUrl('act','dispMemberInfo','member_srl','')}">{$lang->cmd_cancel}</a></span>
</div>
</form>