From ee4610df35db1f77e3a07ae707c74bff446476d4 Mon Sep 17 00:00:00 2001
From: core23 <mail@core23.de>
Date: Wed, 29 Apr 2020 00:09:50 +0200
Subject: [PATCH] Use common layout for all security templates

---
 .../Security/Resetting/checkEmail.html.twig   |  43 +-----
 .../Security/Resetting/request.html.twig      |  75 +++-------
 .../Admin/Security/Resetting/reset.html.twig  |  79 ++++-------
 .../views/Admin/Security/layout.html.twig     |  38 +++++
 .../views/Admin/Security/login.html.twig      | 133 +++++++-----------
 5 files changed, 140 insertions(+), 228 deletions(-)
 create mode 100644 src/Resources/views/Admin/Security/layout.html.twig

diff --git a/src/Resources/views/Admin/Security/Resetting/checkEmail.html.twig b/src/Resources/views/Admin/Security/Resetting/checkEmail.html.twig
index 4f0ef064..7ae4885c 100644
--- a/src/Resources/views/Admin/Security/Resetting/checkEmail.html.twig
+++ b/src/Resources/views/Admin/Security/Resetting/checkEmail.html.twig
@@ -1,38 +1,7 @@
-{% extends base_template %}
+{% extends '@NucleosUserAdmin/Admin/Security/layout.html.twig' %}
 
-{% block sonata_nav %}
-{% endblock sonata_nav %}
-
-{% block logo %}
-{% endblock logo %}
-
-{% block sonata_left_side %}
-{% endblock sonata_left_side %}
-
-{% block body_attributes %}class="sonata-bc login-page"{% endblock %}
-
-{% block sonata_wrapper %}
-    <div class="login-box">
-        {% block login_box_header %}
-            <div class="login-logo">
-                <a href="{{ path('sonata_admin_dashboard') }}">
-                    {% if admin_pool.getOption('title_mode') in ['single_image', 'both'] %}
-                        <div>
-                            <img style="width:64px;" src="{{ asset(admin_pool.titlelogo) }}"
-                                 alt="{{ admin_pool.title }}">
-                        </div>
-                    {% endif %}
-                    {% if admin_pool.getOption('title_mode') in ['single_text', 'both'] %}
-                        <span>{{ admin_pool.title }}</span>
-                    {% endif %}
-                </a>
-            </div>
-        {% endblock %}
-        <div class="login-box-body">
-            <p>{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}, 'NucleosUserBundle')|nl2br }}</p>
-            <a href="{{ path('nucleos_user_admin_security_login') }}">
-                {{ 'title_user_authentication'|trans({}, 'NucleosUserAdminBundle') }}
-            </a>
-        </div>
-    </div>
-{% endblock sonata_wrapper %}
+{% block login_box_content %}
+    <p>
+        {{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}, 'NucleosUserBundle')|nl2br }}
+    </p>
+{% endblock %}
diff --git a/src/Resources/views/Admin/Security/Resetting/request.html.twig b/src/Resources/views/Admin/Security/Resetting/request.html.twig
index 7ce09863..dc37e9c3 100644
--- a/src/Resources/views/Admin/Security/Resetting/request.html.twig
+++ b/src/Resources/views/Admin/Security/Resetting/request.html.twig
@@ -1,58 +1,23 @@
-{% extends base_template %}
-
-{% block sonata_nav %}
-{% endblock sonata_nav %}
-
-{% block logo %}
-{% endblock logo %}
-
-{% block sonata_left_side %}
-{% endblock sonata_left_side %}
-
-{% block body_attributes %}class="sonata-bc login-page"{% endblock %}
-
-{% block sonata_wrapper %}
+{% extends '@NucleosUserAdmin/Admin/Security/layout.html.twig' %}
+
+{% block login_box_content %}
+    <p class="login-box-msg">
+        {{ 'resetting.request.submit'|trans({}, 'NucleosUserBundle') }}
+    </p>
+
+    <form action="{{ path('nucleos_user_admin_resetting_send_email') }}" method="post" role="form">
+        <div class="form-group has-feedback">
+            <input type="text" class="form-control" id="username" name="username" required="required"
+                   placeholder="{{ 'resetting.request.username'|trans({}, 'NucleosUserBundle')|replace({':': ''}) }}"/>
+            <span class="glyphicon glyphicon-user form-control-feedback"></span>
+        </div>
 
-    <div class="login-box">
-        {% block login_box_header %}
-            <div class="login-logo">
-                <a href="{{ path('sonata_admin_dashboard') }}">
-                    {% if admin_pool.getOption('title_mode') in ['single_image', 'both'] %}
-                        <div>
-                            <img style="width:64px;" src="{{ asset(admin_pool.titlelogo) }}"
-                                 alt="{{ admin_pool.title }}">
-                        </div>
-                    {% endif %}
-                    {% if admin_pool.getOption('title_mode') in ['single_text', 'both'] %}
-                        <span>{{ admin_pool.title }}</span>
-                    {% endif %}
-                </a>
+        <div class="row">
+            <div class="col-xs-12">
+                <button type="submit" class="btn btn-primary btn-block btn-flat">
+                    {{ 'resetting.request.submit'|trans({}, 'NucleosUserBundle') }}
+                </button>
             </div>
-        {% endblock %}
-        <div class="login-box-body">
-            {% block sonata_admin_reset_request_form %}
-                <p class="login-box-msg">{{ 'resetting.request.submit'|trans({}, 'NucleosUserBundle') }}</p>
-                <form action="{{ path('nucleos_user_admin_resetting_send_email') }}" method="post" role="form">
-                    <div class="form-group has-feedback">
-                        <input type="text" class="form-control" id="username" name="username" required="required"
-                               placeholder="{{ 'resetting.request.username'|trans({}, 'NucleosUserBundle')|replace({':': ''}) }}"/>
-                        <span class="glyphicon glyphicon-user form-control-feedback"></span>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <button type="submit" class="btn btn-primary btn-block btn-flat">
-                                {{ 'resetting.request.submit'|trans({}, 'NucleosUserBundle') }}
-                            </button>
-                        </div>
-                    </div>
-                </form>
-
-                <a href="{{ path('nucleos_user_admin_security_login') }}">
-                    {{ 'title_user_authentication'|trans({}, 'NucleosUserAdminBundle') }}
-                </a>
-            {% endblock %}
         </div>
-    </div>
-
-{% endblock sonata_wrapper %}
+    </form>
+{% endblock %}
diff --git a/src/Resources/views/Admin/Security/Resetting/reset.html.twig b/src/Resources/views/Admin/Security/Resetting/reset.html.twig
index 1d31a839..41ed24f8 100644
--- a/src/Resources/views/Admin/Security/Resetting/reset.html.twig
+++ b/src/Resources/views/Admin/Security/Resetting/reset.html.twig
@@ -1,60 +1,29 @@
-{% extends base_template %}
+{% extends '@NucleosUserAdmin/Admin/Security/layout.html.twig' %}
 
-{% block sonata_nav %}
-{% endblock sonata_nav %}
+{% block login_box_content %}
+    <p class="login-box-msg">
+        {{ 'resetting.reset.submit'|trans({}, 'NucleosUserBundle') }}
+    </p>
 
-{% block logo %}
-{% endblock logo %}
-
-{% block sonata_left_side %}
-{% endblock sonata_left_side %}
-
-{% block body_attributes %}class="sonata-bc login-page"{% endblock %}
-
-{% block sonata_wrapper %}
-
-    <div class="login-box">
-        {% block login_box_header %}
-            <div class="login-logo">
-                <a href="{{ path('sonata_admin_dashboard') }}">
-                    {% if admin_pool.getOption('title_mode') in ['single_image', 'both'] %}
-                        <div>
-                            <img style="width:64px;" src="{{ asset(admin_pool.titlelogo) }}"
-                                 alt="{{ admin_pool.title }}">
-                        </div>
-                    {% endif %}
-                    {% if admin_pool.getOption('title_mode') in ['single_text', 'both'] %}
-                        <span>{{ admin_pool.title }}</span>
-                    {% endif %}
-                </a>
-            </div>
-        {% endblock %}
-        <div class="login-box-body">
-            {% block sonata_admin_reset_form %}
-                <p class="login-box-msg">{{ 'resetting.reset.submit'|trans({}, 'NucleosUserBundle') }}</p>
-                {{ form_start(form, { 'action': path('nucleos_user_admin_resetting_reset', {'token': token}) }) }}
-                <div class="form-group">
-                    {{ form_widget(form.plainPassword.first, {'attr': {
-                        'class': 'form-control',
-                        'placeholder': 'form.new_password'|trans({}, 'NucleosUserBundle')
-                    }}) }}
-                </div>
-                <div class="form-group">
-                    {{ form_widget(form.plainPassword.second, {'attr': {
-                        'class': 'form-control',
-                        'placeholder': 'form.new_password_confirmation'|trans({}, 'NucleosUserBundle')
-                    }}) }}
-                </div>
-                <div class="row">
-                    <div class="col-xs-12">
-                        <button type="submit" class="btn btn-primary btn-block btn-flat">
-                            {{ 'resetting.reset.submit'|trans({}, 'NucleosUserBundle') }}
-                        </button>
-                    </div>
-                </div>
-                {{ form_end(form) }}
-            {% endblock %}
+    {{ form_start(form, { 'action': path('nucleos_user_admin_resetting_reset', {'token': token}) }) }}
+    <div class="form-group">
+        {{ form_widget(form.plainPassword.first, {'attr': {
+            'class': 'form-control',
+            'placeholder': 'form.new_password'|trans({}, 'NucleosUserBundle')
+        }}) }}
+    </div>
+    <div class="form-group">
+        {{ form_widget(form.plainPassword.second, {'attr': {
+            'class': 'form-control',
+            'placeholder': 'form.new_password_confirmation'|trans({}, 'NucleosUserBundle')
+        }}) }}
+    </div>
+    <div class="row">
+        <div class="col-xs-12">
+            <button type="submit" class="btn btn-primary btn-block btn-flat">
+                {{ 'resetting.reset.submit'|trans({}, 'NucleosUserBundle') }}
+            </button>
         </div>
     </div>
