mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-28 23:59:57 +09:00
merge from 1.5.3 (~r10943)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko
parent
7aa4798373
commit
54e3a72065
334 changed files with 13011 additions and 5561 deletions
|
|
@ -31,6 +31,11 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
|
|||
.ff label+input[type=text],
|
||||
.ff label+input[type=password],
|
||||
.ff label+textarea{padding:5px}
|
||||
/* Help */
|
||||
.hp{background:#eee;border-top:1px solid #ddd;padding:12px 10px !important;margin:10px 0px !important;}
|
||||
.hp li{margin:0;display:inline;border-left:1px solid #ccc;padding:0 4px 0 8px;}
|
||||
.hp li:first-child{border:0;}
|
||||
.hp a{color:#333;text-decoration:none}
|
||||
/* Button Area */
|
||||
.bna{text-align:center;padding:0 10px;margin:10px 0}
|
||||
.bna:after{content:"";display:block;clear:both}
|
||||
|
|
@ -40,3 +45,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
|
|||
.bn[href]{height:26px}
|
||||
.bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset}
|
||||
.bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000}
|
||||
.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../../../common/img/msg.update.png) no-repeat 1em .5em}
|
||||
|
|
@ -51,3 +51,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
|
|||
.bn[href]{height:26px}
|
||||
.bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset}
|
||||
.bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000}
|
||||
.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../../../common/img/msg.update.png) no-repeat 1em .5em}
|
||||
59
modules/member/tpl/find_member_account.html
Normal file
59
modules/member/tpl/find_member_account.html
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="./../../../common/js/xe.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="css/msignup.css" usecdn="true" />
|
||||
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
<div class="hx h2"><h2>{$lang->cmd_find_member_account_with_email}</h2></div>
|
||||
<form action="./" ruleset="findAccount" method="post" class="ff">
|
||||
<input type="hidden" name="module" value="member" />
|
||||
<input type="hidden" name="act" value="procMemberFindAccount" />
|
||||
<input type="hidden" name="mid" value="{$mid}" />
|
||||
<input type="hidden" name="document_srl" value="{$document_srl}" />
|
||||
<input type="hidden" name="page" value="{$page}" />
|
||||
<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispMemberFindAccount')}" />
|
||||
<ul>
|
||||
<li>
|
||||
<label for="email_address1">{$lang->email_address}</label>
|
||||
<input id="email_address1" type="text" name="email_address" />
|
||||
</li>
|
||||
</ul>
|
||||
<div class="bna">
|
||||
<input type="submit" class="bn dark" value="{$lang->cmd_send_mail}" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<!--@if(count($lang->find_account_question_items)>1)-->
|
||||
<div class="hx h2"><h2>{$lang->cmd_find_member_account_with_email_question}</h2></div>
|
||||
<p style="margin:3px 10px;color:#666">{$lang->about_find_account_question}</p>
|
||||
<form action="./" method="post" class="ff" ruleset="@find_member_account_by_question">
|
||||
<input type="hidden" name="module" value="member" />
|
||||
<input type="hidden" name="mid" value="{$mid}" />
|
||||
<input type="hidden" name="document_srl" value="{$document_srl}" />
|
||||
<input type="hidden" name="act" value="procMemberFindAccountByQuestion" />
|
||||
<input type="hidden" name="success_return_url" value="{getUrl('', 'act', 'dispMemberGetTempPassword')}" />
|
||||
<input type="hidden" name="page" value="{$page}" />
|
||||
<ul>
|
||||
<li cond="$identifier == 'user_id'">
|
||||
<label for="user_id2">{$lang->user_id}</label>
|
||||
<input type="text" name="user_id" id="user_id2" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="email_address2">{$lang->email_address}</label>
|
||||
<input type="text" name="email_address" id="email_address2" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="question">{$lang->find_account_question}</label>
|
||||
<select id="question" name="find_account_question" style="width:290px;display:block;">
|
||||
<!--@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>
|
||||
<input type="text" name="find_account_answer" value="" />
|
||||
</li>
|
||||
</ul>
|
||||
<div class="bna">
|
||||
<input type="submit" class="bn dark" value="{$lang->cmd_get_temp_password}" />
|
||||
</div>
|
||||
</form>
|
||||
<!--@end-->
|
||||
7
modules/member/tpl/find_temp_password.html
Normal file
7
modules/member/tpl/find_temp_password.html
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<load target="css/msignup.css" usecdn="true" />
|
||||
<div>
|
||||
<div class="hx h2"><h2>{$lang->cmd_find_member_account}</h2></div>
|
||||
<p>{$lang->about_temp_password}</p>
|
||||
<p><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->: {$user_id}</p>
|
||||
<p>{$lang->temp_password}: {$temp_password}</p>
|
||||
</div>
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="css/mlogin.css" usecdn="true" />
|
||||
<div class="bd">
|
||||
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
<div class="hx h2">
|
||||
<h2>{$lang->cmd_login}</h2>
|
||||
</div>
|
||||
|
|
@ -8,12 +12,33 @@
|
|||
<input type="hidden" name="act" value="procMemberLogin" />
|
||||
<input type="hidden" name="redirect_url" value="{getUrl('act','')}" />
|
||||
<ul>
|
||||
<li><label for="id">{$lang->user_id}</label><input name="user_id" type="text" id="id" value="" /></li>
|
||||
<li><label for="id"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input name="user_id" type="text" id="id" value="" /></li>
|
||||
<li><label for="pw">{$lang->password}</label><input name="password" type="password" id="pw" value="" /></li>
|
||||
</ul>
|
||||
<div class="message info" id="keep_msg" style="display:none;">
|
||||
<p>{$lang->about_keep_warning}</p>
|
||||
</div>
|
||||
<div class="bna">
|
||||
<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
|
||||
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
|
||||
</div>
|
||||
<ul class="hp">
|
||||
<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>
|
||||
</ul>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
jQuery(function($){
|
||||
var keep_msg = $('#keep_msg');
|
||||
keep_msg.hide();
|
||||
$('#autoLogin').change(function(){
|
||||
if($(this).is(':checked')){
|
||||
keep_msg.slideDown(200);
|
||||
} else {
|
||||
keep_msg.slideUp(200);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
@ -51,6 +51,14 @@
|
|||
<p class="q"><label for="change_password_date">{$lang->change_password_date}</label></p>
|
||||
<p class="a"><input type="text" id="change_password_date" name="change_password_date" value="{$config->change_password_date}" style="width:30px" /><span class="desc">{$lang->unit_day}({$lang->about_change_password_date})</span></p>
|
||||
</li>
|
||||
<li>
|
||||
<p class="q"><label for="max_error_count">{$lang->login_trial_limit1}</label></p>
|
||||
<p class="a"><input type="text" id="max_error_count" name="max_error_count" value="{$config->max_error_count}" style="width:30px" /><span class="desc">{$lang->about_login_trial_limit1}</span></p>
|
||||
</li>
|
||||
<li>
|
||||
<p class="q"><label for="max_error_count_time">{$lang->login_trial_limit2}</label></p>
|
||||
<input type="text" id="max_error_count_time" name="max_error_count_time" value="{$config->max_error_count_time}" style="width:30px" /><span class="desc">{$lang->unit_sec}({$lang->about_login_trial_limit2})</span></p>
|
||||
</li>
|
||||
<li>
|
||||
<p class="q"><label for="agreement">{$lang->agreement}</label></p>
|
||||
<p class="a">{$editor}</p>
|
||||
|
|
|
|||
|
|
@ -1,30 +1,38 @@
|
|||
{@ Context::loadFile(array("./common/js/jquery.js", 'head', '', -100000), true) }
|
||||
{@ Context::loadFile(array("./common/js/js_app.js", 'head', '', -100000), true) }
|
||||
{@ Context::loadFile(array("./common/js/common.js", 'head', '', -100000), true) }
|
||||
{@ Context::loadFile(array("./common/js/xml_handler.js", 'head', '', -100000), true) }
|
||||
{@ Context::loadFile(array("./common/js/xml_js_filter.js", 'head', '', -100000), true) }
|
||||
|
||||
<load target="css/msignup.css" usecdn="true" />
|
||||
<!--%import("../skins/default/filter/modify_password.xml")-->
|
||||
<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="./../../../common/js/xe.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="../skins/default/js/member.js" usecdn="true" />
|
||||
<div class="bd">
|
||||
<h2 class="h2">{$member_title = $lang->cmd_modify_member_password}</h2>
|
||||
<form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, modify_password)">
|
||||
<input type="hidden" name="mid" value="{$mid}" />
|
||||
<input type="hidden" name="document_srl" value="{$document_srl}" />
|
||||
<input type="hidden" name="page" value="{$page}" />
|
||||
<fieldset class="sn">
|
||||
<ul>
|
||||
<li><label for="uid" class="db fb al">{$lang->user_id}</label><div id="uid">{htmlspecialchars($member_info->user_id)}</div></li>
|
||||
<li><label for="cpw" class="db fb al">{$lang->current_password}</label><input type="password" name="current_password" id="cpw" class="itx" /></li>
|
||||
<li><div><label for="npw1" class="db fb al">{$lang->password1}</label><input type="password" name="password1" id="npw1" class="itx" /></div>
|
||||
<div><label for="npw1" class="db fb al">{$lang->password2}</label><input type="password" name="password2" id="npw2" class="itx" /></div>
|
||||
<p style="color:#666">{$lang->about_password}</p></li>
|
||||
</ul>
|
||||
</fieldset>
|
||||
<div class="cm">
|
||||
<input type="submit" value="{$lang->cmd_registration}" class="bn"/><a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
|
||||
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
<h2 class="h2">{$member_title = $lang->cmd_modify_member_password}</h2>
|
||||
<form id="fo_insert_member" action="./" method="post" class="ff" ruleset="modifyPassword">
|
||||
<input type="hidden" name="module" value="member" />
|
||||
<input type="hidden" name="act" value="procMemberModifyPassword" />
|
||||
<input type="hidden" name="mid" value="{$mid}" />
|
||||
<input type="hidden" name="document_srl" value="{$document_srl}" />
|
||||
<input type="hidden" name="page" value="{$page}" />
|
||||
<fieldset class="sn">
|
||||
<ul>
|
||||
<li>
|
||||
<label for="uid" class="db fb al"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label>
|
||||
<div id="uid"><!--@if($identifier == 'user_id')-->{htmlspecialchars($member_info->user_id)}<!--@else-->{htmlspecialchars($member_info->email_address)}<!--@end--></div>
|
||||
</li>
|
||||
<li>
|
||||
<label for="cpw" class="db fb al">{$lang->current_password}</label>
|
||||
<input type="password" name="current_password" id="cpw" class="itx" />
|
||||
</li>
|
||||
<li>
|
||||
<div><label for="npw1" class="db fb al">{$lang->password1}</label><input type="password" name="password1" id="npw1" class="itx" /></div>
|
||||
<div><label for="npw1" class="db fb al">{$lang->password2}</label><input type="password" name="password2" id="npw2" class="itx" /></div>
|
||||
<p style="color:#666">{$lang->about_password}</p>
|
||||
</li>
|
||||
</ul>
|
||||
</fieldset>
|
||||
<div class="cm">
|
||||
<input type="submit" value="{$lang->cmd_registration}" class="bn dark" />
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
<load target="./../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="./../../../common/js/xe.min.js" usecdn="true" index="-1000000" />
|
||||
<load target="css/msignup.css" usecdn="true" />
|
||||
<load target="js/signup_check.js" usecdn="true" />
|
||||
<!--%load_js_plugin("ui")-->
|
||||
|
|
@ -9,7 +11,7 @@
|
|||
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
<form ruleset="@insertMember" id="fo_insert_member" class="ff" action="./" method="post" enctype="multipart/form-data">
|
||||
<form ruleset="@insertMember" id="fo_insert_member" class="ff" action="./" method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="module" value="member" />
|
||||
<input type="hidden" name="act" value="procMemberInsert" />
|
||||
<!--@if(!$is_logged && $member_config->agreement)-->
|
||||
|
|
@ -33,23 +35,24 @@
|
|||
<input type="password" name="password" id="password" value=""/>
|
||||
</li>
|
||||
<li>
|
||||
<label for="password2">{$lang->password2} <em style="color:red">*</em></label>
|
||||
<label for="password2">{$lang->password3} <em style="color:red">*</em></label>
|
||||
<input type="password" name="password2" id="password2" value=""/>
|
||||
</li>
|
||||
<li loop="$formTags=>$formTag">
|
||||
<label>{$formTag->title}</label>
|
||||
<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
|
||||
<block cond="$formTag->name =='signature'">{$editor}</block>
|
||||
</li>
|
||||
<block loop="$formTags=>$formTag" cond="$formTag->name != 'signature'">
|
||||
<li>
|
||||
<label>{$formTag->title}</label>
|
||||
{$formTag->inputTag}
|
||||
</li>
|
||||
</block>
|
||||
<li>
|
||||
<label>{$lang->allow_mailing}</label>
|
||||
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
|
||||
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
|
||||
<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <label for="mailingYes">{$lang->cmd_yes}</label>
|
||||
<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" /> <label for="mailingNo">{$lang->cmd_no}</label>
|
||||
</li>
|
||||
<li>
|
||||
<label>{$lang->allow_message}</label>
|
||||
<block loop="$lang->allow_message_type=>$key,$val">
|
||||
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
|
||||
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
|
||||
</block>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue