stylefix for logged out account on logged in area

This commit is contained in:
Ulf Gebhardt 2016-12-18 06:28:50 +01:00
parent 5af5ab01d7
commit 2c6d999ce3
8 changed files with 67 additions and 7 deletions

View File

@ -10,7 +10,7 @@ class account_changeemail implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_changeemail/tpl/account_changeemail.tpl'))->SERVERPATH(), $vars);
}

View File

@ -10,7 +10,7 @@ class account_changepassword implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_changepassword/tpl/account_changepassword.tpl'))->SERVERPATH(), $vars);
}

View File

@ -10,7 +10,7 @@ class account_tbc implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
$vars['email'] = \SYSTEM\SECURITY\security::getUser()->email;
$vars['username'] = \SYSTEM\SECURITY\security::getUser()->username;

View File

@ -14,7 +14,7 @@ class account_tbc_account implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
$user = \SYSTEM\SECURITY\security::getUser();
if(!$user->email_confirmed && $user->username != $this->account){

View File

@ -13,7 +13,7 @@ class account_tbc_changepassword implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
$user = \SYSTEM\SECURITY\security::getUser();
if(!$user->email_confirmed && $user->username != $this->account){

View File

@ -10,7 +10,7 @@ class account_tbc_new implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_tbc_new/tpl/account_tbc_new.tpl'))->SERVERPATH(), $vars);
}

View File

@ -10,7 +10,7 @@ class account_website implements \SYSTEM\PAGE\Page {
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
if(!\SYSTEM\SECURITY\security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_account/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('account_website/tpl/account_login.tpl'))->SERVERPATH(), $vars);}
$vars['email'] = \SYSTEM\SECURITY\security::getUser()->email;
$vars['username'] = \SYSTEM\SECURITY\security::getUser()->username;

View File

@ -0,0 +1,60 @@
<div class="panel panel-success">
<div class="panel-heading"><h4>Mojotrollz - Login</h4></div>
<div class="panel-body" style="padding-bottom: 0;">
<form class="textbox" id="login_form">
<div class="control-group">
<table id="userLoginTable">
<tbody>
<tr>
<th style="width: 200px;">${basic_username}</th>
<td style="margin-top: 15px;">
<div class="controls">
<input type="text"
size="35"
id="bt_login_user"
placeholder="${basic_placeholder_username}"
minlength="3" data-validation-minlength-message="${basic_username_short}"
maxlength="16" data-validation-maxlength-message="${basic_username_long}"
required data-validation-required-message="${basic_username_miss}"/>
</div>
</td>
</tr>
<tr>
<th style="padding-top: 0;">${basic_password}</th>
<td>
<div class="controls">
<input type="password"
size="35"
style="margin-bottom: 15px; margin-top: 15px;"
id="bt_login_password"
placeholder="${basic_placeholder_password}"
minlength="5" data-validation-minlength-message="${basic_password_short}"
maxlength="16" data-validation-maxlength-message="${basic_password_long}"
required data-validation-required-message="${basic_password_miss}"/>
</div>
</td>
</tr>
<tr>
<th style="padding-top: 10px;">
<p style="float: left;"><a href="#!register">Register an Account</a></p>
</th>
<td>
<p style="float: right;">
<button class="btn-sm btn btn-success" style="clear: left; height: 32px; font-size: 13px;" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> ${basic_login}</button>
</p>
</td>
</tr>
<tr>
<th>
<p class="help-block" style="float: left; margin-top: 3px;"></p>
</th>
<td>
<p style="float: right;"><a href="#!resetpassword">Forgot your Password?</a></p>
</td>
</tr>
</tbody>
</table>
</div>
</form>
</div>
</div>