-
+    {{ form_end(form) }}
 {% endblock sonata_wrapper %}
diff --git a/src/Resources/views/Admin/Security/layout.html.twig b/src/Resources/views/Admin/Security/layout.html.twig
new file mode 100644
index 00000000..7bc0b1da
--- /dev/null
+++ b/src/Resources/views/Admin/Security/layout.html.twig
@@ -0,0 +1,38 @@
+{% extends base_template %}
+
+{% block sonata_nav %}
+{% endblock sonata_nav %}
+
+{% block logo %}
+{% endblock logo %}
+
+{% block sonata_left_side %}
+{% endblock sonata_left_side %}
+
+{% block body_attributes %}class="sonata-bc login-page"{% endblock %}
+
+{% block sonata_wrapper %}
+    <div class="login-box">
+        {% block login_box_header %}
+            <div class="login-logo">
+                <a href="{{ path('sonata_admin_dashboard') }}">
+                    {% if sonata_admin.adminPool.getOption('title_mode') in ['single_image', 'both'] %}
+                        <img src="{{ asset(sonata_admin.adminPool.titlelogo) }}"
+                             alt="{{ sonata_admin.adminPool.title }}"
+                             class="center-block img-responsive"
+                        />
+                    {% endif %}
+                    {% if sonata_admin.adminPool.getOption('title_mode') in ['single_text', 'both'] %}
+                        <span>{{ sonata_admin.adminPool.title }}</span>
+                    {% endif %}
+                </a>
+            </div>
+        {% endblock %}
+
+        <div class="login-box-body">
+            {% block login_box_content %}
+            {% endblock %}
+        </div>
+    </div>
+
+{% endblock sonata_wrapper %}
diff --git a/src/Resources/views/Admin/Security/login.html.twig b/src/Resources/views/Admin/Security/login.html.twig
index 5df7588a..62386a80 100644
--- a/src/Resources/views/Admin/Security/login.html.twig
+++ b/src/Resources/views/Admin/Security/login.html.twig
@@ -1,87 +1,58 @@
-{% extends base_template %}
+{% extends '@NucleosUserAdmin/Admin/Security/layout.html.twig' %}
 
-{% block sonata_nav %}
-{% endblock sonata_nav %}
-
-{% block logo %}
-{% endblock logo %}
-
-{% block sonata_left_side %}
-{% endblock sonata_left_side %}
-
-{% block body_attributes %}class="sonata-bc login-page"{% endblock %}
-
-{% block sonata_wrapper %}
-
-    <div class="login-box">
-        {% block login_box_header %}
-            <div class="login-logo">
-                <a href="{{ path('sonata_admin_dashboard') }}">
-                    {% if sonata_admin.adminPool.getOption('title_mode') in ['single_image', 'both'] %}
-                        <div>
-                            <img style="width:64px;" src="{{ asset(sonata_admin.adminPool.titlelogo) }}"
-                                 alt="{{ sonata_admin.adminPool.title }}">
-                        </div>
-                    {% endif %}
-                    {% if sonata_admin.adminPool.getOption('title_mode') in ['single_text', 'both'] %}
-                        <span>{{ sonata_admin.adminPool.title }}</span>
-                    {% endif %}
-                </a>
+{% block login_box_content %}
+    {% block sonata_admin_login_error %}
+        {% if error %}
+            <div class="alert alert-danger alert-error">
+                {{ error.messageKey|trans(error.messageData, 'security') }}
             </div>
