Issue 2105 Show right label for login identifier.

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

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');
}

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');

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>

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