diff --git a/app/AppKernel.php b/app/AppKernel.php index cdf59b6..919be84 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -18,6 +18,7 @@ * along with this program. If not, see . */ +use JavierEguiluz\Bundle\EasyAdminBundle\EasyAdminBundle; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\HttpKernel\Kernel; @@ -39,6 +40,7 @@ class AppKernel extends Kernel new \FOS\UserBundle\FOSUserBundle(), new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(), new Vich\UploaderBundle\VichUploaderBundle(), + new EasyAdminBundle(), new Sikofitt\DoughnutWeddingBundle\SikofittDoughnutWeddingBundle(), ]; diff --git a/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig b/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig index cdcd10d..827ef6f 100644 --- a/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig +++ b/app/Resources/FOSUserBundle/views/ChangePassword/change_password.html.twig @@ -1,5 +1,5 @@ -{% extends "@FOSUser/layout.html.twig" %} +{% extends "base.html.twig" %} -{% block fos_user_content %} +{% block body %} {% include "@FOSUser/ChangePassword/change_password_content.html.twig" %} -{% endblock fos_user_content %} +{% endblock body %} diff --git a/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig b/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig index 6648fe1..a00d8d8 100644 --- a/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig +++ b/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig @@ -1,7 +1,7 @@ {% trans_default_domain 'SikofittDoughnutweddingBundle' %}

User Information

-
+

{{ 'profile.name'|trans }}

{{ user.name }}

@@ -11,9 +11,14 @@

{{ 'profile.rsvp'|trans }}

{% if user.rsvp is not null %}{{ user.rsvp.guests }}{% else %}0{% endif %}

- -
+ +
+
+ You can change your password here. +
+
+ Edit Information +