-        {% endblock %}
-        <div class="login-box-body">
-            {% block sonata_admin_login_form %}
-                {% block sonata_admin_login_error %}
-                    {% if error %}
-                        <div class="alert alert-danger alert-error">
-                            {{ error.messageKey|trans(error.messageData, 'security') }}
-                        </div>
-                    {% endif %}
-                {% endblock %}
-                <p class="login-box-msg">{{ 'title_user_authentication'|trans({}, 'NucleosUserAdminBundle') }}</p>
-                <form action="{{ path("nucleos_user_admin_security_check") }}" method="post" role="form">
-                    <input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
-
-                    <div class="form-group has-feedback">
-                        <input class="form-control"
-                               id="username"
-                               name="_username"
-                               placeholder="{{ 'security.login.username'|trans({}, 'NucleosUserAdminBundle') }}"
-                               required="required"
-                               type="text"
-                               value="{{ last_username }}"/>
-                        <span class="glyphicon glyphicon-user form-control-feedback"></span>
-                    </div>
-
-                    <div class="form-group has-feedback">
-                        <input class="form-control"
-                               id="password"
-                               name="_password"
-                               placeholder="{{ 'security.login.password'|trans({}, 'NucleosUserAdminBundle') }}"
-                               required="required"
-                               type="password"/>
-                        <span class="glyphicon glyphicon-lock form-control-feedback"></span>
-                    </div>
+        {% endif %}
+    {% endblock %}
+
+    <p class="login-box-msg">
+        {{ 'title_user_authentication'|trans({}, 'NucleosUserAdminBundle') }}
+    </p>
+
+    <form action="{{ path("nucleos_user_admin_security_check") }}" method="post" role="form">
+        <input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/>
+
+        <div class="form-group has-feedback">
+            <input class="form-control"
+                   id="username"
+                   name="_username"
+                   placeholder="{{ 'security.login.username'|trans({}, 'NucleosUserAdminBundle') }}"
+                   required="required"
+                   type="text"
+                   value="{{ last_username }}"/>
+            <span class="glyphicon glyphicon-user form-control-feedback"></span>
+        </div>
 
-                    <div class="row">
-                        <div class="col-xs-8">
-                            <div class="checkbox">
-                                <label>
-                                    <input type="checkbox" id="remember_me" name="_remember_me" value="on"/>
-                                    {{ 'security.login.remember_me'|trans({}, 'NucleosUserBundle') }}
-                                </label>
-                            </div>
-                        </div>
-                        <div class="col-xs-4">
-                            <button type="submit"
-                                    class="btn btn-primary btn-block btn-flat">{{ 'security.login.submit'|trans({}, 'NucleosUserBundle') }}</button>
-                        </div>
-                    </div>
-                </form>
+        <div class="form-group has-feedback">
+            <input class="form-control"
+                   id="password"
+                   name="_password"
+                   placeholder="{{ 'security.login.password'|trans({}, 'NucleosUserAdminBundle') }}"
+                   required="required"
+                   type="password"/>
+            <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+        </div>
 
-                <a href="{{ reset_route }}">{{ 'forgotten_password'|trans({}, 'NucleosUserAdminBundle') }}</a>
-            {% endblock %}
+        <div class="row">
+            <div class="col-xs-8">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="remember_me" name="_remember_me" value="on"/>
+                        {{ 'security.login.remember_me'|trans({}, 'NucleosUserBundle') }}
+                    </label>
+                </div>
+            </div>
+            <div class="col-xs-4">
+                <button type="submit" class="btn btn-primary btn-block btn-flat">
+                    {{ 'security.login.submit'|trans({}, 'NucleosUserBundle') }}
+                </button>
+            </div>
         </div>
-    </div>
+    </form>
 
-{% endblock sonata_wrapper %}
+    <a href="{{ reset_route }}">{{ 'forgotten_password'|trans({}, 'NucleosUserAdminBundle') }}</a>
+{% endblock %}