Merge branch 'feature/setting-modal' into dev

5 files changed, 307 insertions, 23 deletions

diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php
index 16085e7..83bb495 100644
--- a/app/view/auth/default.view.php
+++ b/app/view/auth/default.view.php
@@ -31,13 +31,13 @@
                                         <h1>Login</h1>
 
                                         <div class="form-group">
-                                            <label for="loginUsername">Username</label>
-                                            <input type="text" name="input[username]" id="loginUsername" class="form-control" required="true" autofocus />
+                                            <label>Username</label>
+                                            <input type="text" name="input[username]" class="form-control" required="true" autofocus />
                                         </div>
 
                                         <div class="form-group">
-                                            <label for="loginPassword">Password</label>
-                                            <input type="password" name="input[password]" id="loginPassword" class="form-control" />
+                                            <label>Password</label>
+                                            <input type="password" name="input[password]" class="form-control" />
                                         </div>
 
                                         <div class="btn-group pull-right">
@@ -72,18 +72,18 @@
                                         <h1 class="text-center">Signup for Scrott</h1>
 
                                         <div class="form-group">
-                                            <label for="signupUsername">Username</label>
-                                            <input type="text" name="input[username]" id="signupUsername" class="form-control" required="true" maxlength="50" />
+                                            <label>Username</label>
+                                            <input type="text" name="input[username]" class="form-control" required="true" maxlength="50" />
                                         </div>
 
                                         <div class="form-group">
-                                            <label for="signupPassword">Password</label>
-                                            <input type="password" name="input[password]" id="signupPassword" class="form-control" />
+                                            <label>Password</label>
+                                            <input type="password" name="input[password]" class="form-control" />
                                         </div>
 
                                         <div class="form-group">
-                                            <label for="signupCPassword">Confirm Password</label>
-                                            <input type="password" name="input[cPassword]" id="signupCPassword" class="form-control" />
+                                            <label>Confirm Password</label>
+                                            <input type="password" name="input[cPassword]" class="form-control" />
                                         </div>
 
                                         <div class="btn-group pull-right">
diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
new file mode 100644
index 0000000..11adc69
--- /dev/null
+++ b/app/view/common/setting.modal.view.php
@@ -0,0 +1,253 @@
+<div id="settingModal" class="modal fade" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+
+                <button type="button" class="close" data-dismiss="modal">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+
+                <h4 class="modal-title"><span class="glyphicon glyphicon-cog"></span> Settings</h4>
+
+            </div>
+
+            <div class="modal-body">
+                <ul class="nav nav-tabs" role="tablist">
+                    <li class="active"><a href="#settUserTab" aria-controls="settUserTab" data-toggle="tab">
+                        <span class="glyphicon glyphicon-user"></span> <?=$mod->getCurrentUser()->getDisplayName()?>
+                    </a></li>
+
+                    <?php if ($mod->getCurrentUser()->admin == 1) { ?>
+                        <li><a href="#settAdminTab" aria-controls="settAdminTab" data-toggle="tab"><span class="glyphicon glyphicon-sunglasses"></span> Admin</a></li>
+                        <li><a href="#settUsersTab" aria-controls="settUsersTab" data-toggle="tab"><span class="glyphicon glyphicon-th"></span> All Users</a></li>
+                    <?php } ?>
+                </ul>
+
+                <div class="tab-content">
+                    <div class="tab-pane fade in active" id="settUserTab">
+                        <p>&nbsp;</p>
+
+                        <?php if ($mod->getCurrentUser()->admin == 1) { ?>
+                            <p class="pull-right"><span class="glyphicon glyphicon-sunglasses"></span> <?=$mod->getCurrentUser()->getDisplayName()?> is a Scrott Administrator</p>
+                        <?php } ?>
+
+                        <form method="post" action="<?=$mod->ap()?>">
+                            <input type="hidden" name="input[action]" value="common-setting-user" />
+                            <div class="form-group">
+                                <label>Username</label>
+                                <input type="text" class="form-control" value="<?=$mod->getCurrentUser()->name?>" disabled />
+                            </div>
+
+                            <div class="checkbox">
+                                <label data-toggle="collapse" data-target="#inputUserPasswdCollapse">
+                                    <input type="checkbox" name="input[setPasswd]" value="1" /> Change Password
+                                </label>
+                            </div>
+
+                            <div class="collapse" id="inputUserPasswdCollapse">
+                                <div class="form-group">
+                                    <label>Current Password</label>
+                                    <input type="password" name="input[curPasswd]" class="form-control" />
+                                </div>
+
+                                <div class="form-group">
+                                    <label>New Password</label>
+                                    <input type="password" name="input[newPasswd]" class="form-control" />
+                                </div>
+
+                                <div class="form-group">
+                                    <label>Confirm Password</label>
+                                    <input type="password" name="input[confPasswd]" class="form-control" />
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label>Alias</label>
+                                <input type="text" name="input[alias]" class="form-control" value="<?=$mod->getCurrentUser()->alias?>" maxlength="50" />
+                            </div>
+
+                            <div class="form-group">
+                                <label>Email</label>
+                                <input type="text" name="input[email]" class="form-control" value="<?=$mod->getCurrentUser()->email?>" maxlength="50" />
+                            </div>
+
+                            <?php if ($mod->getCurrentUser()->email != "" && $mod->getCurrentUser()->emailConf == 0) { ?>
+                                <div class="form-group has-warning">
+                                    <label class="control-label">Email Confirmation Key</label>
+                                    <input type="text" name="input[emailConfKey]" class="form-control" />
+                                    <span class="help-block">You have not yet confirmed ownership of your saved email address</span>
+                                </div>
+                            <?php } ?>
+
+                            <button type="submit" class="btn btn-success pull-right">Save</button>
+                        </form>
+
+                        <p>&nbsp;</p>
+                    </div>
+
+                    <?php if ($mod->getCurrentUser()->admin == 1) { ?>
+                        <div class="tab-pane fade" id="settAdminTab">
+                            <p>&nbsp;</p>
+
+                            <form method="post" action="<?=$mod->ap()?>">
+                                <input type="hidden" name="input[action]" value="common-setting-admin" />
+                                <div class="form-group">
+                                    <label>HTTP(S)</label>
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="input[settSSL]" value="force" <?=$mod->common_settingAdminSettSSLChecked['force']?> <?=$mod->common_settingAdminSettSSLDisabled?> />
+                                            Always Force SSL
+                                        </label>
+                                    </div>
+
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="input[settSSL]" value="neither" <?=$mod->common_settingAdminSettSSLChecked['neither']?> <?=$mod->common_settingAdminSettSSLDisabled?> />
+                                            Neither
+                                        </label>
+                                    </div>
+
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="input[settSSL]" value="forbid" <?=$mod->common_settingAdminSettSSLChecked['forbid']?> <?=$mod->common_settingAdminSettSSLDisabled?> />
+                                            Always Forbid SSL
+                                        </label>
+                                    </div>
+                                </div>
+
+                                <label>Access</label>
+                                <div class="checkbox">
+                                    <label>
+                                        <input type="checkbox" name="input[allowPublicSignup]" value="1" <?=$mod->common_settingAdminAllowPublicSignupChecked?> /> Allow anyone to create an account
+                                    </label>
+                                </div>
+
+                                <button type="submit" class="btn btn-success pull-right">Save</button>
+                            </form>
+
+                            <p>&nbsp;</p>
+                        </div>
+
+                        <div class="tab-pane fade" id="settUsersTab">
+                            <p>&nbsp;</p>
+
+                            <div class="panel-group" id="common-setting-allusers">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <h4 class="panel-title">
+                                            <a href="#common-setting-allusers-add-collapse" data-toggle="collapse" data-parent="#common-setting-allusers" aria-expanded="false">
+                                                <span class="glyphicon glyphicon-plus"></span> Add New User
+                                            </a>
+                                        </h4>
+                                    </div>
+
+                                    <div class="panel-collapse collapse" id="common-setting-allusers-add-collapse">
+                                        <div class="panel-body">
+                                            <form method="post" action="<?=$mod->ap()?>">
+                                                <input type="hidden" name="input[action]" value="common-setting-allusers-adduser" />
+                                                <div class="form-group">
+                                                    <label>Username</label>
+                                                    <input type="text" name="input[username]" class="form-control" required="true" maxlength="50" />
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label>Password</label>
+                                                    <input type="password" name="input[password]" class="form-control" />
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label>Confirm Password</label>
+                                                    <input type="password" name="input[cPassword]" class="form-control" />
+                                                </div>
+
+                                                <div class="checkbox">
+                                                    <label>
+                                                        <input type="checkbox" name="input[admin]" value="1" /> Administrator
+                                                    </label>
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label>Alias</label>
+                                                    <input type="text" name="input[alias]" class="form-control" maxlength="50" />
+                                                </div>
+
+                                                <div class="form-group">
+                                                    <label>Email</label>
+                                                    <input type="text" name="input[email]" class="form-control" maxlength="50" />
+                                                </div>
+
+                                                <button type="submit" class="btn btn-success pull-right">Add</button>
+                                            </form>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <?php foreach ($mod->common_settingAllUsers as $user) { ?>
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading">
+                                            <h4 class="panel-title">
+                                                <a href="#common-setting-allusers-<?=$user->guid?>-collapse" data-toggle="collapse" data-parent="#common-setting-allusers" aria-expanded="false">
+                                                    <span class="<?=$user->getGlyphicon()?>"></span> <?=$user->name?> <?=($user->alias != "" ? "(" . $user->alias . ")" : "")?>
+                                                </a>
+                                            </h4>
+                                        </div>
+
+                                        <div class="panel-collapse collapse" id="common-setting-allusers-<?=$user->guid?>-collapse">
+                                            <div class="panel-body">
+                                                <form method="post" action="<?=$mod->ap()?>">
+                                                    <input type="hidden" name="input[action]" value="common-setting-allusers-edituser" />
+                                                    <input type="hidden" name="input[guid]" value="<?=$user->guid?>" />
+
+                                                    <div class="form-group">
+                                                        <label>Username</label>
+                                                        <input type="text" class="form-control" value="<?=$user->name?>" disabled />
+                                                    </div>
+
+                                                    <div class="checkbox">
+                                                        <label data-toggle="collapse" data-target="#input<?=$user->guid?>PasswdCollapse">
+                                                            <input type="checkbox" name="input[setPasswd]" value="1" /> Change Password
+                                                        </label>
+                                                    </div>
+
+                                                    <div class="collapse" id="input<?=$user->guid?>PasswdCollapse">
+                                                        <div class="form-group">
+                                                            <label>New Password</label>
+                                                            <input type="password" name="input[newPasswd]" class="form-control" />
+                                                        </div>
+
+                                                        <div class="form-group">
+                                                            <label>Confirm Password</label>
+                                                            <input type="password" name="input[confPasswd]" class="form-control" />
+                                                        </div>
+                                                    </div>
+
+                                                    <div class="checkbox">
+                                                        <label>
+                                                            <input type="checkbox" name="input[admin]" value="1" <?=($user->admin ? "checked" : "")?>> Administrator
+                                                        </label>
+                                                    </div>
+
+                                                    <div class="form-group">
+                                                        <label>Alias</label>
+                                                        <input type="text" name="input[alias]" class="form-control" maxlength="50" value="<?=$user->alias?>" />
+                                                    </div>
+
+                                                    <div class="form-group">
+                                                        <label>Email</label>
+                                                        <input type="text" name="input[email]" class="form-control" maxlength="50" value="<?=$user->email?>" />
+                                                    </div>
+
+                                                    <button type="submit" class="btn btn-success pull-right">Save</button>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    </div>
+                                <?php } ?>
+                            </div>
+                        </div>
+                    <?php } ?>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php
index 05e4862..40ad3fe 100644
--- a/app/view/common/topp.view.php
+++ b/app/view/common/topp.view.php
@@ -1,5 +1,9 @@
 <?php include "view/master/topp.view.php"; ?>
 
