rollback r10320, r10298, r10276, r10272

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10318 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-03-05 09:16:55 +00:00
parent f8dd9888f6
commit 206ded7cf9
149 changed files with 3745 additions and 2812 deletions

View file

@ -1,30 +1,30 @@
@charset "utf-8";
.sys_message{width:318px;text-align:left;margin:20px auto 2px auto;font-weight:bold;font-size:14px;color:#555}
fieldset{margin:0;padding:0;border:0 none}
.signPanel{width:318px;height:191px;margin:10px auto;background: url(images/login_panel_bg.gif) no-repeat top left}
.signPanel .left{width:192px;height:138px;padding:18px 0 0 23px;_padding-top:28px;_height:128px;float:left}
.signPanel .right{width:100px;height:111px;padding-top:45px;float:right}
.signPanel .left .tInBox{width:185px;height:18px;padding:0 0 0 4px;background:url(images/signPanel_input_bg.gif) no-repeat top left}
.signPanel .left .tInBox img{padding-top:3px}
.signPanel .left .tInBox input{width:160px;padding-left:5px;height:18px;border:0 none;background:none;font-size:12px}
.signPanel .left label{display:block;margin:10px 0 1px 0;font-size: 0.75em}
.signPanel .left label input{margin:0 7px 0 0;padding:0;vertical-align: middle}
.signPanel .left .lb_chk{margin-top:15px;_margin:0;padding:0}
.signPanel .bottom_bar{width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px}
.signPanel .bottom_bar a{dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575}
.signPanel .bottom_bar a.vr{padding-right:10px;border-right:#a8a8a8 solid 1px}
.sys_message {width:318px;text-align:left;margin:20px auto 2px auto;font-weight:bold;font-size:14px;color:#555;}
fieldset {margin:0;padding:0;border:0 none;}
.signPanel {width:318px; height:191px; margin:10px auto; background: url(images/login_panel_bg.gif) no-repeat top left;}
.signPanel .left {width:192px;height:138px;padding:18px 0 0 23px; _padding-top:28px;_height:128px;float:left;}
.signPanel .right {width:100px;height:111px;padding-top:45px;float:right;}
.signPanel .left .tInBox {width:185px;height:18px;padding:0 0 0 4px;background:url(images/signPanel_input_bg.gif) no-repeat top left;}
.signPanel .left .tInBox img {padding-top:3px;}
.signPanel .left .tInBox input {width:160px;padding-left:5px;height:18px;border:0 none;background:none;font-size:12px;}
.signPanel .left label {display:block;margin:10px 0 1px 0;font-size: 0.75em;}
.signPanel .left label input {margin:0 7px 0 0;padding:0;vertical-align: middle;}
.signPanel .left .lb_chk {margin-top:15px;_margin:0;padding:0;}
.signPanel .bottom_bar {width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px;}
.signPanel .bottom_bar a {dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575;}
.signPanel .bottom_bar a.vr {padding-right:10px;border-right:#a8a8a8 solid 1px;}
.oSignPanel .openLeft{width:192px;height:126px;padding:30px 0 0 12px;float:left}
.oSignPanel .openLeft .tInBox{width:185px;height:18px;padding:0 0 0 4px;margin-top:30px;background:url(images/signPanel_input_bg.gif) no-repeat top left}
.oSignPanel .openLeft .tInBox img{padding-top:3px}
.oSignPanel .openLeft .tInBox input{width:160px;padding-left:5px;height:18px;border:0 none;background:none}
.oSignPanel .openLeft label{display:block;margin:10px 0 3px 0}
.oSignPanel .openLeft label input{margin:0 7px 0 0;padding:0}
.oSignPanel .openLeft .lb_chk{margin-top:10px;_margin:0;padding:0}
.oSignPanel .openLeft {width:192px;height:126px;padding:30px 0 0 12px;float:left;}
.oSignPanel .openLeft .tInBox {width:185px;height:18px;padding:0 0 0 4px;margin-top:30px;background:url(images/signPanel_input_bg.gif) no-repeat top left;}
.oSignPanel .openLeft .tInBox img {padding-top:3px;}
.oSignPanel .openLeft .tInBox input {width:160px;padding-left:5px;height:18px;border:0 none;background:none;}
.oSignPanel .openLeft label {display:block;margin:10px 0 3px 0;}
.oSignPanel .openLeft label input {margin:0 7px 0 0;padding:0;}
.oSignPanel .openLeft .lb_chk {margin-top:10px;_margin:0;padding:0;}
.oSignPanel {width:318px;height:191px;margin:10px auto;background: url(images/login_panel_bg.gif) no-repeat top left}
.oSignPanel .right{width:100px;height:111px;padding-top:45px;float:right}
.oSignPanel .bottom_bar{width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px}
.oSignPanel .bottom_bar a{dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575}
.oSignPanel .bottom_bar a.vr{padding-right:10px;border-right:#a8a8a8 solid 1px}
.oSignPanel {width:318px; height:191px; margin:10px auto; background: url(images/login_panel_bg.gif) no-repeat top left;}
.oSignPanel .right {width:100px;height:111px;padding-top:45px;float:right;}
.oSignPanel .bottom_bar {width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px;}
.oSignPanel .bottom_bar a {dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575;}
.oSignPanel .bottom_bar a.vr {padding-right:10px;border-right:#a8a8a8 solid 1px;}

View file

@ -10,30 +10,32 @@
<!--%import("./message.js")-->
<div class="mLogin" id="gLogin">
<form action="./" method="post" ruleset="@login" id="gForm">
<input type="hidden" name="act" value="procMemberLogin" />
<fieldset>
<div class="signPanel">
<div class="left">
<label for="">{$lang->user_id}</label>
<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" id="uid" name="user_id" title="{$lang->user_id}" /></div>
<label for="">{$lang->password}</label>
<div class="tInBox"><img src="images/bullet_input_pw.gif" width="10" height="12" alt="" /><input type="password" id="upw" name="password" title="{$lang->password}" /></div>
<label class="lb_chk"><input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />{$lang->keep_signed}</label>
</div><!-- //left -->
<div class="right">
<input type="image" src="images/btn_signin.gif" width="70px" height="65px"/>
</div>
<div class="bottom_bar">
<a href="{getUrl('','act','dispMemberFindAccount')}" class="vr">{$lang->cmd_find_member_account}</a>
<a href="{getUrl('','act','dispMemberSignUpForm')}" >{$lang->cmd_signup}</a>
<!--@if($member_config->enable_openid=='Y')-->
<a href="#oLogin" onclick="jQuery('#loginAccess').removeClass('gLogin'); jQuery('#loginAccess').addClass('oLogin'); return false;">Open ID</a>
<!--@end-->
</div>
</div><!-- //signPanel -->
</fieldset>
<input type="hidden" name="act" value="procMemberLogin" />
<fieldset>
<div class="signPanel">
<div class="left">
<label for="">{$lang->user_id}</label>
<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" id="uid" name="user_id" title="{$lang->user_id}" /></div>
<label for="">{$lang->password}</label>
<div class="tInBox"><img src="images/bullet_input_pw.gif" width="10" height="12" alt="" /><input type="password" id="upw" name="password" title="{$lang->password}" /></div>
<label class="lb_chk"><input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />{$lang->keep_signed}</label>
</div><!-- //left -->
<div class="right">
<input type="image" src="images/btn_signin.gif" width="70px" height="65px"/>
</div>
<div class="bottom_bar">
<a href="{getUrl('','act','dispMemberFindAccount')}" class="vr">{$lang->cmd_find_member_account}</a>
<a href="{getUrl('','act','dispMemberSignUpForm')}" >{$lang->cmd_signup}</a>
<!--@if($member_config->enable_openid=='Y')-->
<a href="#oLogin" onclick="jQuery('#loginAccess').removeClass('gLogin'); jQuery('#loginAccess').addClass('oLogin'); return false;">Open ID</a>
<!--@end-->
</div>
</div><!-- //signPanel -->
</fieldset>
</form>
</div>
<!-- OpenID -->
@ -42,10 +44,11 @@
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm">
<fieldset>
<div class="openLeft">
<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" name="openid" class="iText" title="Open ID" value="" /></div>
<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" name="openid" class="iText" title="Open ID" value="" /></div>
</div>
<div class="right">
<input type="image" src="images/btn_signin.gif" width="70px" height="65px"/>
<input type="image" src="images/btn_signin.gif" width="70px" height="65px"/>
</div>
</fieldset>
</form>
@ -55,7 +58,7 @@
<!--@end-->
<!--@if($is_logged)-->
<div class="logOut">
<span class="btnAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
</div>
<!--@end-->
</div>