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 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -18,7 +18,6 @@
<description xml:lang="tr">Bu görsel bileşen yazılar, yorumlar ve ekli dosyalar gibi içerikleri görüntüler.</description>
<version>0.1</version>
<date>2009-03-16</date>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="zh-CN">NHN</name>
@ -30,7 +29,6 @@
<name xml:lang="zh-TW">NHN</name>
<name xml:lang="tr">NHN</name>
</author>
<extra_vars>
<group>
<title xml:lang="ko">추출 대상</title>
@ -101,7 +99,7 @@
</var>
<var id="module_srls">
<type>module_srl_list</type>
<name xml:lang="ko">대상 모듈</name>
<name xml:lang="ko">대상 페이지</name>
<name xml:lang="zh-CN">对象模块</name>
<name xml:lang="jp">モジュール</name>
<name xml:lang="en">Target Module</name>
@ -110,7 +108,7 @@
<name xml:lang="ru">Модуль назначения</name>
<name xml:lang="zh-TW">目標模組</name>
<name xml:lang="tr">Hedef Modül</name>
<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
<description xml:lang="ko">선택한 페이지에 등록된 글을 대상으로 합니다.</description>
<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ(書き込み)を対象とします。</description>
<description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
<description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
@ -269,7 +267,7 @@
<name xml:lang="ru">Число списка</name>
<name xml:lang="zh-TW">目錄數</name>
<name xml:lang="tr">Liste Sayısı</name>
<description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
<description xml:lang="ko">출력될 목록의 수를 정 수 있습니다. (기본 5개)</description>
<description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
<description xml:lang="jp">出力するリスト数を指定しますデフォルト5個</description>
<description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
@ -289,7 +287,7 @@
<name xml:lang="ru">Число изображений по горизонтали</name>
<name xml:lang="zh-TW">橫向圖片數</name>
<name xml:lang="tr">Resim Sayısı</name>
<description xml:lang="ko">출력될 가로 이미지의 수를 정하실 수 있습니다. (기본 5개)</description>
<description xml:lang="ko">출력될 가로 이미지의 수를 정 수 있습니다. (기본 5개)</description>
<description xml:lang="jp">表示する横並びのイメージ数を指定しますデフォルト5個</description>
<description xml:lang="zh-CN">可以指定要显示的横向图片个数。(默认为5个)</description>
<description xml:lang="en">You can set the number of images to display. (5 as default)</description>
@ -360,7 +358,7 @@
<name xml:lang="ru">Длина темы</name>
<name xml:lang="zh-TW">標題字數</name>
<name xml:lang="tr">Konu Uzunluğu</name>
<description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
<description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비면 자르지 않습니다)</description>
<description xml:lang="jp">タイトルの文字数を設定します「0」または空欄の場合は、文字数を制限しません</description>
<description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
<description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
@ -394,7 +392,6 @@
</options>
</var>
</group>
<group>
<title xml:lang="ko">목록 상세 설정</title>
<var id="option_view" type="select-multi-order">
@ -461,7 +458,6 @@
<name xml:lang="tr">İçerik</name>
</options>
</var>
<var id="show_browser_title" type="select">
<name xml:lang="ko">게시판 이름 표시</name>
<name xml:lang="en">Display Article Name</name>
@ -494,7 +490,6 @@
<name xml:lang="tr">Görüntüleme</name>
</options>
</var>
<var id="show_comment_count" type="select">
<name xml:lang="ko">댓글수 표시</name>
<name xml:lang="en">Comment Count</name>
@ -527,7 +522,6 @@
<name xml:lang="tr">Görüntüleme</name>
</options>
</var>
<var id="show_trackback_count" type="select">
<name xml:lang="ko">엮인글수 표시</name>
<name xml:lang="en">Trackback</name>
@ -643,9 +637,8 @@
<description xml:lang="tr">Yeni öğe için gösterim süresini ayarlayabilirsiniz. (birim olarak saat kullanılır)</description>
</var>
</group>
<group>
<title xml:lang="ko">정렬</title>
<title xml:lang="ko">정렬</title>
<var id="order_target" type="select">
<name xml:lang="ko">정렬 대상</name>
<name xml:lang="zh-CN">排序对象</name>
@ -666,7 +659,7 @@
<description xml:lang="zh-TW">按照指定的順序進行排列。</description>
<description xml:lang="tr">En yeni yazıların listesi, teslim edilme sırasına veya değişiklik sırasına göre sıralanabilir.</description>
<options>
<value>list_order</value>
<value>regdate</value>
<name xml:lang="ko">최신 등록순</name>
<name xml:lang="zh-CN">最新发表顺</name>
<name xml:lang="jp">最新登録順</name>
@ -735,10 +728,8 @@
</options>
</var>
</group>
<group>
<title xml:lang="ko">썸네일</title>
<title xml:lang="ko">썸네일</title>
<var id="thumbnail_type" type="select">
<name xml:lang="ko">썸네일 생성 방법</name>
<name xml:lang="jp">サムネール生成方法</name>
@ -789,7 +780,7 @@
<name xml:lang="ru">Ширина изображения</name>
<name xml:lang="zh-TW">圖片寬度</name>
<name xml:lang="tr">Resim Genişliği</name>
<description xml:lang="ko">출력될 이미지의 가로크기를 정하실 수 있습니다. (기본 100)</description>
<description xml:lang="ko">출력될 이미지의 가로크기를 정 수 있습니다. (기본 100)</description>
<description xml:lang="jp">表示するイメージの横幅サイズを指定しますデフォルト100</description>
<description xml:lang="zh-CN">可以指定要显示的图片宽度。(默认为100)</description>
<description xml:lang="en">You can set the width of image. (100 as default)</description>
@ -818,9 +809,8 @@
<description xml:lang="tr">Resim yüksekliğini ayarlayabilirsiniz. (varsayılan değer 75'tir)</description>
</var>
</group>
<group>
<title xml:lang="ko">RSS 설정</title>
<title xml:lang="ko">RSS 설정</title>
<var id="rss_url0" type="text">
<name xml:lang="ko">피드(RSS/ATOM) 주소</name>
<name xml:lang="jp">Feed(RSS/ATOM) URL</name>
@ -886,6 +876,6 @@
<name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
<name xml:lang="tr">Feed(RSS/ATOM) URL</name>
</var>
</group>
</group>
</extra_vars>
</widget>

File diff suppressed because it is too large Load diff

View file

@ -10,8 +10,8 @@
<title xml:lang="vi">Counter</title>
<title xml:lang="tr">Sayaç</title>
<description xml:lang="ko">
기본 카운터 모듈을 이용하여 전체, 어제, 오늘의 접속현황을 표시합니다.
counter모듈이 설치되어 있어야 하고 counter 애드온이 켜져 있어야 합니다.
기본 카운터 이용하여 전체, 어제, 오늘의 접속현황을 표시합니다.
counter 모듈이 설치되어 있어야 하고 counter 애드온이 켜져 있어야 합니다.
</description>
<description xml:lang="jp">
デフォルトの接続カウンターモジュールを利用して、トータル、昨日、今日の接続状況を表示します。

View file

@ -1,41 +1,42 @@
<?php
/**
* @class counter_status
* @author NHN (developers@xpressengine.com)
* @version 0.1
* @brief Display counter status by using data in the counter module
**/
/**
* @class counter_status
* @author NHN (developers@xpressengine.com)
* @version 0.1
* @brief Display counter status by using data in the counter module
*/
class counter_status 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)
{
// Get status of the accumulated, yesterday's, today's counts
$oCounterModel = &getModel('counter');
class counter_status 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) {
// Get status of the accumulated, yesterday's, today's counts
$oCounterModel = &getModel('counter');
$site_module_info = Context::get('site_module_info');
$output = $oCounterModel->getStatus(array('00000000', date('Ymd', time()-60*60*24), date('Ymd')), $site_module_info->site_srl);
if(count($output))
$site_module_info = Context::get('site_module_info');
$output = $oCounterModel->getStatus(array('00000000', date('Ymd', time()-60*60*24), date('Ymd')), $site_module_info->site_srl);
if(count($output))
{
foreach($output as $key => $val)
{
foreach($output as $key => $val)
{
if(!$key) Context::set('total_counter', $val);
elseif($key == date("Ymd")) Context::set('today_counter', $val);
else Context::set('yesterday_counter', $val);
}
if(!$key) Context::set('total_counter', $val);
elseif($key == date("Ymd")) Context::set('today_counter', $val);
else Context::set('yesterday_counter', $val);
}
// 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
$tpl_file = 'counter_status';
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}
?>
}
// 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
$tpl_file = 'counter_status';
// Compile a template
$oTemplate = &TemplateHandler::getInstance();
return $oTemplate->compile($tpl_path, $tpl_file);
}
}
/* End of file counter_status.class.php */
/* Location: ./widgets/counter_status/counter_status.class.php */