+<?php if ($mod->getCurrentUser()) { ?>
+    <?php include "view/common/setting.modal.view.php"; ?>
+<?php } ?>
+
 <nav class="navbar navbar-inverse navbar-fixed-top">
     <div class="container-fluid">
 
@@ -14,7 +18,21 @@
         </div>
 
         <div class="collapse navbar-collapse" id="scrottnav">
-            <p class="navbar-text navbar-right"><i>Not Logged In&nbsp;</i></p>
+            <?php if (!$mod->getCurrentUser()) { ?>
+                <p class="navbar-text navbar-right"><i>Not Logged In&nbsp;</i></p>
+            <?php } else { ?>
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                            <span class="<?=$mod->getCurrentUser()->getGlyphicon()?>"></span> <?=$mod->getCurrentUser()->getDisplayName()?> <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" data-toggle="modal" data-target="#settingModal">Settings</a></li>
+                            <li><a href="<?=$mod->ar()?>/logout">Log out</a></li>
+                        </ul>
+                    </li>
+                </ul>
+            <?php } ?>
         </div>
 
     </div>
diff --git a/app/view/dashboard/default.view.php b/app/view/dashboard/default.view.php
new file mode 100644
index 0000000..059d9c8
--- /dev/null
+++ b/app/view/dashboard/default.view.php
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+
+<html lang="en">
+    <head>
+        <?php include "view/common/head.view.php"; ?>
+        <title>Scrott - Dashboard</title>
+    </head>
+
+    <body>
+        <?php include "view/common/topp.view.php"; ?>
+        <?php include "view/common/foot.view.php"; ?>
+    </body>
+</html>
diff --git a/app/view/sysconf/default.view.php b/app/view/sysconf/default.view.php
index 00e6adf..65f7cb6 100644
--- a/app/view/sysconf/default.view.php
+++ b/app/view/sysconf/default.view.php
@@ -52,34 +52,34 @@
                                     <input type="hidden" name="input[action]" value="save" />
                                     <legend>Database Connection</legend>
                                     <div class="form-group">
-                                        <label for="inputDBEngine">Engine</label>
-                                        <input type="text" id="inputDBEngine" class="form-control" value="Mysql" disabled />
+                                        <label>Engine</label>
+                                        <input type="text" class="form-control" value="Mysql" disabled />
                                     </div>
 
                                     <div class="form-group">
-                                        <label for="inputDBAddress">Server Address</label>
-                                        <input type="text" name="input[dbAddress]" id="inputDBAddress" class="form-control" placeholder="localhost" required="true" />
+                                        <label>Server Address</label>
+                                        <input type="text" name="input[dbAddress]" class="form-control" placeholder="localhost" required="true" />
                                     </div>
 
                                     <div class="form-group">
-                                        <label for="inputDBName">Database Name</label>
-                                        <input type="text" name="input[dbName]" id="inputDBName" class="form-control" placeholder="db_scrott" required="true" />
+                                        <label>Database Name</label>
+                                        <input type="text" name="input[dbName]" class="form-control" placeholder="db_scrott" required="true" />
                                     </div>
 
                                     <div class="form-group">
-                                        <label for="inputDBUser">Username</label>
-                                        <input type="text" name="input[dbUser]" id="inputDBUser" class="form-control" placeholder="root" required="true" />
+                                        <label>Username</label>
+                                        <input type="text" name="input[dbUser]" class="form-control" placeholder="root" required="true" />
                                     </div>
 
                                     <div class="form-group">
-                                        <label for="inputDBPass">Password</label>
-                                        <input type="password" name="input[dbPass]" id="inputDBPass" class="form-control" />
+                                        <label>Password</label>
+                                        <input type="password" name="input[dbPass]" class="form-control" />
                                     </div>
 
                                     <legend>Application Installation</legend>
                                     <div class="form-group">
-                                        <label for="inputAppPath">Install Location</label>
-                                        <input type="text" id="inputAppPath" class="form-control" value="<?=$mod->ar()?>/" disabled />
+                                        <label>Install Location</label>
+                                        <input type="text" class="form-control" value="<?=$mod->ar()?>/" disabled />
                                         <h6 class="pull-right">Detected from location of files in web document root</h6>
                                     </div>