From ffaead9da3893e567ae0e99122793cde79473fd4 Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Tue, 22 Mar 2016 17:38:56 +0100 Subject: [PATCH] frontent refactoring - move authentication into phraseanet-production-client --- .../web/account/change-password.html.twig | 4 +- templates/web/account/reset-email.html.twig | 8 +++- templates/web/login/forgot-password.html.twig | 6 ++- .../web/login/include/galleria.html.twig | 22 ++--------- templates/web/login/index.html.twig | 6 ++- .../web/login/layout/base-layout.html.twig | 39 ++----------------- templates/web/login/oauth/login.html.twig | 6 ++- templates/web/login/providers/bind.html.twig | 6 ++- .../web/login/providers/mapping.html.twig | 6 ++- .../web/login/register-classic.html.twig | 27 ++----------- .../web/login/register-provider.html.twig | 6 ++- templates/web/login/renew-password.html.twig | 27 ++----------- 12 files changed, 53 insertions(+), 110 deletions(-) diff --git a/templates/web/account/change-password.html.twig b/templates/web/account/change-password.html.twig index 8748eaf82d..cf5ed7dc57 100644 --- a/templates/web/account/change-password.html.twig +++ b/templates/web/account/change-password.html.twig @@ -54,8 +54,10 @@ {% block scripts %} {{ parent() }} - + + + {% endblock %} diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig index 14985c8379..c88524e48f 100644 --- a/templates/web/login/forgot-password.html.twig +++ b/templates/web/login/forgot-password.html.twig @@ -55,5 +55,9 @@ {% block scripts %} {{ parent() }} - + {% endblock %} diff --git a/templates/web/login/include/galleria.html.twig b/templates/web/login/include/galleria.html.twig index 310b86208a..f2162da8d1 100644 --- a/templates/web/login/include/galleria.html.twig +++ b/templates/web/login/include/galleria.html.twig @@ -3,23 +3,9 @@ {% endfor %} - + diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index 2c368e1773..67aad20f7c 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -155,5 +155,9 @@ {% block scripts %} {{ parent() }} - + {% endblock %} diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index c3a1dfab42..bd2b5b9e03 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -42,46 +42,13 @@ {# include backbone templates #} {% include "login/common/templates.html.twig" %} - + + + {% endblock header_javascript %} {% endblock header %} - {% block google_chrome_frame %} - - {% endblock google_chrome_frame %} - {% block container %}
{% block content_scaffholding %}{% endblock %} diff --git a/templates/web/login/oauth/login.html.twig b/templates/web/login/oauth/login.html.twig index bc5541c2d3..b9fd22bb06 100644 --- a/templates/web/login/oauth/login.html.twig +++ b/templates/web/login/oauth/login.html.twig @@ -124,5 +124,9 @@ {% block scripts %} {{ parent() }} - + {% endblock %} diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig index 834a4af026..dd3dbecffa 100644 --- a/templates/web/login/providers/bind.html.twig +++ b/templates/web/login/providers/bind.html.twig @@ -83,5 +83,9 @@ {% block scripts %} {{ parent() }} - + {% endblock %} diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig index e66b74cecc..0db5a43f24 100644 --- a/templates/web/login/providers/mapping.html.twig +++ b/templates/web/login/providers/mapping.html.twig @@ -113,5 +113,9 @@ {% block scripts %} {{ parent() }} - + {% endblock %} diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig index d2fb4c516e..6f02238dc0 100644 --- a/templates/web/login/register-classic.html.twig +++ b/templates/web/login/register-classic.html.twig @@ -105,30 +105,9 @@ {% block scripts %} {{ parent() }} - {% endblock %} diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig index d17c697107..54b9fbfe7b 100644 --- a/templates/web/login/register-provider.html.twig +++ b/templates/web/login/register-provider.html.twig @@ -91,5 +91,9 @@ {% block scripts %} {{ parent() }} - + {% endblock %} diff --git a/templates/web/login/renew-password.html.twig b/templates/web/login/renew-password.html.twig index 17100c360e..8e0498154c 100644 --- a/templates/web/login/renew-password.html.twig +++ b/templates/web/login/renew-password.html.twig @@ -50,30 +50,9 @@ {% block scripts %} {{ parent() }} - {% endblock %}