diff options
| author | Malf Furious <m@lfurio.us> | 2016-02-06 01:10:12 -0500 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2016-02-06 01:10:12 -0500 |
| commit | 39394819d45ebcf68cab96c13a6affb994f734f3 (patch) | |
| tree | 59b83bfdadfd7c23ffcc74cd008816fad3a80cb8 | |
| parent | 4496b56e3392ba8183c0e1764557d51a8633e7ca (diff) | |
| download | scrott-39394819d45ebcf68cab96c13a6affb994f734f3.tar.gz scrott-39394819d45ebcf68cab96c13a6affb994f734f3.zip | |
Merge the two auth views together
For design reasons and to simplify flow of control throughout the app login/signup sequence, these two views are being merged together.
This will autimately make the auth MVC less stateful, which I think is good.
NOTE: This breaks the Auth MVC, the model and controller will need updated to support this new, single default view
| -rw-r--r-- | app/view/auth/default.view.php | 114 | ||||
| -rw-r--r-- | app/view/auth/signup.view.php | 60 |
2 files changed, 90 insertions, 84 deletions
diff --git a/app/view/auth/default.view.php b/app/view/auth/default.view.php index 9bb1c47..16085e7 100644 --- a/app/view/auth/default.view.php +++ b/app/view/auth/default.view.php @@ -3,42 +3,108 @@ <html lang="en"> <head> <?php include "view/common/head.view.php"; ?> - <title>Scrott - Login</title> + <title>Scrott - Not logged in</title> </head> <body> <?php include "view/common/topp.view.php"; ?> <div class="container"> - <div class="row"> - <div class="col-md-4"></div> - - <div class="col-md-4"> - <div class="panel panel-default"> - <div class="panel-body text-center"> - <form method="post" action="<?=$mod->ap()?>"> - <input type="hidden" name="input[action]" value="login" /> - <h1>Login</h1> - - <div class="form-group"> - <label for="inputUsername">Username</label> - <input type="text" name="input[username]" id="inputUsername" class="form-control" required="true" /> - </div> + <?php if (isset($mod->noaccounts)) { ?> + <div class="jumbotron"> + <h1>Almost there....</h1> + <p class="text-center">Scrott's configuration is working, but no user accounts exist.<br />Use the form below to signup as an admin.</p> + <h5 class="text-center">It is presumed that you are the administrator for this Scrott install.<br />There is a security risk involved with exposing this page to the public!</h5> + </div> + <?php } ?> - <div class="form-group"> - <label for="inputPassword">Password</label> - <input type="password" name="input[password]" id="inputPassword" class="form-control" /> - </div> + <div class="tab-content"> + <div class="tab-pane fade <?=$mod->activeTab['login']?>" id="loginTab"> + <div class="row"> + <div class="col-md-4"></div> + + <div class="col-md-4"> + <div class="panel panel-default"> + <div class="panel-body text-center"> + <form method="post" action="<?=$mod->ap()?>"> + <input type="hidden" name="input[action]" value="login" /> + <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 /> + </div> - <button type="submit" class="btn btn-success pull-right"> - Login <span class="glyphicon glyphicon-log-in"></span> - </button> - </form> + <div class="form-group"> + <label for="loginPassword">Password</label> + <input type="password" name="input[password]" id="loginPassword" class="form-control" /> + </div> + + <div class="btn-group pull-right"> + <?php if ($mod->tabSwap) { ?> + <a href="#signupTab" class="btn btn-default" aria-controls="signup" data-toggle="tab"> + Signup <span class="glyphicon glyphicon-user"></span> + </a> + <?php } ?> + + <button type="submit" class="btn btn-success"> + Login <span class="glyphicon glyphicon-log-in"></span> + </button> + </div> + </form> + </div> + </div> </div> + + <div class="col-md-4"></div> </div> </div> - <div class="col-md-4"></div> + <div class="tab-pane fade <?=$mod->activeTab['signup']?>" id="signupTab"> + <div class="row"> + <div class="col-md-3"></div> + + <div class="col-md-6"> + <div class="panel panel-default"> + <div class="panel-body"> + <form method="post" action="<?=$mod->ap()?>"> + <input type="hidden" name="input[action]" value="signup" /> + <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" /> + </div> + + <div class="form-group"> + <label for="signupPassword">Password</label> + <input type="password" name="input[password]" id="signupPassword" 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" /> + </div> + + <div class="btn-group pull-right"> + <?php if ($mod->tabSwap) { ?> + <a href="#loginTab" class="btn btn-default" aria-controls="login" data-toggle="tab"> + Cancel <span class="glyphicon glyphicon-remove"></span> + </a> + <?php } ?> + + <button type="submit" class="btn btn-success"> + Signup <span class="glyphicon glyphicon-user"></span> + </button> + </div> + </form> + </div> + </div> + </div> + + <div class="col-md-3"></div> + </div> + </div> </div> </div> diff --git a/app/view/auth/signup.view.php b/app/view/auth/signup.view.php deleted file mode 100644 index 273c174..0000000 --- a/app/view/auth/signup.view.php +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html> - -<html lang="en"> - <head> - <?php include "view/common/head.view.php"; ?> - <title>Scrott - Create Account</title> - </head> - - <body> - <?php include "view/common/topp.view.php"; ?> - - <div class="container"> - <?php if (isset($mod->noaccounts)) { ?> - <div class="jumbotron"> - <h1>Almost there....</h1> - <p class="text-center">Scrott's configuration is working, but no user accounts exist.<br />Use the form below to signup as an admin.</p> - <h5 class="text-center">It is presumed that you are the administrator for this Scrott install.<br />There is a security risk involved with exposing this page to the public!</h5> - </div> - <?php } ?> - - <div class="row"> - <div class="col-md-3"></div> - - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-body"> - <form method="post" action="<?=$mod->ap()?>"> - <input type="hidden" name="input[action]" value="signup_submit" /> - <h1 class="text-center">Signup for Scrott</h1> - - <div class="form-group"> - <label for="inputUsername">Username</label> - <input type="text" name="input[username]" id="inputUsername" class="form-control" required="true" maxlength="50" /> - </div> - - <div class="form-group"> - <label for="inputPassword">Password</label> - <input type="password" name="input[password]" id="inputPassword" class="form-control" /> - </div> - - <div class="form-group"> - <label for="inputCPassword">Confirm Password</label> - <input type="password" name="input[cPassword]" id="inputCPassword" class="form-control" /> - </div> - - <button type="submit" class="btn btn-success pull-right"> - Signup <span class="glyphicon glyphicon-user"></span> - </button> - </form> - </div> - </div> - </div> - - <div class="col-md-3"></div> - </div> - </div> - - <?php include "view/common/foot.view.php"; ?> - </body> -</html> |