mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-21 20:29:57 +09:00
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
parent
cc47d2b247
commit
2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
File diff suppressed because one or more lines are too long
|
|
@ -1,33 +1,33 @@
|
|||
@charset "utf-8";
|
||||
/* NHN | dece24@nhncorp.com */
|
||||
#loginAccess{position:relative;width:384px;border:2px solid #757575;margin:30px auto;padding:20px 0 0 0;background:#fff;font-size:12px;font-family:Tahoma;line-height:normal;border-radius:5px;box-shadow:0 0 10px #ccc}
|
||||
#loginAccess form{margin:0;padding:0}
|
||||
#loginAccess fieldset{border:0;margin:0;padding:0}
|
||||
#loginAccess h1{margin:0 28px 20px 28px;font-size:12px;color:#e77161}
|
||||
#loginAccess ul{margin:0;padding:0;list-style:none}
|
||||
#loginAccess .idpw{margin:0 28px 20px 28px}
|
||||
#loginAccess .idpw li{margin:0 0 5px 0}
|
||||
#loginAccess .iText{font-size:12px;height:22px;color:#767676;font-weight:bold;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1}
|
||||
#loginAccess .idpw .iText{width:316px;padding:8px 0 0 10px}
|
||||
#loginAccess .inputCheck{width:13px;height:13px;margin:0;padding:0;vertical-align:middle}
|
||||
#loginAccess label{vertical-align:middle}
|
||||
#loginAccess #warning{display:none;margin:0 0 20px 0}
|
||||
#loginAccess #warning.open{display:block}
|
||||
#loginAccess #warning p{margin:0}
|
||||
#loginAccess .buttonArea{position:relative;margin:0 28px;padding:0;color:#767676;*zoom:1}
|
||||
#loginAccess .buttonArea .keeping{position:relative;margin:0 0 20px 0;height:32px;line-height:32px}
|
||||
#loginAccess #gLogin .buttonArea .buttonAccount{position:absolute;top:0;right:0}
|
||||
#loginAccess .buttonAccount,
|
||||
#loginAccess .buttonAccount a,
|
||||
#loginAccess .buttonAccount input{position:relative;display:inline-block;margin:0;padding:0;overflow:visible;height:32px;line-height:32px;font-size:12px;font-weight:bold;color:#fff;vertical-align:middle;cursor:pointer;border:0;text-decoration:none !important;background:transparent url(./images/buttonAction.gif) no-repeat}
|
||||
#loginAccess .buttonAccount{margin:0 4px 0 0;background-position:left top}
|
||||
#loginAccess .buttonAccount a,
|
||||
#loginAccess .buttonAccount input{left:4px;background-position:right top;vertical-align:top;padding:0 24px 0 36px}
|
||||
#loginAccess .help{position:relative;padding:15px 0;background:#fafafa;border-top:1px solid #d9d9d9;text-align:center;border-radius:0 0 5px 5px}
|
||||
#loginAccess .help li{display:inline;border-left:1px solid #c3c3c3;padding:0 0 0 10px;margin:0 6px 0 0;line-height:1}
|
||||
#loginAccess .help li.first{border:0;padding:0}
|
||||
#loginAccess .help a{text-decoration:none;color:#333}
|
||||
#loginAccess .help a:hover,
|
||||
#loginAccess .help a:active,
|
||||
#loginAccess .help a:focus{text-decoration:underline}
|
||||
#loginAccess .logOut{text-align:left;margin:0 28px;padding:0 0 20px 0}
|
||||
@font-face{font-family:NG;src:url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.eot);src:local(※),url(https://themes.googleusercontent.com/static/fonts/earlyaccess/nanumgothic/v3/NanumGothic-Regular.woff) format('woff')}
|
||||
body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:나눔고딕,NanumGothic,NG,돋움,Dotum,Arial,Helvetica,sans-serif;font-size:13px}
|
||||
@media all and (max-width:980px){
|
||||
body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
|
||||
}
|
||||
#access{width:400px;margin:30px auto;background-color:#ffffff;border:1px solid #999;border-radius:6px;box-shadow:0 3px 7px #ccc;box-sizing:border-box}
|
||||
#access>.login-header{padding:9px 15px;border-bottom:1px solid #eee}
|
||||
#access>.login-header>h1{margin:0;font-size:16px;line-height:1.4;font-weight:600;color:#666}
|
||||
#access>.login-header>h1>i{opacity:.5;filter:alpha(opacity=50);margin:2px 0 0 0}
|
||||
#access>.login-body{max-height:400px;padding:15px}
|
||||
#access>.login-body>*:first-child{margin-top:0}
|
||||
#access>.login-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff; color:#ccc}
|
||||
#access>.login-footer:before,
|
||||
#access>.login-footer:after{display:table;line-height:0;content:"";clear:both}
|
||||
#access .control-group{position:relative;padding:0 14px 0 0;margin:0;clear:both}
|
||||
#access .control-group:before{content:"";display:block;clear:both}
|
||||
#access form{margin:0}
|
||||
#access fieldset{margin:0}
|
||||
#access label{cursor:pointer;display:inline-block}
|
||||
#access input[type="text"],
|
||||
#access input[type="email"],
|
||||
#access input[type="password"]{width:100%}
|
||||
#access input[type="checkbox"]{margin:0}
|
||||
#access .btn{border-radius:2px;overflow:visible;font-size:14px;line-height:18px;height:auto;padding:3px 9px;text-decoration:none}
|
||||
#access .submit{position:absolute;top:0;right:0}
|
||||
#access p{margin:10px 0}
|
||||
#access #warning{margin-right:-14px}
|
||||
#access a{color: #0088cc;text-decoration: none;}
|
||||
@media all and (max-width:480px){
|
||||
#access{position:static;margin:0;width:100%}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,29 +10,14 @@ function completeMessageOpenIDLogin(ret_obj, response_tags) {
|
|||
location.href = redirect_url;
|
||||
}
|
||||
|
||||
function doLogin(o,filter){
|
||||
jQuery('input.iText',o).each(function(){
|
||||
var t = jQuery(this);
|
||||
if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
|
||||
jQuery(function($){
|
||||
$('#warning').hide();
|
||||
$('#keepid').change(function(){
|
||||
var $warning = $('#warning');
|
||||
if($(this).is(':checked')){
|
||||
$warning.slideDown(200);
|
||||
} else {
|
||||
$warning.slideUp(200);
|
||||
}
|
||||
});
|
||||
procFilter(o,filter);
|
||||
initLoginTitleMsg();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
function initLoginTitleMsg(){
|
||||
jQuery('.gLogin, .mLogin').find('input.iText').focus(function(){
|
||||
var t = jQuery(this);
|
||||
if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
|
||||
}).blur(function(){
|
||||
var t = jQuery(this);
|
||||
if(t.attr('title').length>0 && t.val()=='') t.val(t.attr('title'));
|
||||
}).focus().blur();
|
||||
}
|
||||
|
||||
jQuery(function(){
|
||||
initLoginTitleMsg();
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
|
@ -1,43 +1,51 @@
|
|||
<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
|
||||
<block cond="!$is_logged && $module == 'admin'">
|
||||
<load target="../../../../common/css/bootstrap.min.css" index="1" />
|
||||
</block>
|
||||
<load target="./filter/openid_login.xml" />
|
||||
<load target="./message.css" />
|
||||
<load target="./message.css" index="2" />
|
||||
<load target="./message.js" />
|
||||
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
<div id="loginAccess" class="gLogin">
|
||||
<h1>{$system_message}</h1>
|
||||
<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'">
|
||||
<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="gForm">
|
||||
<input type="hidden" name="module" value="member" />
|
||||
<input type="hidden" name="act" value="procMemberLogin" />
|
||||
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
|
||||
<div id="access">
|
||||
<div class="login-header">
|
||||
<h1><i class="icon-user"></i> {$system_message}</h1>
|
||||
</div>
|
||||
<div class="login-body">
|
||||
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/message/skins/default/system_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
<form cond="!$is_logged && $module == 'admin'" ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post">
|
||||
<input type="hidden" name="module" value="member" />
|
||||
<input type="hidden" name="act" value="procMemberLogin" />
|
||||
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
|
||||
<input type="hidden" name="xe_validator_id" value="modules/message/skins/default/system_message/1" />
|
||||
<fieldset>
|
||||
<ul class="idpw">
|
||||
<li><input type="text" name="user_id" id="uid" value="" class="iText" title="{$lang->user_id}" /></li>
|
||||
<li><input type="password" name="password" id="upw" value="" class="iText" title="{$lang->password}" /></li>
|
||||
</ul>
|
||||
<div class="buttonArea">
|
||||
<p class="keeping">
|
||||
<div class="control-group">
|
||||
<input type="text" name="user_id" id="uid" title="{$lang->user_id}" placeholder="{$lang->user_id}" required autofocus cond="$member_config->identifier != 'email_address'" />
|
||||
<input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
|
||||
<input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label for="keepid">
|
||||
<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />
|
||||
<label for="keepid">{$lang->keep_signed}</label>
|
||||
</p>
|
||||
<div id="warning" class="">
|
||||
<p>{$lang->about_keep_warning}</p>
|
||||
</div>
|
||||
<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
|
||||
{$lang->keep_signed}
|
||||
</label>
|
||||
<p id="warning">{$lang->about_keep_warning}</p>
|
||||
<input type="submit" value="{$lang->cmd_login}" class="submit btn btn-inverse" />
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
<ul class="help">
|
||||
<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
|
||||
<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
|
||||
</ul>
|
||||
<p cond="$is_logged" style="text-align:center">
|
||||
<a href="{getUrl('act','dispMemberLogout','module','')}" class="btn">{$lang->cmd_logout}</a>
|
||||
</p>
|
||||
<p cond="!$is_logged && $module != 'admin'" style="text-align:center">
|
||||
<a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}" class="btn">{$lang->cmd_login}</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="logOut" cond="$is_logged && $module == 'admin'">
|
||||
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
|
||||
</div>
|
||||
<div class="logOut" cond="!$is_logged && $module != 'admin'">
|
||||
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}...</a></span>
|
||||
<div class="login-footer" cond="!$is_logged">
|
||||
<div class="pull-right">
|
||||
<a href="{getUrl('','act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
|
||||
|
|
||||
<a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue