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

@ -3,6 +3,9 @@
<div class="hx h2">
<h2>{$system_message}</h2>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="co">
<!--@if(!$is_logged)-->
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
@ -13,18 +16,21 @@
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("./filter/openid_login.xml")-->
<div class="mLogin" id="gLogin">
<form action="./" method="post" ruleset="@login" id="gForm" class="ff">
<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm" class="ff">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset>
<ul>
<li><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" value="" /></li>
<li><label for="uid"><!--@if($member_config->identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input type="text" name="user_id" id="uid" value="" /></li>
<li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li>
</ul>
<p>
<input type="checkbox" name="keep_signed" id="keepid" value="Y" />
<input type="checkbox" name="keep_signed" id="keepid" value="Y" />
<label for="keepid">{$lang->keep_signed}</label>
</p>
<div class="message info" id="keep_msg" style="display:none;">
<p>{$lang->about_keep_warning}</p>
</div>
<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
<ul class="hp">
<li><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
@ -62,3 +68,17 @@
<!--@end-->
</div>
</div>
<script type="text/javascript">
jQuery(function($){
var keep_msg = $('#keep_msg');
keep_msg.hide();
$('#keepid').change(function(){
if($(this).is(':checked')){
keep_msg.slideDown(200);
} else {
keep_msg.slideUp(200);
}
});
});
</script>