mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-25 06:09:55 +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
|
|
@ -20,7 +20,6 @@
|
|||
<description xml:lang="tr">Bu görsel bileşen giriş şeklini veya giriş bilgilerini görüntüler.</description>
|
||||
<version>0.1</version>
|
||||
<date>2007-02-28</date>
|
||||
|
||||
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
|
||||
<name xml:lang="ko">NHN</name>
|
||||
<name xml:lang="zh-CN">NHN</name>
|
||||
|
|
@ -32,5 +31,4 @@
|
|||
<name xml:lang="zh-TW">NHN</name>
|
||||
<name xml:lang="tr">NHN</name>
|
||||
</author>
|
||||
<extra_vars />
|
||||
</widget>
|
||||
|
|
|
|||
|
|
@ -1,46 +1,45 @@
|
|||
<?php
|
||||
/**
|
||||
* @class login_info
|
||||
* @author NHN (developers@xpressengine.com)
|
||||
* @version 0.1
|
||||
* @brief Widget to display log-in form
|
||||
*
|
||||
* $Pre-configured by using $logged_info
|
||||
**/
|
||||
/**
|
||||
* @class login_info
|
||||
* @author NHN (developers@xpressengine.com)
|
||||
* @version 0.1
|
||||
* @brief Widget to display log-in form
|
||||
*
|
||||
* $Pre-configured by using $logged_info
|
||||
*/
|
||||
class login_info extends WidgetHandler
|
||||
{
|
||||
/**
|
||||
* @brief Widget execution
|
||||
* Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
|
||||
* After generating the result, do not print but return it.
|
||||
*/
|
||||
function proc($args)
|
||||
{
|
||||
// Set a path of the template skin (values of skin, colorset settings)
|
||||
$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
|
||||
Context::set('colorset', $args->colorset);
|
||||
// Specify a template file
|
||||
if(Context::get('is_logged')) $tpl_file = 'login_info';
|
||||
else $tpl_file = 'login_form';
|
||||
// Get the member configuration
|
||||
$oModuleModel = &getModel('module');
|
||||
$this->member_config = $oModuleModel->getModuleConfig('member');
|
||||
Context::set('member_config', $this->member_config);
|
||||
|
||||
class login_info extends WidgetHandler {
|
||||
// Set a flag to check if the https connection is made when using SSL and create https url
|
||||
$ssl_mode = false;
|
||||
$useSsl = Context::getSslStatus();
|
||||
if($useSsl != 'none')
|
||||
{
|
||||
if(preg_match('/^https:\/\//i', Context::getRequestUri())) $ssl_mode = true;
|
||||
}
|
||||
Context::set('ssl_mode',$ssl_mode);
|
||||
|
||||
/**
|
||||
* @brief Widget execution
|
||||
* Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
|
||||
* After generating the result, do not print but return it.
|
||||
**/
|
||||
function proc($args) {
|
||||
// Set a path of the template skin (values of skin, colorset settings)
|
||||
$tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
|
||||
Context::set('colorset', $args->colorset);
|
||||
// Specify a template file
|
||||
if(Context::get('is_logged')) $tpl_file = 'login_info';
|
||||
else $tpl_file = 'login_form';
|
||||
// Get the member configuration
|
||||
$oModuleModel = &getModel('module');
|
||||
$this->member_config = $oModuleModel->getModuleConfig('member');
|
||||
Context::set('member_config', $this->member_config);
|
||||
|
||||
// Set a flag to check if the https connection is made when using SSL and create https url
|
||||
$ssl_mode = false;
|
||||
$useSsl = Context::getSslStatus();
|
||||
if($useSsl != 'none')
|
||||
{
|
||||
if(preg_match('/^https:\/\//i', Context::getRequestUri())) $ssl_mode = true;
|
||||
}
|
||||
Context::set('ssl_mode',$ssl_mode);
|
||||
|
||||
// Compile a template
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
return $oTemplate->compile($tpl_path, $tpl_file);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
?>
|
||||
// Compile a template
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
return $oTemplate->compile($tpl_path, $tpl_file);
|
||||
}
|
||||
}
|
||||
/* End of file login_info.class.php */
|
||||
/* Location: ./widgets/login_info/login_info.class.php */
|
||||
|
|
|
|||
24
widgets/login_info/skins/default/default.login.css
Normal file
24
widgets/login_info/skins/default/default.login.css
Normal 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}
|
||||
47
widgets/login_info/skins/default/default.login.js
Normal file
47
widgets/login_info/skins/default/default.login.js
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
/* After Login */
|
||||
function completeLogin(ret_obj, response_tags, params, fo_obj) {
|
||||
var url = current_url.setQuery('act','');
|
||||
location.href = url;
|
||||
}
|
||||
|
||||
jQuery(function($){
|
||||
// Login
|
||||
// Div unwrap
|
||||
var $account = $('.account');
|
||||
$account.unwrap().unwrap();
|
||||
// Toggle
|
||||
var $acTog = $('a[href="#acField"]');
|
||||
var $acField = $('#acField');
|
||||
$acTog.click(function(){
|
||||
$this = $(this);
|
||||
$acField.slideToggle(200, function(){
|
||||
var $user_id = $(this).find('input[name="user_id"]:eq(0)');
|
||||
if($user_id.is(':visible')){
|
||||
$user_id.focus();
|
||||
} else {
|
||||
$this.focus();
|
||||
}
|
||||
});
|
||||
return false;
|
||||
});
|
||||
// Close
|
||||
$acField
|
||||
.append('<button type="button" class="close">×</button>')
|
||||
.find('>.close').click(function(){
|
||||
$(this).closest($acField).slideUp(200, function(){
|
||||
$acTog.eq(0).focus();
|
||||
});
|
||||
return false;
|
||||
});
|
||||
// Warning
|
||||
var $acWarning = $account.find('.warning');
|
||||
$('#keep_signed').change(function(){
|
||||
if($(this).is(':checked')){
|
||||
$acWarning.slideDown(200);
|
||||
} else {
|
||||
$acWarning.slideUp(200);
|
||||
}
|
||||
});
|
||||
// Login Error
|
||||
$('#fo_login_widget .message').parent($acField).show();
|
||||
});
|
||||
11
widgets/login_info/skins/default/login.xml
Normal file
11
widgets/login_info/skins/default/login.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<filter name="widget_login" module="member" act="procMemberLogin">
|
||||
<form>
|
||||
<node target="user_id" required="true" filter="user_id" />
|
||||
<node target="password" required="true" />
|
||||
</form>
|
||||
<parameter />
|
||||
<response callback_func="completeLogin">
|
||||
<tag name="error" />
|
||||
<tag name="message" />
|
||||
</response>
|
||||
</filter>
|
||||
33
widgets/login_info/skins/default/login_form.html
Normal file
33
widgets/login_info/skins/default/login_form.html
Normal 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>
|
||||
9
widgets/login_info/skins/default/login_info.html
Normal file
9
widgets/login_info/skins/default/login_info.html
Normal 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>
|
||||
7
widgets/login_info/skins/default/logout.xml
Normal file
7
widgets/login_info/skins/default/logout.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<filter name="widget_logout" module="member" act="procMemberLogout">
|
||||
<form />
|
||||
<response>
|
||||
<tag name="error" />
|
||||
<tag name="message" />
|
||||
</response>
|
||||
</filter>
|
||||
11
widgets/login_info/skins/default/skin.xml
Normal file
11
widgets/login_info/skins/default/skin.xml
Normal 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>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -11,7 +11,7 @@
|
|||
<!--%import("./filter/openid_login.xml")-->
|
||||
<!--%import("./js/login.js")-->
|
||||
|
||||
<script type="text/javascript">
|
||||
<script>
|
||||
var keep_signed_msg = "{$lang->about_keep_signed}";
|
||||
xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
|
||||
</script>
|
||||
|
|
@ -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>
|
||||
|
|
@ -70,6 +69,6 @@
|
|||
</form>
|
||||
<!--@end-->
|
||||
|
||||
<script type="text/javascript">
|
||||
<script>
|
||||
xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
|
||||
</script>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -11,7 +11,7 @@
|
|||
<!--%import("./filter/openid_login.xml")-->
|
||||
<!--%import("./js/login.js")-->
|
||||
|
||||
<script type="text/javascript">
|
||||
<script>
|
||||
var keep_signed_msg = "{$lang->about_keep_signed}";
|
||||
xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
|
||||
</script>
|
||||
|
|
@ -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>
|
||||
|
|
@ -71,6 +70,6 @@
|
|||
</form>
|
||||
<!--@end-->
|
||||
|
||||
<script type="text/javascript">
|
||||
<script>
|
||||
xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<fieldset>
|
||||
<div class="userName">
|
||||
<a href="#popup_menu_area" class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</a>
|
||||
<a href="{getUrl('act','dispMemberLogout')}">Log out</a>
|
||||
<a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a>
|
||||
<p class="latestLogin">{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}</p>
|
||||
</div>
|
||||
<ul class="userMenu">
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
<!--%import("./filter/login.xml")-->
|
||||
<!--%import("./js/login.js")-->
|
||||
<script type="text/javascript">
|
||||
<script>
|
||||
//<![CDATA[
|
||||
var keep_signed_msg = "{$lang->about_keep_signed}";
|
||||
//]]>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue