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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

4
widgets/login_info/skins/xe_global/login_form.html
View file

@ -18,7 +18,7 @@
<form action="./" method="post" ruleset="@login" id="fo_login_widget">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<h2>Login</h2>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
@ -54,7 +54,7 @@
<!--@if($member_config->enable_openid=='Y')-->
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<div class="idpwWrap">
<div class="idpw">
<p>{$lang->openid}</p>

2
widgets/login_info/skins/xe_global/login_info.html
View file

@ -11,7 +11,7 @@
<form action="" method="post">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<div class="userName">
<div class="fl u_name"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>

4
widgets/login_info/skins/xe_globalTwo/login_form.html
View file

@ -19,7 +19,7 @@
<form action="./" method="post" ruleset="@login" id="fo_login_widget" class="fo_login_widget">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<h2>Login</h2>
@ -55,7 +55,7 @@
<!--@if($member_config->enable_openid=='Y')-->
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<div class="idpwWrap">
<div class="idpw">
<p>{$lang->openid}</p>

2
widgets/login_info/skins/xe_globalTwo/login_info.html
View file

@ -11,7 +11,7 @@
<form action="" method="post" class="fo_login_widget">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<div class="userName">
<div class="fl u_name"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>

2
widgets/login_info/skins/xe_official/css/black.css
View file

@ -10,7 +10,7 @@
.login_black fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_black fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_black fieldset p.keep{margin:5px 0;clear:both;padding:0}
.login_black fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0}
.login_black fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;border:0}
.login_black fieldset p.keep label{font:.9em;color:#818181}
.login_black fieldset p.keep_msg{color:#818181}
.login_black fieldset ul.help{margin:0;border-top:1px solid #515151;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}

2
widgets/login_info/skins/xe_official/css/default.css
View file

@ -10,7 +10,7 @@
.login_default fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_default fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_default fieldset p.keep{margin:1px 0 5px 0;padding:0}
.login_default fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;padding:0}
.login_default fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;padding:0;border:0}
.login_default fieldset p.keep label{font:.9em;color:#666;vertical-align:middle}
.login_default fieldset p.keep_msg{color:#666}
.login_default fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none;clear:both}

2
widgets/login_info/skins/xe_official/css/white.css
View file

@ -10,7 +10,7 @@
.login_white fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_white fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_white fieldset p.keep{margin:5px 0;clear:both;padding:0}
.login_white fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0 }
.login_white fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;border:0}
.login_white fieldset p.keep label{font:.9em;color:#666}
.login_white fieldset p.keep_msg{color:#666}
.login_white fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}

4
widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
View file

@ -12,7 +12,7 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<form action="./" method="post" ruleset="@login" id="fo_login_widget">
<fieldset id="login">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div id="sign_box">
@ -40,7 +40,7 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<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="" class="iePngFix" /></span>
<span class="tail"><img src="images/signin_bg_tail.png" width="219" height="3" alt="" /></span>
</div><!-- //signin_window -->
</div>
</fieldset>

4
widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
View file

@ -4,7 +4,7 @@
<form action="" method="post">
<fieldset id="login" class="login_{$colorset}">
<legend>{$lang->cmd_login}</legend>
<legend>{$lang->cmd_login}...</legend>
<div id="sign_box">
<div class="txt sign_state1"><span class="label">{$logged_info->nick_name}</span></div>
<div class="mbInfo_window" style="overflow:hidden;">
@ -26,7 +26,7 @@
</div>
<iframe class="T_iframe" border=0 style="top:0px;left:0px;width:219px;height:400px;z-index:-1;position:absolute;"></iframe>
</div><!-- //body -->
<span class="tail"><img src="images/minfo_bg_tail.png" width="172" height="3" alt="" class="iePngFix" /></span>
<span class="tail"><img src="images/minfo_bg_tail.png" width="172" height="3" alt="" /></span>
</div><!-- //mbInfo_window -->
</div><!-- //sign_box -->
</fieldset>