fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2595 fixed. Message module skin(login page) update.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11765 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-10-18 00:25:44 +00:00
parent 009997e2a9
commit 46bc0acf39
4 changed files with 76 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/message/m.skins/default/system_message.html
View file

@ -15,13 +15,14 @@
{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) } {@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) } {@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("./filter/openid_login.xml")--> <!--%import("./filter/openid_login.xml")-->
<div class="mLogin" id="gLogin"> <div class="mLogin">
<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm" class="ff"> <form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" class="ff">
<input type="hidden" name="module" value="member" /> <input type="hidden" name="module" value="member" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" /> <input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset> <fieldset>
<ul> <ul>
<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 cond="$member_config->identifier == 'user_id'"><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" required autofocus /></li>
<li cond="$member_config->identifier != 'user_id'"><label for="uid"></label><input type="email" name="user_id" id="uid" required /></li>
<li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li> <li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li>
</ul> </ul>
<p> <p>
@ -35,31 +36,10 @@
<ul class="hp"> <ul class="hp">
<li><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li> <li><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> <li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
<!--@if($member_config->enable_openid=='Y')-->
<li><a href="#oLogin">Open ID</a></li>
<!--@end-->
</ul> </ul>
</fieldset> </fieldset>
</form> </form>
</div> </div>
<!-- OpenID -->
<!--@if($member_config->enable_openid=='Y')-->
<div class="mLogin" id="oLogin">
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="oForm" class="ff">
<fieldset>
<ul>
<li><label for="openid">Open ID</label><input type="text" name="openid" id="openid" value="" /></li>
</ul>
<div class="buttonArea">
<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
</div>
<ul class="hp">
<li><a href="#gLogin">{$lang->cmd_common_id}</a></li>
</ul>
</fieldset>
</form>
</div>
<!--@end-->
<!--@end--> <!--@end-->
<!--@if($is_logged)--> <!--@if($is_logged)-->
<div class="logOut"> <div class="logOut">

59
modules/message/skins/default/message.css
View file

@ -1,33 +1,30 @@
@charset "utf-8"; @charset "utf-8";
/* NHN | dece24@nhncorp.com */ /* 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} @font-face{font-family:NG;src:url(../../../../common/font/NanumGothic.eot);src:local(※),url(../../../../common/font/NanumGothic.woff) format('woff')}
#loginAccess form{margin:0;padding:0} 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}
#loginAccess fieldset{border:0;margin:0;padding:0} @media all and (max-width:980px){
#loginAccess h1{margin:0 28px 20px 28px;font-size:12px;color:#e77161} body, #access table, #access input, #access textarea, #access select, #access button, #access label{font-family:돋움,Dotum,Arial,Helvetica,sans-serif}
#loginAccess ul{margin:0;padding:0;list-style:none} }
#loginAccess .idpw{margin:0 28px 20px 28px} #access{position:fixed;top:50%;left:50%;width:400px;margin:-180px 0 0 -200px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}
#loginAccess .idpw li{margin:0 0 5px 0} #access>.login-header{padding:9px 15px;border-bottom:1px solid #eee}
#loginAccess .iText{font-size:12px;height:22px;color:#767676;font-weight:bold;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1} #access>.login-header>h1{margin:0;font-size:16px;line-height:1.4;font-weight:600;color:#666}
#loginAccess .idpw .iText{width:316px;padding:8px 0 0 10px} #access>.login-body{max-height:400px;padding:15px}
#loginAccess .inputCheck{width:13px;height:13px;margin:0;padding:0;vertical-align:middle} #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}
#loginAccess label{vertical-align:middle} #access>.login-footer:before,
#loginAccess #warning{display:none;margin:0 0 20px 0} #access>.login-footer:after{display:table;line-height:0;content:"";clear:both}
#loginAccess #warning.open{display:block} #access .x_control-group{position:relative;padding:0 14px 0 0;margin:0;clear:both}
#loginAccess #warning p{margin:0} #access .x_control-group:before{content:"";display:block;clear:both}
#loginAccess .buttonArea{position:relative;margin:0 28px;padding:0;color:#767676;*zoom:1} #access form{margin:0}
#loginAccess .buttonArea .keeping{position:relative;margin:0 0 20px 0;height:32px;line-height:32px} #access fieldset{margin:0}
#loginAccess #gLogin .buttonArea .buttonAccount{position:absolute;top:0;right:0} #access label{cursor:pointer;display:inline-block}
#loginAccess .buttonAccount, #access input[type="text"],
#loginAccess .buttonAccount a, #access input[type="email"],
#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} #access input[type="password"]{width:100%}
#loginAccess .buttonAccount{margin:0 4px 0 0;background-position:left top} #access input[type="checkbox"]{margin:0}
#loginAccess .buttonAccount a, #access .x_btn{border-radius:2px;overflow:visible;font-size:14px;line-height:18px;padding:3px 9px}
#loginAccess .buttonAccount input{left:4px;background-position:right top;vertical-align:top;padding:0 24px 0 36px} #access .submit{position:absolute;top:0;right:0}
#loginAccess .help{position:relative;padding:15px 0;background:#fafafa;border-top:1px solid #d9d9d9;text-align:center;border-radius:0 0 5px 5px} #access p{margin:10px 0}
#loginAccess .help li{display:inline;border-left:1px solid #c3c3c3;padding:0 0 0 10px;margin:0 6px 0 0;line-height:1} #access #warning{margin-right:-14px}
#loginAccess .help li.first{border:0;padding:0} @media all and (max-width:480px){
#loginAccess .help a{text-decoration:none;color:#333} #access{position:static;margin:0;width:100%}
#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}

35
modules/message/skins/default/message.js
View file

@ -10,29 +10,14 @@ function completeMessageOpenIDLogin(ret_obj, response_tags) {
location.href = redirect_url; location.href = redirect_url;
} }
function doLogin(o,filter){ jQuery(function($){
jQuery('input.iText',o).each(function(){ $('#warning').hide();
var t = jQuery(this); $('#keepid').change(function(){
if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val(''); 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();
});

63
modules/message/skins/default/system_message.html
View file

@ -1,43 +1,48 @@
<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" /> <load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
<load target="./filter/openid_login.xml" /> <load target="./filter/openid_login.xml" />
<load target="./message.css" /> <load target="../../../../common/css/bootstrap.min.css" index="1" />
<load target="./message.css" index="2" />
<load target="./message.js" /> <load target="./message.js" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}"> <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p> <p>{$XE_VALIDATOR_MESSAGE}</p>
</div> </div>
<div id="loginAccess" class="gLogin"> <div id="access">
<h1>{$system_message}</h1> <div class="login-header">
<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'"> <h1>{$system_message}</h1>
<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="gForm"> </div>
<input type="hidden" name="module" value="member" /> <div class="login-body">
<input type="hidden" name="act" value="procMemberLogin" /> <form cond="!$is_logged && $module == 'admin'" ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post">
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" /> <input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset> <fieldset>
<ul class="idpw"> <div class="x_control-group">
<li><input type="text" name="user_id" id="uid" value="" class="iText" title="{$lang->user_id}" /></li> <input type="text" name="user_id" id="uid" title="{$lang->user_id}" placeholder="{$lang->user_id}" required autofocus cond="$member_config->identifier != 'email_address'" />
<li><input type="password" name="password" id="upw" value="" class="iText" title="{$lang->password}" /></li> <input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
</ul> <input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
<div class="buttonArea"> </div>
<p class="keeping"> <div class="x_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');" /> <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> {$lang->keep_signed}
</p> </label>
<div id="warning" class=""> <p id="warning">{$lang->about_keep_warning}</p>
<p>{$lang->about_keep_warning}</p> <input type="submit" value="{$lang->cmd_login}" class="submit x_btn x_btn-primary x_btn-inverse" />
</div>
<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
</div> </div>
</fieldset> </fieldset>
</form> </form>
<ul class="help"> <p cond="$is_logged && $module == 'admin'" style="text-align:center">
<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li> <a href="{getUrl('act','dispMemberLogout','module','')}" class="x_btn">{$lang->cmd_logout}</a>
<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li> </p>
</ul> <p cond="!$is_logged && $module != 'admin'" style="text-align:center">
<a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}" class="x_btn">{$lang->cmd_login}...</a>
</p>
</div> </div>
<div class="logOut" cond="$is_logged && $module == 'admin'"> <div class="login-footer">
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span> <div class="x_pull-right">
</div> <a href="{getUrl('','act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
<div class="logOut" cond="!$is_logged && $module != 'admin'"> |
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}...</a></span> <a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
</div>
</div> </div>
</div> </div>