View file

@ -1,29 +1,30 @@
<?php
/**
* @class language_select
* @author NHN (developers@xpressengine.com)
* @brief Language selector
* @version 0.1
**/
/**
* @class language_select
* @author NHN (developers@xpressengine.com)
* @brief Language selector
* @version 0.1
*/
class language_select 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);
$tpl_file = 'language_select';
class language_select extends WidgetHandler {
Context::set('colorset', $args->colorset);
/**
* @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);
$tpl_file = 'language_select';
Context::set('colorset', $args->colorset);
// 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 language_select.class.php */
/* Location: ./widgets/language_select/language_select.class.php */

View file

@ -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>

View file

@ -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 */

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

@ -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">&times;</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();
});

View 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>

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,7 @@
<filter name="widget_logout" module="member" act="procMemberLogout">
<form />
<response>
<tag name="error" />
<tag name="message" />
</response>
</filter>

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

@ -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>

View file

@ -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>

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

@ -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">

View file

@ -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>

View file

@ -411,7 +411,7 @@
<name xml:lang="ru">Число списка</name>
<name xml:lang="zh-TW">目錄數</name>
<name xml:lang="tr">Liste Sayısı</name>
<description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
<description xml:lang="ko">출력될 목록의 수를 정 수 있습니다. (기본 5개)</description>
<description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
<description xml:lang="jp">出力するリスト数を指定しますデフォルト5個</description>
<description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
@ -432,7 +432,7 @@
<name xml:lang="ru">Длина темы</name>
<name xml:lang="zh-TW">標題字數</name>
<name xml:lang="tr">Konu Uzunluğu</name>
<description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
<description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비면 자르지 않습니다)</description>
<description xml:lang="jp">タイトルの文字数を設定します「0」または空欄の場合は、文字数を制限しません</description>
<description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
<description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
@ -454,7 +454,7 @@
</var>
<var id="module_srls">
<type>module_srl_list</type>
<name xml:lang="ko">대상 모듈</name>
<name xml:lang="ko">대상 페이지</name>
<name xml:lang="zh-CN">对象模块</name>
<name xml:lang="jp">モジュール</name>
<name xml:lang="en">Target Module</name>
@ -463,7 +463,7 @@
<name xml:lang="ru">Модуль назначения</name>
<name xml:lang="zh-TW">目標模組</name>
<name xml:lang="tr">Hedef Modül</name>
<description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
<description xml:lang="ko">선택한 페이지에 등록된 글을 대상으로 합니다.</description>
<description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ(書き込み)を対象とします。</description>
<description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
<description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>

File diff suppressed because it is too large Load diff