fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 11:11:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2105 Show right label for login identifier.

Browse source 
ID or Email, 'this is the question' - I do not want to do that. If I am a user.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10808 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2012-06-30 13:41:04 +00:00
parent 146b39a01b
commit 052a3af334
8 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/member/member.mobile.php
View file

@ -31,8 +31,12 @@ class memberMobile extends member
return;
}
// Set a template file
// get member module configuration.
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
Context::set('identifier', $config->identifier);
// Set a template file
Context::set('referer_url', $_SERVER['HTTP_REFERER']);
$this->setTemplateFile('login_form');
}

6
modules/member/member.view.php
View file

@ -255,6 +255,12 @@
$this->setTemplateFile('redirect.html');
return;
}
// get member module configuration.
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
Context::set('identifier', $config->identifier);
// Set a template file
Context::set('referer_url', $_SERVER['HTTP_REFERER']);
Context::set('act', 'procMemberLogin');

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

@ -9,7 +9,7 @@
<input type="hidden" name="act" value="procMemberLogin" />
<ul>
<li>
<p class="q"><label for="uid">{$lang->user_id}</label></p>
<p class="q"><label for="uid"><!--@if($identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label></p>
<p class="a"><input type="text" name="user_id" id="uid" value="" /></p>
</li>
<li>

2
modules/member/tpl/login_form.html
View file

@ -8,7 +8,7 @@
<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="bna">

4
widgets/login_info/skins/xe_global/login_form.html
View file

@ -24,8 +24,8 @@
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" title="user id" />
<input name="password" type="password" title="password" />
<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
<input name="password" type="password" title="{$lang->password}" />
</div>
<p class="save">
<input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />

4
widgets/login_info/skins/xe_globalTwo/login_form.html
View file

@ -25,8 +25,8 @@
<h2>Login</h2>
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" title="user id" />
<input name="password" type="password" title="password" />
<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
<input name="password" type="password" title="{$lang->password}" />
</div>
<p class="save">
<input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />

4
widgets/login_info/skins/xe_official/login_form.html
View file

@ -20,8 +20,8 @@
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div class="idpwWrap">
<div class="idpw">
<input name="user_id" type="text" title="user id" />
<input name="password" type="password" title="password" />
<input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" />
<input name="password" type="password" title="{$lang->password}" />
<p class="keep">
<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
<label for="keep_signed">{$lang->keep_signed}</label>

4
widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
View file

@ -22,8 +22,8 @@ var keep_signed_msg = "{$lang->about_keep_signed}";
<div class="body">
<div class="mb_input_box">
<div class="m_left">
<div class="input_text mb_id"><img src="images/bullet_input_id.gif" alt="" title="" /><input name="user_id" type="text" title="user id" /></div>
<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password"type="password" title="password" /></div>
<div class="input_text mb_id"><img src="images/bullet_input_id.gif" alt="" title="" /><input name="user_id" type="text" title="<!--@if($member_config->identifier != 'email_address')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end-->" /></div>
<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password" type="password" title="{$lang->password}" /></div>
<label><input type="checkbox" name="keep_signed" id="keepid" class="sign_check" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />{$lang->keep_signed}</label>
<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">