mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-29 16:19:58 +09:00
merge sandbox to trunk for 1.4.4
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader
parent
200d63636c
commit
b8299c8a65
683 changed files with 70982 additions and 69716 deletions
|
|
@ -0,0 +1,14 @@
|
|||
<filter name="find_member_account_by_question" module="member" act="procMemberFindAccountByQuestion">
|
||||
<form>
|
||||
<node target="user_id" required="true" />
|
||||
<node target="email_address" required="true" minlength="2" maxlength="255" filter="email" />
|
||||
<node target="find_account_question" required="true" />
|
||||
<node target="find_account_answer" required="true" maxlength="250" />
|
||||
</form>
|
||||
<parameter />
|
||||
<response callback_func="completeFindMemberAccountByQuestion">
|
||||
<tag name="error" />
|
||||
<tag name="message" />
|
||||
<tag name="user_id" />
|
||||
</response>
|
||||
</filter>
|
||||
|
|
@ -3,12 +3,16 @@
|
|||
<node target="user_name" required="true" minlength="2" maxlength="40" />
|
||||
<node target="nick_name" required="true" minlength="2" maxlength="40" />
|
||||
<node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
|
||||
<node target="find_account_question" required="true" />
|
||||
<node target="find_account_answer" required="true" maxlength="250" />
|
||||
</form>
|
||||
<parameter>
|
||||
<param name="accept_agreement" target="accept_agreement" />
|
||||
<param name="user_name" target="user_name" />
|
||||
<param name="nick_name" target="nick_name" />
|
||||
<param name="homepage" target="homepage" />
|
||||
<param name="nick_name" target="nick_name" />
|
||||
<param name="find_account_question" target="find_account_question" />
|
||||
<param name="find_account_answer" target="find_account_answer" />
|
||||
<param name="blog" target="blog" />
|
||||
<param name="birthday" target="birthday" />
|
||||
<param name="allow_mailing" target="allow_mailing" />
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
<node target="user_name" required="true" minlength="2" maxlength="40" />
|
||||
<node target="nick_name" required="true" minlength="2" maxlength="40" />
|
||||
<node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
|
||||
<node target="find_account_question" required="true" />
|
||||
<node target="find_account_answer" required="true" maxlength="250" />
|
||||
</form>
|
||||
<parameter>
|
||||
<param name="accept_agreement" target="accept_agreement" />
|
||||
|
|
@ -14,6 +16,8 @@
|
|||
<param name="password" target="password1" />
|
||||
<param name="user_name" target="user_name" />
|
||||
<param name="nick_name" target="nick_name" />
|
||||
<param name="find_account_question" target="find_account_question" />
|
||||
<param name="find_account_answer" target="find_account_answer" />
|
||||
<param name="homepage" target="homepage" />
|
||||
<param name="blog" target="blog" />
|
||||
<param name="birthday" target="birthday" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<!--#include("./common_header.html")-->
|
||||
<!--%import("filter/find_member_account.xml")-->
|
||||
<!--%import("filter/find_member_account_by_question.xml")-->
|
||||
|
||||
<h3>{$member_title = $lang->cmd_find_member_account}</h3>
|
||||
<h3>{$lang->cmd_find_member_account}</h3>
|
||||
|
||||
<p class="summary">{$lang->about_find_member_account}</p>
|
||||
|
||||
|
|
@ -20,4 +21,46 @@
|
|||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
|
||||
|
||||
<!--@if(count($lang->find_account_question_items)>1)-->
|
||||
<h3>{$lang->cmd_find_member_account}</h3>
|
||||
|
||||
<p class="summary">{$lang->about_find_account_question}</p>
|
||||
|
||||
<form action="./" method="get" onsubmit="return procFilter(this, find_member_account_by_question)">
|
||||
<input type="hidden" name="mid" value="{$mid}" />
|
||||
<input type="hidden" name="document_srl" value="{$document_srl}" />
|
||||
<input type="hidden" name="page" value="{$page}" />
|
||||
|
||||
<table cellspacing="0" class="rowTable" title="{$lang->email_address}">
|
||||
<tr>
|
||||
<th><div><label for="cpw">{$lang->user_id}</label></div></th>
|
||||
<td class="wide"><input type="text" name="user_id" class="inputTypeText" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><div><label for="cpw">{$lang->email_address}</label></div></th>
|
||||
<td class="wide"><input type="text" name="email_address" class="inputTypeText w400" /></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><div><label for="cpw">{$lang->find_account_question}</label></div></th>
|
||||
<td>
|
||||
<select name="find_account_question">
|
||||
<!--@for($i=1,$c=count($lang->find_account_question_items);$i<$c;$i++)-->
|
||||
<option value="{$i}">{$lang->find_account_question_items[$i]}</option>
|
||||
<!--@end-->
|
||||
</select>
|
||||
<br />
|
||||
<input type="text" name="find_account_answer" value="" class="inputTypeText w300"/>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="button" colspan="2"><span class="button black strong"><input type="submit" value="{$lang->cmd_get_temp_password}" accesskey="s" /></span></th>
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<!--@end-->
|
||||
|
||||
<!--#include("./common_footer.html")-->
|
||||
|
|
|
|||
8
modules/member/skins/default/find_temp_password.html
Normal file
8
modules/member/skins/default/find_temp_password.html
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<!--#include("./common_header.html")-->
|
||||
|
||||
<h3>{$lang->cmd_find_member_account}</h3>
|
||||
<p class="summary">{$lang->about_find_member_account}</p>
|
||||
|
||||
{$temp_password}
|
||||
|
||||
<!--#include("./common_footer.html")-->
|
||||
|
|
@ -133,6 +133,15 @@ function completeFindMemberAccount(ret_obj, response_tags) {
|
|||
alert(ret_obj['message']);
|
||||
}
|
||||
|
||||
/* 임시 비밀번호 생성 */
|
||||
function completeFindMemberAccountByQuestion(ret_obj, response_tags) {
|
||||
if(ret_obj['error'] != 0){
|
||||
alert(ret_obj['message']);
|
||||
}else{
|
||||
location.href = current_url.setQuery('act','dispMemberGetTempPassword').setQuery('user_id',ret_obj['user_id']);
|
||||
}
|
||||
}
|
||||
|
||||
/* 저장글 삭제 */
|
||||
function doDeleteSavedDocument(document_srl, confirm_message) {
|
||||
if(!confirm(confirm_message)) return false;
|
||||
|
|
|
|||
|
|
@ -51,6 +51,19 @@
|
|||
<th><div>{$lang->email_address} <span class="require">*</span></div></th>
|
||||
<td><input type="text" name="email_address" value="{htmlspecialchars($member_info->email_address)}" /><p>{$lang->about_email_address}</p></td>
|
||||
</tr>
|
||||
<!--@if($member_info->find_account_question)-->
|
||||
<tr>
|
||||
<th><div>{$lang->find_account_question} <span class="require">*</span></div></th>
|
||||
<td>
|
||||
<select name="find_account_question">
|
||||
<!--@for($i=1,$c=count($lang->find_account_question_items);$i<$c;$i++)-->
|
||||
<option value="{$i}" <!--@if($member_info->find_account_question==$i)-->selected="selected" <!--@end-->>{$lang->find_account_question_items[$i]}</option>
|
||||
<!--@end-->
|
||||
</select>
|
||||
<br /><input type="text" name="find_account_answer" value="{$member_info->find_account_answer}" class="inputTypeText w300"/>
|
||||
</td>
|
||||
</tr>
|
||||
<!--@end-->
|
||||
|
||||
<!--@if($member_config->profile_image == 'Y')-->
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
<!--@if(!$is_logged && $member_config->agreement)-->
|
||||
<div class="agreementBox">
|
||||
{nl2br($member_config->agreement)}
|
||||
{$member_config->agreement}
|
||||
</div>
|
||||
<div class="agreementButton">
|
||||
<input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
|
||||
|
|
@ -56,6 +56,20 @@
|
|||
<input type="text" name="email_address" value="" class="inputTypeText"/><p>{$lang->about_email_address}</p>
|
||||
</td>
|
||||
</tr>
|
||||
<!--@if(count($lang->find_account_question_items)>1)-->
|
||||
<tr>
|
||||
<th><div>{$lang->find_account_question} <span class="require">*</span></div></th>
|
||||
<td>
|
||||
<select name="find_account_question">
|
||||
<!--@for($i=1,$c=count($lang->find_account_question_items);$i<$c;$i++)-->
|
||||
<option value="{$i}">{$lang->find_account_question_items[$i]}</option>
|
||||
<!--@end-->
|
||||
</select>
|
||||
<br />
|
||||
<input type="text" name="find_account_answer" value="" class="inputTypeText w300"/>
|
||||
</td>
|
||||
</tr>
|
||||
<!--@end-->
|
||||
<tr>
|
||||
<th><div>{$lang->homepage}</div></th>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -1,77 +1,69 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<skin version="0.2">
|
||||
<title xml:lang="ko">회원 기본 스킨</title>
|
||||
<title xml:lang="zh-CN">会员模块默认皮肤</title>
|
||||
<title xml:lang="jp">会員デフォルトスキン</title>
|
||||
<title xml:lang="en">Default Member Skin</title>
|
||||
<title xml:lang="vi">Giao diện thành viên mặc định</title>
|
||||
<title xml:lang="es">Por defecto miembro piel</title>
|
||||
<title xml:lang="ru">По умолчанию членом кожи</title>
|
||||
<title xml:lang="zh-TW">會員模組預設面板</title>
|
||||
<description xml:lang="ko">
|
||||
회원모듈의 default스킨
|
||||
디자인 : 서기정 (http://blog.naver.com/addcozy)
|
||||
HTML/CSS : 정찬명 (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="zh-CN">
|
||||
会员模块的默认皮肤。
|
||||
设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy)
|
||||
HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="jp">
|
||||
会員モジュールのデフォルトスキン
|
||||
デザイン：ソギジョン (http://blog.naver.com/addcozy)
|
||||
HTML/CSS：ジョンチャンミョン (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="en">
|
||||
default skin of member module
|
||||
Design : Ki-Jeong Seo (http://blog.naver.com/addcozy)
|
||||
HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="vi">
|
||||
Giao diện mặc định của Module Thành viên
|
||||
Thiết kế: Ki-Jeong Seo (http://blog.naver.com/addcozy)
|
||||
HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="es">
|
||||
Por defecto de la piel miembro módulo
|
||||
Diseño: Ki-Jeong Seo (http://blog.naver.com/addcozy)
|
||||
HTML / CSS: Jeong Chan-Myung (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="ru">
|
||||
умолчанию кожу члена модуль
|
||||
Дизайн: Ги Чен Се (http://blog.naver.com/addcozy)
|
||||
HTML / CSS: Чен-Чен Мен (http://naradesign.net)
|
||||
</description>
|
||||
<description xml:lang="zh-TW">
|
||||
會員模組預設面板。
|
||||
設計 : Ki-Jeong Seo (http://blog.naver.com/addcozy)
|
||||
HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
|
||||
</description>
|
||||
<version>0.1</version>
|
||||
<date>2007-02-28</date>
|
||||
|
||||
<author email_address="zero@zeroboard.com" link="http://blog.nzeo.com">
|
||||
<name xml:lang="ko">(주)NHN</name>
|
||||
<name xml:lang="jp">（株）NHN</name>
|
||||
<name xml:lang="zh-CN">(株)NHN</name>
|
||||
<name xml:lang="en">NHN Corp</name>
|
||||
<name xml:lang="vi">NHN Corp</name>
|
||||
<name xml:lang="es">NHN Corp</name>
|
||||
<name xml:lang="ru">NHN Корп</name>
|
||||
<name xml:lang="zh-TW">NHN Corp</name>
|
||||
</author>
|
||||
|
||||
<colorset>
|
||||
<color name="white">
|
||||
<title xml:lang="ko">기본</title>
|
||||
<title xml:lang="zh-CN">默认</title>
|
||||
<title xml:lang="jp">デフォルト</title>
|
||||
<title xml:lang="en">default</title>
|
||||
<title xml:lang="vi">Mặc định</title>
|
||||
<title xml:lang="es">Por defecto</title>
|
||||
<title xml:lang="ru">умолчанию</title>
|
||||
<title xml:lang="zh-TW">預設</title>
|
||||
</color>
|
||||
</colorset>
|
||||
</skin>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<skin version="0.2">
|
||||
<title xml:lang="ko">회원 기본 스킨</title>
|
||||
<title xml:lang="zh-CN">会员模块默认皮肤</title>
|
||||
<title xml:lang="jp">会員デフォルトスキン</title>
|
||||
<title xml:lang="en">Default Member Skin</title>
|
||||
<title xml:lang="vi">Giao diện thành viên mặc định</title>
|
||||
<title xml:lang="es">Por defecto miembro piel</title>
|
||||
<title xml:lang="ru">По умолчанию членом кожи</title>
|
||||
<title xml:lang="zh-TW">會員模組預設面板</title>
|
||||
<description xml:lang="ko">
|
||||
회원모듈의 default스킨
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="zh-CN">
|
||||
会员模块的默认皮肤。
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="jp">
|
||||
会員モジュールのデフォルトスキン
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="en">
|
||||
default skin of member module
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="vi">
|
||||
Giao diện mặc định của Module Thành viên
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="es">
|
||||
Por defecto de la piel miembro módulo
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="ru">
|
||||
умолчанию кожу члена модуль
|
||||
NHN (developers@xpressengine.com)
|
||||
</description>
|
||||
<description xml:lang="zh-TW">
|
||||
會員模組預設面板。
|
||||
NHN (developers@xpressengine.com)
|
||||
</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="jp">NHN</name>
|
||||
<name xml:lang="zh-CN">NHN</name>
|
||||
<name xml:lang="en">NHN</name>
|
||||
<name xml:lang="vi">NHN</name>
|
||||
<name xml:lang="es">NHN</name>
|
||||
<name xml:lang="ru">NHN</name>
|
||||
<name xml:lang="zh-TW">NHN</name>
|
||||
</author>
|
||||
|
||||
<colorset>
|
||||
<color name="white">
|
||||
<title xml:lang="ko">기본</title>
|
||||
<title xml:lang="zh-CN">默认</title>
|
||||
<title xml:lang="jp">デフォルト</title>
|
||||
<title xml:lang="en">default</title>
|
||||
<title xml:lang="vi">Mặc định</title>
|
||||
<title xml:lang="es">Por defecto</title>
|
||||
<title xml:lang="ru">умолчанию</title>
|
||||
<title xml:lang="zh-TW">預設</title>
|
||||
</color>
|
||||
</colorset>
|
||||
</skin>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue