Close Connection when there is no connection value.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@13161 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2013-09-25 15:29:32 +00:00
parent 034a5c0288
commit f70ce644ce
1410 changed files with 7188 additions and 53541 deletions

View file

@ -1,20 +0,0 @@
@charset "utf-8";
.account{position:relative;text-align:right;z-index:99}
.account #acField{width:248px;position:absolute;right:0;padding:15px;text-align:left;display:none}
.account .idpwWrap{zoom:1;margin:0 0 10px 0}
.account .idpwWrap:after{content:"";clear:both;display:block}
.account .idpw{margin:0 14px 0 0}
.account .idpw>input{display:block;width:100%}
.account .keep{float:left;white-space:nowrap}
.account .keep *{vertical-align:middle}
.account .keep label{display:inline;font-size:11px;color:#666}
.account .warning{display:none;font-size:11px;line-height:1.4;color:#666;clear:both}
.account input[type=submit]{float:right}
.account .help{list-style:none;margin:0;padding:0;font-size:11px}
.account .help li{display:inline}
.account .help li:before{content:"|";color:#ddd;margin:0 4px 0 0}
.account .help li:first-child:before{content:normal}
.account .info{margin:0;padding:0;list-style:none}
.account .info>li{display:inline}
.account .info>li:before{content:"|"; color:#ddd;margin:0 4px 0 0}
.account .info>li:first-child:before{content:normal}

View file

@ -1,31 +0,0 @@
<load target="bootstrap.login.css" />
<load target="login.xml" />
<load target="bootstrap.login.js" />
<form id="fo_login_widget" action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" class="account">
<a href="#acField" class="btn btn-link">{$lang->cmd_login}</a>
<fieldset class="well" id="acField">
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" required title="{$lang->user_id}" cond="$member_config->identifier != 'email_address'" />
<input name="user_id" type="email" required title="{$lang->email_address}" cond="$member_config->identifier == 'email_address'" />
<input name="password" type="password" required title="{$lang->password}" />
<p class="keep">
<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
<label for="keep_signed">{$lang->keep_signed}</label>
</p>
</div>
<input type="submit" class="btn btn-primary" value="{$lang->cmd_login}" />
</div>
<p class="warning">{$lang->about_keep_warning}</p>
<ul class="help">
<li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</ul>
</fieldset>
</form>

View file

@ -1,8 +0,0 @@
<load target="bootstrap.login.css" />
<load target="logout.xml" />
<div class="account">
<ul class="info">
<li><a href="{getUrl('act','dispMemberInfo')}" title="{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}">{$logged_info->nick_name}</a></li>
<li><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
</ul>
</div>

View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.2">
<title xml:lang="ko">Bootstrap.Login</title>
<title xml:lang="en">Bootstrap.Login</title>
<description xml:lang="ko">부트스트랩 응용 로그인 위젯.</description>
<description xml:lang="en">Bootstrap application login widget.</description>
<version>1.0</version>
<date>2012-09-01</date>
<author email_address="developer@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="en">NHN</name>
</author>
</skin>

View file

@ -0,0 +1,24 @@
@charset "utf-8";.account{display:inline-block;*display:inline;zoom:1;vertical-align:top;margin:0;padding:0}
.account>a,
.account>.info .logout{display:inline-block;*display:inline;*zoom:1;background:#f7f7f7;border:1px solid #d4d8db;border-radius:2px;box-shadow:1px 1px 0 #f3f3f3;color:#666;text-decoration:none;padding:0 10px;line-height:21px;font-weight:bold;font-size:12px}
.account>fieldset{position:absolute;z-index:2;width:229px;top:30px;right:0;display:none;border:0;background:#fff;border:1px solid #d7d7d7;border-radius:3px;margin:0;padding:20px 16px 18px 16px;box-shadow:0 1px 0 #aaa}
.account h2{font-size:13px;color:#666;margin:0 0 18px 0;line-height:1}
.account label{display:block;margin:0 0 5px 0;color:#666;font-size:12px}
.account input[type="text"],
.account input[type="email"],
.account input[type="password"]{height:21px;line-height:21px;padding:0 4px;margin:0 0 10px 0;width:219px;background:#f6f6f6;border:1px solid #d6d6d6;border-top:2px solid #bfbebe;border-bottom:0;box-shadow:0 1px 0 #eae9e9 inset}
.account input[type="checkbox"]{width:13px;height:13px;margin:0;padding:0;vertical-align:middle}
.account input[type="checkbox"]+label{display:inline;vertical-align:middle;cursor:pointer}
.account input[type="submit"]{background:#484d51;border:1px solid #272b30;color:#fff;height:27px;line-height:27px;padding:0 20px;margin:0;vertical-align:top;border-radius:2px;cursor:pointer;box-shadow:0 1px 0 #6d7174 inset}
.account .warning{display:none;color:#666;line-height:1.4}
.account .close{background:none;border:0;color:#ccc;font-size:22px;position:absolute;top:10px;right:8px;margin:0;padding:0;width:32px;height:32px;cursor:pointer;opacity:1;filter:alpha(opacity=100);font-weight:normal}
.account .close:hover,
.account .close:focus{color:#666}
.account .help{list-style:none;margin:15px 0 0 0;padding:15px 0 0 0;border-top:1px solid #e5e5e5}
.account .help li{margin:0 0 3px 0}
.account .help a{position:relative;background:#f5f5f5;border:1px solid #d0d0d0;border-bottom-color:#b7b7b7;border-radius:2px;text-decoration:none;color:#666;display:block;line-height:24px;padding:0 11px;font-size:12px}
.account .help a:after{content:"";position:absolute;right:4px;top:7px;border:4px solid transparent;border-left-color:#b2b2b2}
.account .info{list-style:none;margin:0;padding:0}
.account .info>li{display:inline-block;*display:inline;zoom:1}
.account .info .user{display:inline-block;font-size:13px;font-weight:bold;color:#333;text-decoration:none;margin:0 10px 0 0}
.account .info .user:before{content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 2px 0 0;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAKNJREFUeNpijI2NZcAC2IA4EIg5gXgrEL9GV8CCRZMQEJ8EYhUo/x0QpwPxGmRFTFg0+iFpghlUga4Im0ZmHE4nqJGBXI3vsIi9IEYjKBQvo4k1EaPxFxDPReLfB+J9xGiURgtFRSAuxafRA4iXAvFtIJZAU9cFxJeAuAhqMDgBcEIjXJdAyILke6GG+INsFCVCE3o8e4Ns/ALEsxhIA0cAAgwAuLwYvH6hEcQAAAAASUVORK5CYII=) no-repeat}

View file

@ -6,19 +6,15 @@ function completeLogin(ret_obj, response_tags, params, fo_obj) {
jQuery(function($){
// Login
// placeholder
// Div unwrap
var $account = $('.account');
$account
.unwrap().unwrap()
.find('.idpw>input').each(function(){
var idpw_placeholder = $(this).attr('title');
$(this).attr('placeholder', idpw_placeholder);
});
$account.unwrap().unwrap();
// Toggle
var $acTog = $('a[href="#acField"]');
var $acField = $('#acField');
$acTog.click(function(){
$this = $(this);
$('#acField').slideToggle(200, function(){
$acField.slideToggle(200, function(){
var $user_id = $(this).find('input[name="user_id"]:eq(0)');
if($user_id.is(':visible')){
$user_id.focus();
@ -29,11 +25,10 @@ jQuery(function($){
return false;
});
// Close
$account
.find('>#acField')
.append('<button type="button" class="close">&times;</button>')
$acField
.append('<button type="button" class="close">&times;</button>')
.find('>.close').click(function(){
$(this).closest('#acField').slideUp(200, function(){
$(this).closest($acField).slideUp(200, function(){
$acTog.eq(0).focus();
});
return false;
@ -48,5 +43,5 @@ jQuery(function($){
}
});
// Login Error
$('#fo_login_widget .message').parent('.well').show();
$('#fo_login_widget .message').parent($acField).show();
});

View file

@ -0,0 +1,33 @@
<load target="default.login.css" />
<load target="login.xml" />
<load target="default.login.js" />
<form id="fo_login_widget" action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" class="account">
<a href="#acField">{$lang->cmd_login}</a>
<fieldset id="acField">
<h2>{$lang->cmd_login}</h2>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<input type="hidden" name="xe_validator_id" value="widgets/login_info/skins/default/login_form/1" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'widgets/login_info/skins/default/login_form/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="idpw">
<label for="user_id" cond="$member_config->identifier != 'email_address'">{$lang->user_id}</label>
<input name="user_id" id="user_id" type="text" required cond="$member_config->identifier != 'email_address'" />
<label for="user_id" cond="$member_config->identifier == 'email_address'">{$lang->email_address}</label>
<input name="user_id" id="user_id" type="email" required cond="$member_config->identifier == 'email_address'" />
<label for="user_pw">{$lang->password}</label>
<input name="password" id="user_pw" type="password" required />
<p class="keep">
<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
<label for="keep_signed">{$lang->keep_signed}</label>
</p>
<p class="warning">{$lang->about_keep_warning}</p>
</div>
<input type="submit" value="{$lang->cmd_login}" />
<ul class="help">
<li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
</ul>
</fieldset>
</form>

View file

@ -0,0 +1,9 @@
<load target="default.login.css" />
<load target="logout.xml" />
<load target="default.login.js" />
<div class="account">
<ul class="info">
<li><a href="{getUrl('act','dispMemberInfo','member_srl','')}" title="{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}" class="user">{$logged_info->nick_name}</a></li>
<li><a href="{getUrl('act','dispMemberLogout')}" class="logout">{$lang->cmd_logout}</a></li>
</ul>
</div>

View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.2">
<title xml:lang="ko">기본 로그인 위젯</title>
<title xml:lang="en">Default login widget</title>
<version>1.0</version>
<date>2013-02-28</date>
<author email_address="developer@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="en">NHN</name>
</author>
</skin>

View file

@ -45,7 +45,6 @@
<ul class="help">
<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</ul>
</fieldset>
</form>

View file

@ -46,7 +46,6 @@
<ul class="help">
<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</ul>
</fieldset>
</form>

View file

@ -11,13 +11,14 @@
<!--%import("./filter/openid_login.xml")-->
<!--%import("./js/login.js")-->
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'widgets/login_info/skins/xe_official/login_form/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form id="fo_login_widget" action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" class="login_{$colorset}">
<fieldset>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<input type="hidden" name="xe_validator_id" value="widgets/login_info/skins/xe_official/login_form/1" />
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
@ -37,7 +38,6 @@
<ul class="help">
<li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</ul>
</fieldset>
</form>

View file

@ -37,7 +37,6 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<div class="btnbar">
<a href="{getUrl('act','dispMemberSignUpForm')}"><img src="images/icon_book.gif" alt="" title="{$lang->cmd_signup}"/></a>
<a href="{getUrl('act','dispMemberFindAccount')}"><img src="images/icon_at.gif" alt="" title="{$lang->cmd_find_member_account}"/></a>
<a href="{getUrl('act','dispMemberResendAuthMail')}"><img src="images/icon_help.gif" alt="" title="{$lang->cmd_resend_auth_mail}"/></a>
</div>
</div><!-- //body -->
<span class="tail"><img src="images/signin_bg_tail.png" width="219" height="3" alt="" /></span>