From 2c6d999ce30cd4a2a498aa80bd05162dcbd8e924 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 18 Dec 2016 06:28:50 +0100
Subject: [PATCH] stylefix for logged out account on logged in area

---
 .../account_changeemail.php                   |  2 +-
 .../account_changepassword.php                |  2 +-
 mojotrollz/page/account_tbc/account_tbc.php   |  2 +-
 .../account_tbc_account.php                   |  2 +-
 .../account_tbc_changepassword.php            |  2 +-
 .../page/account_tbc_new/account_tbc_new.php  |  2 +-
 .../page/account_website/account_website.php  |  2 +-
 .../account_website/tpl/account_login.tpl     | 60 +++++++++++++++++++
 8 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 mojotrollz/page/account_website/tpl/account_login.tpl

diff --git a/mojotrollz/page/account_changeemail/account_changeemail.php b/mojotrollz/page/account_changeemail/account_changeemail.php
index af85c93..f53b574 100644
--- a/mojotrollz/page/account_changeemail/account_changeemail.php
+++ b/mojotrollz/page/account_changeemail/account_changeemail.php
@@ -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);
     }
diff --git a/mojotrollz/page/account_changepassword/account_changepassword.php b/mojotrollz/page/account_changepassword/account_changepassword.php
index 7534503..f09648d 100644
--- a/mojotrollz/page/account_changepassword/account_changepassword.php
+++ b/mojotrollz/page/account_changepassword/account_changepassword.php
@@ -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);
     }
diff --git a/mojotrollz/page/account_tbc/account_tbc.php b/mojotrollz/page/account_tbc/account_tbc.php
index a62c1ef..c8261c4 100644
--- a/mojotrollz/page/account_tbc/account_tbc.php
+++ b/mojotrollz/page/account_tbc/account_tbc.php
@@ -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;
diff --git a/mojotrollz/page/account_tbc_account/account_tbc_account.php b/mojotrollz/page/account_tbc_account/account_tbc_account.php
index 3f7223a..2b34553 100644
--- a/mojotrollz/page/account_tbc_account/account_tbc_account.php
+++ b/mojotrollz/page/account_tbc_account/account_tbc_account.php
@@ -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){
diff --git a/mojotrollz/page/account_tbc_changepassword/account_tbc_changepassword.php b/mojotrollz/page/account_tbc_changepassword/account_tbc_changepassword.php
index c1003d8..70c070a 100644
--- a/mojotrollz/page/account_tbc_changepassword/account_tbc_changepassword.php
+++ b/mojotrollz/page/account_tbc_changepassword/account_tbc_changepassword.php
@@ -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){
diff --git a/mojotrollz/page/account_tbc_new/account_tbc_new.php b/mojotrollz/page/account_tbc_new/account_tbc_new.php
index 1eac96d..25d513a 100644
--- a/mojotrollz/page/account_tbc_new/account_tbc_new.php
+++ b/mojotrollz/page/account_tbc_new/account_tbc_new.php
@@ -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);
     }
diff --git a/mojotrollz/page/account_website/account_website.php b/mojotrollz/page/account_website/account_website.php
index 2f29a0f..790a45b 100644
--- a/mojotrollz/page/account_website/account_website.php
+++ b/mojotrollz/page/account_website/account_website.php
@@ -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;
diff --git a/mojotrollz/page/account_website/tpl/account_login.tpl b/mojotrollz/page/account_website/tpl/account_login.tpl
new file mode 100644
index 0000000..787adcd
--- /dev/null
+++ b/mojotrollz/page/account_website/tpl/account_login.tpl
@@ -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>
\ No newline at end of file