From e1b22358b3af84566152f3b4ab9722e3b1142ba4 Mon Sep 17 00:00:00 2001 From: Lang Date: Wed, 2 Nov 2016 18:35:03 +0100 Subject: [PATCH] login && register form overrided --- app/config/security.yml | 3 +- .../Controller/DefaultController.php | 4 -- .../UserBundle/Resources/config/routing.yml | 3 - .../views/Registration/register.html.twig | 28 ++++++++ .../Resources/views/Security/login.html.twig | 66 +++++-------------- .../Resources/views/layout.html.twig | 22 ++----- 6 files changed, 51 insertions(+), 75 deletions(-) create mode 100644 src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig diff --git a/app/config/security.yml b/app/config/security.yml index 698018c..45a873d 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -16,7 +16,7 @@ security: form_login: provider: fos_userbundle csrf_token_generator: security.csrf.token_manager - default_target_path: /admin + default_target_path: / logout: true anonymous: true @@ -26,4 +26,3 @@ security: - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } - { path: ^/admin, role: ROLE_SUPER_ADMIN } -# - { path: ^/, role: ROLE_SUPER_ADMIN } diff --git a/src/Jotunheimr/UserBundle/Controller/DefaultController.php b/src/Jotunheimr/UserBundle/Controller/DefaultController.php index ed1c8db..993984a 100644 --- a/src/Jotunheimr/UserBundle/Controller/DefaultController.php +++ b/src/Jotunheimr/UserBundle/Controller/DefaultController.php @@ -6,8 +6,4 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; class DefaultController extends Controller { - public function indexAction() - { - return $this->render('JotunheimrUserBundle:Default:index.html.twig'); - } } diff --git a/src/Jotunheimr/UserBundle/Resources/config/routing.yml b/src/Jotunheimr/UserBundle/Resources/config/routing.yml index c6b96f4..e69de29 100644 --- a/src/Jotunheimr/UserBundle/Resources/config/routing.yml +++ b/src/Jotunheimr/UserBundle/Resources/config/routing.yml @@ -1,3 +0,0 @@ -JotunheimrUserBundle_homepage: - path: /login - defaults: { _controller: JotunheimrUserBundle:Default:index } diff --git a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig new file mode 100644 index 0000000..5c0bcb7 --- /dev/null +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -0,0 +1,28 @@ +{% extends 'JotunheimrUserBundle::layout.html.twig' %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} + {{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }} + + {{ form_label(form.email) }} + {{ form_widget(form.email) }} + {{ form_errors(form.email) }} + + {{ form_label(form.username) }} + {{ form_widget(form.username) }} + {{ form_errors(form.username) }} + + {{ form_label(form.plainPassword.first) }} + {{ form_widget(form.plainPassword.first) }} + {{ form_errors(form.plainPassword.first) }} + + {{ form_label(form.plainPassword.second) }} + {{ form_widget(form.plainPassword.second) }} + {{ form_errors(form.plainPassword.second) }} + +
+ +
+ {{ form_end(form) }} +{% endblock fos_user_content %} diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig index f8da2b0..e7e3a6b 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig @@ -3,55 +3,25 @@ {% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %} -
- - -
- Copyright © 2016 · www.laszlolang.com system7 -
- Project Jotunheimr
- Version {{ jotun_version }} · All rights reserved. -
-
+ + + + + + + {% endblock fos_user_content %} diff --git a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig index b22033a..1b3a5b2 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig @@ -6,12 +6,8 @@ {% block title %}{{ project_name }} Admin - Login{% endblock %} {% block stylesheets %} - - - {% stylesheets filter='cssrewrite' - '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' - '@JotunheimrAdminBundle/Resources/public/css/s7Admin.css' %} + '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' %} {% endstylesheets %} {% endblock %} @@ -24,18 +20,7 @@ - - -{#
#} - {#{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}#} - {#{{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }} |#} - {##} - {#{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}#} - {##} - {#{% else %}#} - {#{{ 'layout.login'|trans({}, 'FOSUserBundle') }}#} - {#{% endif %}#} -{#
#} + {% if app.request.hasPreviousSession %} {% for type, messages in app.session.flashbag.all() %} @@ -54,7 +39,8 @@ {% block javascripts %} {% javascripts - '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jQuery-2.1.4.min.js' + '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js' + '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js' '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %} {% endjavascripts %}