diff --git a/site/plugins/admin/app/Controllers/UsersController.php b/site/plugins/admin/app/Controllers/UsersController.php index 622ad726..b2a2ac7a 100644 --- a/site/plugins/admin/app/Controllers/UsersController.php +++ b/site/plugins/admin/app/Controllers/UsersController.php @@ -46,7 +46,7 @@ class UsersController extends Controller 'plugins/admin/views/templates/users/login.html' ); } else { - return $response->withRedirect($this->router->pathFor('admin.users.registration')); + return $response->withRedirect($this->router->pathFor('admin.users.installation')); } } } @@ -80,14 +80,14 @@ class UsersController extends Controller } /** - * Registration page + * Installation page * * @param Request $request PSR7 request * @param Response $response PSR7 response * * @return Response */ - public function registration(Request $request, Response $response) : Response + public function installation(Request $request, Response $response) : Response { $users = $this->getUsers(); @@ -99,21 +99,21 @@ class UsersController extends Controller } else { return $this->view->render( $response, - 'plugins/admin/views/templates/users/registration.html' + 'plugins/admin/views/templates/users/installation.html' ); } } } /** - * Registration page process + * Installation page process * * @param Request $request PSR7 request * @param Response $response PSR7 response * * @return Response */ - public function registrationProcess(Request $request, Response $response) : Response + public function installationProcess(Request $request, Response $response) : Response { // Get POST data $data = $request->getParsedBody(); @@ -130,10 +130,10 @@ class UsersController extends Controller )) { return $response->withRedirect($this->router->pathFor('admin.users.login')); } else { - return $response->withRedirect($this->router->pathFor('admin.users.registration')); + return $response->withRedirect($this->router->pathFor('admin.users.installation')); } } else { - return $response->withRedirect($this->router->pathFor('admin.users.registration')); + return $response->withRedirect($this->router->pathFor('admin.users.installation')); } } diff --git a/site/plugins/admin/lang/en_US.json b/site/plugins/admin/lang/en_US.json index 356b15e6..67c074db 100755 --- a/site/plugins/admin/lang/en_US.json +++ b/site/plugins/admin/lang/en_US.json @@ -1,5 +1,7 @@ { "admin": "Admin", + "admin_welcome": "Welcome", + "admin_create_new_user_welcome": "To finish setup and secure your site, please create the first user by entering the necessary information below.", "admin_cancel": "Cancel", "admin_create": "Create", "admin_debugging": "Debugging", diff --git a/site/plugins/admin/routes/web.php b/site/plugins/admin/routes/web.php index e3aeb691..b2ac4e7c 100644 --- a/site/plugins/admin/routes/web.php +++ b/site/plugins/admin/routes/web.php @@ -4,8 +4,8 @@ namespace Flextype; // UsersController $app->group('/' . $admin_route, function () use ($flextype, $app) { - $app->get('/registration', 'UsersController:registration')->setName('admin.users.registration'); - $app->post('/registration', 'UsersController:registrationProcess')->setName('admin.users.registrationProcess'); + $app->get('/installation', 'UsersController:installation')->setName('admin.users.installation'); + $app->post('/installation', 'UsersController:installationProcess')->setName('admin.users.installationProcess'); $app->get('/login', 'UsersController:login')->setName('admin.users.login'); $app->post('/login', 'UsersController:loginProcess')->setName('admin.users.loginProcess'); }); diff --git a/site/plugins/admin/views/templates/users/registration.html b/site/plugins/admin/views/templates/users/installation.html similarity index 84% rename from site/plugins/admin/views/templates/users/registration.html rename to site/plugins/admin/views/templates/users/installation.html index 351ec960..e7731e06 100644 --- a/site/plugins/admin/views/templates/users/registration.html +++ b/site/plugins/admin/views/templates/users/installation.html @@ -2,11 +2,17 @@ {% block content %} +
+
+

{{ tr('admin_welcome') }}!

+

{{ tr('admin_create_new_user_welcome') }}

+
+
+
{{ csrf() }}
-

{{ tr('admin_create_new_user') }}