From 39394819d45ebcf68cab96c13a6affb994f734f3 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 6 Feb 2016 01:10:12 -0500 Subject: 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 --- app/view/auth/default.view.php | 114 ++++++++++++++++++++++++++++++++--------- app/view/auth/signup.view.php | 60 ---------------------- 2 files changed, 90 insertions(+), 84 deletions(-) delete mode 100644 app/view/auth/signup.view.php (limited to 'app/view') 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 @@ - Scrott - Login + Scrott - Not logged in
-
-
- -
-
-
-
- -

Login

- -
- - -
+ noaccounts)) { ?> +
+

Almost there....

+

Scrott's configuration is working, but no user accounts exist.
Use the form below to signup as an admin.

+
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
+
+ -
- - -
+
+
+
+
+ +
+
+
+ + +

Login

+ +
+ + +
- - +
+ + +
+ +
+ tabSwap) { ?> + + Signup + + + + +
+ +
+
+ +
-
+
+
+
+ +
+
+
+
+ +

Signup for Scrott

+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ tabSwap) { ?> + + Cancel + + + + +
+
+
+
+
+ +
+
+
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 @@ - - - - - - Scrott - Create Account - - - - - -
- noaccounts)) { ?> -
-

Almost there....

-

Scrott's configuration is working, but no user accounts exist.
Use the form below to signup as an admin.

-
It is presumed that you are the administrator for this Scrott install.
There is a security risk involved with exposing this page to the public!
-
- - -
-
- -
-
-
-
- -

Signup for Scrott

- -
- - -
- -
- - -
- -
- - -
- - -
-
-
-
- -
-
-
- - - - -- cgit v1.2.3