Integrated FOSUserBundle (#216)

templates/admin/user.html.twig

@@ -38,7 +38,7 @@
             <td class="{{ tables.data_table_column_class(tableName, columns, 'username') }}">{{ entry.username }}</td>
             <td class="{{ tables.data_table_column_class(tableName, columns, 'email') }}">{{ entry.email }}</td>
             <td class="{{ tables.data_table_column_class(tableName, columns, 'title') }}">{{ entry.title }}</td>
-            <td class="{{ tables.data_table_column_class(tableName, columns, 'active') }}">{{ widgets.label_visible(entry.active) }}</td>
+            <td class="{{ tables.data_table_column_class(tableName, columns, 'active') }}">{{ widgets.label_visible(entry.enabled) }}</td>
             <td class="{{ tables.data_table_column_class(tableName, columns, 'roles') }}">
                 {% for role in entry.roles %}
                     {{ widgets.label_role(role) }}

templates/base.html.twig

@@ -67,11 +67,11 @@
     {% endif %}
 {% endblock %}
 
-{% block avanzu_navbar_tasks %}{#{ parent() }#}{% endblock %}
-{% block avanzu_navbar_user %}{#{ parent() }#}{% endblock %}
-
-{% block avanzu_sidebar_user %}{# right now we simply deactivate that box #}{% endblock %}
-{% block avanzu_sidebar_search %}{# right now we simply deactivate that box #}{% endblock %}
+{# deactivated blocks #}
+{% block avanzu_navbar_tasks %}{% endblock %}
+{% block avanzu_navbar_user %}{% endblock %}
+{% block avanzu_sidebar_user %}{% endblock %}
+{% block avanzu_sidebar_search %}{% endblock %}
 
 {% block avanzu_breadcrumb %}
     {{ block('page_actions') }}

templates/bundles/FOSUserBundle/Registration/confirmed.html.twig

@@ -0,0 +1,16 @@
+{% extends '@AdminLTE/FOSUserBundle/Registration/confirmed.html.twig' %}
+
+{% block logo_login %}<b>Kimai</b><br>TimeTracking{% endblock %}
+
+{% block head %}
+    {{ parent() }}
+    <script src="{{ asset('build/app.js') }}"></script>
+    {% include 'partials/head.html.twig' %}
+{% endblock %}
+
+{% block stylesheets %}
+    {# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
+    <link rel="stylesheet" href="{{ asset('build/app.css') }}">
+{% endblock %}
+
+{% block javascripts %}{% endblock %}

templates/bundles/FOSUserBundle/Registration/register.html.twig

@@ -0,0 +1,16 @@
+{% extends '@AdminLTE/FOSUserBundle/Registration/register.html.twig' %}
+
+{% block logo_login %}<b>Kimai</b><br>TimeTracking{% endblock %}
+
+{% block head %}
+    {{ parent() }}
+    <script src="{{ asset('build/app.js') }}"></script>
+    {% include 'partials/head.html.twig' %}
+{% endblock %}
+
+{% block stylesheets %}
+    {# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
+    <link rel="stylesheet" href="{{ asset('build/app.css') }}">
+{% endblock %}
+
+{% block javascripts %}{% endblock %}

templates/bundles/FOSUserBundle/Resetting/request.html.twig

@@ -0,0 +1,16 @@
+{% extends '@AdminLTE/FOSUserBundle/Resetting/request.html.twig' %}
+
+{% block logo_login %}<b>Kimai</b><br>TimeTracking{% endblock %}
+
+{% block head %}
+    {{ parent() }}
+    <script src="{{ asset('build/app.js') }}"></script>
+    {% include 'partials/head.html.twig' %}
+{% endblock %}
+
+{% block stylesheets %}
+    {# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
+    <link rel="stylesheet" href="{{ asset('build/app.css') }}">
+{% endblock %}
+
+{% block javascripts %}{% endblock %}

templates/bundles/FOSUserBundle/Security/login.html.twig

@@ -1,19 +1,13 @@
-{% extends '@AdminLTE/layout/login-layout.html.twig' %}
+{% extends '@AdminLTE/FOSUserBundle/Security/login.html.twig' %}
 
-{% block login_social_auth %}{% endblock %}
-{% block login_actions %}{% endblock %}
 {% block logo_login %}<b>Kimai</b><br>TimeTracking{% endblock %}
 
-{% block stylesheets %}
-    {# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
-    <link rel="stylesheet" href="{{ asset('build/app.css') }}">
-{% endblock %}
-
-{% block login_form_end %}
-    <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}"/>
-{% endblock %}
-
 {% block head %}
     {{ parent() }}
     {% include 'partials/head.html.twig' %}
 {% endblock %}
+
+{% block stylesheets %}
+    {# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
+    <link rel="stylesheet" href="{{ asset('build/app.css') }}">
+{% endblock %}

templates/bundles/FOSUserBundle/layout.html.twig

@@ -0,0 +1,16 @@
+{% extends '@AdminLTE/FOSUserBundle/layout.html.twig' %}
+
+{% block logo_login %}<b>Kimai</b><br>TimeTracking{% endblock %}
+
+{% block head %}
+    {{ parent() }}
+    <script src="{{ asset('build/app.js') }}"></script>
+    {% include 'partials/head.html.twig' %}
+{% endblock %}
+
+{% block stylesheets %}
+    {# we do not call parent() as we use a custom built for the frontend assets and don't want the default <stylesheet> #}
+    <link rel="stylesheet" href="{{ asset('build/app.css') }}">
+{% endblock %}
+
+{% block javascripts %}{% endblock %}