fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-29 16:19:58 +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

2
modules/member/skins/default/find_member_account.html
View file

@ -13,7 +13,7 @@
</li>
</ul>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_find_member_account}" accesskey="s" /></span>
<span class="btn"><input type="submit" value="{$lang->cmd_find_member_account}" /></span>
</div>
</form>
<!--@if(count($lang->find_account_question_items)>1)-->

4
modules/member/skins/default/leave_form.html
View file

@ -11,8 +11,8 @@
<input type="hidden" name="page" value="{$page}" />
<ul>
<li>
<p class="q">{$lang->user_id}</p>
<p class="a">{$member_info->user_id}</p>
<p class="q">{Context::getLang($identifier)}</p>
<p class="a">{$formValue}</p>
</li>
<li>
<p class="q"><label for="cpw">{$lang->password}</label></p>

2
modules/member/skins/default/login_form.html
View file

@ -3,7 +3,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h1 class="h1">{$lang->cmd_login}</h1>
<h1 class="h1">{$lang->cmd_login}...</h1>
<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
<input type="hidden" name="act" value="procMemberLogin" />

2
modules/member/skins/default/member_info.html
View file

@ -5,7 +5,7 @@
<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
<!--@if($formInfo->isUse && ($formInfo->name != 'password' && $formInfo->name != 'find_account_question'))-->
<!--@if($formInfo->isDefaultForm)-->
{@$title = $formInfo->title}
{@$title = Context::getLang($formInfo->name)}
{@$value = $memberInfo[$formInfo->name]}
<!--@if($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
{@$target = $memberInfo['profile_image']}

4
modules/member/skins/default/modify_password.html
View file

@ -8,8 +8,8 @@
<input type="hidden" name="page" value="{$page}" />
<ul>
<li>
<p class="q"><label for="uid">{$lang->user_id}</label></p>
<p class="a"><input type="text" disabled="disabled" value="{$member_info->user_id}" id="uid" /></p>
<p class="q"><label for="uid">{Context::getLang($identifier)}</label></p>
<p class="a"><input type="text" disabled="disabled" value="{$formValue}" id="uid" /></p>
</li>
<li>
<p class="q"><label for="cpw">{$lang->current_password}</label></p>

9
modules/member/skins/default/signup_form.html
View file

@ -30,9 +30,10 @@
<p class="a">
<input type="password" name="password" value=""/>
</p>
<p class="desc">{$lang->about_password}</p>
</li>
<li>
<p class="q">{$lang->password2} <em style="color:red">*</em></p>
<p class="q">{$lang->password3} <em style="color:red">*</em></p>
<p class="a">
<input type="password" name="password2" value=""/>
</p>
@ -56,12 +57,6 @@
</block>
</p>
</li>
<li cond="class_exists('AddonCaptcha') && $oCaptcha && $oCaptcha->addon_info->apply_signup=='apply'">
<p class="q">{$lang->captcha}</p>
<p class="a">
{$oCaptcha->inlineDisplay()}
</p>
</li>
</ul>
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>