diff --git a/templates/web/login/cgus.html.twig b/templates/web/login/cgus.html.twig index 3145a37eae..1d0d359128 100644 --- a/templates/web/login/cgus.html.twig +++ b/templates/web/login/cgus.html.twig @@ -3,19 +3,8 @@ {% block content %}
-
- Condition Générale d'Utilisation de la Base Beta Version 3.0 -
-

- Nulla pharetra vestibulum mollis. Donec auctor ultricies libero sit amet tempus. Quisque vulputate, metus non lacinia euismod, justo ipsum accumsan metus, id volutpat quam ante varius massa. In interdum sapien nec dolor tincidunt pulvinar. Nulla mattis, purus a pharetra sollicitudin, massa elit fringilla libero, non blandit velit diam vel sapien. Mauris consectetur, orci elementum tincidunt hendrerit, lorem tortor blandit arcu, ac elementum risus turpis a nisl. Donec at laoreet nisl. -

-

- Sed tortor lorem, semper eget volutpat id, placerat vel nibh. Quisque ornare, libero quis sagittis dictum, nunc leo scelerisque nisi, eu facilisis nisi sapien ac nisl. Vestibulum feugiat vestibulum orci, nec pharetra quam placerat nec. Vestibulum condimentum rhoncus scelerisque. Duis quis ipsum nec orci pellentesque luctus id quis ipsum. Curabitur placerat, neque non viverra sagittis, nisl orci pharetra lectus, ut sodales massa eros a orci. Quisque ac felis risus, hendrerit laoreet augue. Donec ac ante ipsum, ac placerat elit. Duis volutpat, turpis ut imperdiet ultrices, mauris nisi dignissim eros, a venenatis lacus elit id dui. -

-

- Sed at enim et felis dapibus rhoncus. Quisque bibendum diam at ipsum tempor blandit. Proin ut urna purus, faucibus aliquet lorem. Phasellus eu eros fermentum nunc gravida tincidunt. Nulla ac diam risus. Nulla ac lectus justo, ac sodales orci. Suspendisse volutpat neque sed sapien tempor quis lacinia magna rhoncus. Aliquam erat volutpat. Suspendisse bibendum lacinia euismod. Nulla sit amet scelerisque neque. Sed nec nunc ac leo pellentesque tempus non at urna. -

+ {% block cgu_content %} {% endblock %}
{% trans "Return to login page" %} diff --git a/templates/web/login/change-password.html.twig b/templates/web/login/change-password.html.twig index e3ea17c97d..ff09cf866f 100644 --- a/templates/web/login/change-password.html.twig +++ b/templates/web/login/change-password.html.twig @@ -95,4 +95,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/web/login/common/language-block.html.twig b/templates/web/login/common/language-block.html.twig deleted file mode 100644 index b9ac9d15b9..0000000000 --- a/templates/web/login/common/language-block.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -
- {% trans "language" %} -
- - -
-
diff --git a/templates/web/login/common/macros.html.twig b/templates/web/login/common/macros.html.twig index 3f967f5df0..782691500b 100644 --- a/templates/web/login/common/macros.html.twig +++ b/templates/web/login/common/macros.html.twig @@ -112,13 +112,9 @@ {% endmacro %} {% macro alert() %} - {% for type, messages in app['session'].getFlashBag().all() %} + {% for type, messages in app.getFlash() %} {% for message in messages %} {{ message|trans }} {% endfor %} {% endfor %} - - {% if app.request.query.get("notice") is not none %} - {{ app.request.query.get("notice") }} - {% endif %} {% endmacro %} diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig index 15be2d9a66..9020296119 100644 --- a/templates/web/login/forgot-password.html.twig +++ b/templates/web/login/forgot-password.html.twig @@ -64,3 +64,4 @@ {% endblock %} + diff --git a/templates/web/login/include/language-block.html.twig b/templates/web/login/include/language-block.html.twig new file mode 100644 index 0000000000..201a14d55b --- /dev/null +++ b/templates/web/login/include/language-block.html.twig @@ -0,0 +1,12 @@ +{% set languages = app.getAvailableLanguages() %} +
+ {% trans "language" %} +
+ + +
+
diff --git a/templates/web/login/common/main-content.html.twig b/templates/web/login/include/main-content.html.twig similarity index 88% rename from templates/web/login/common/main-content.html.twig rename to templates/web/login/include/main-content.html.twig index 60e103086c..4ac1f6bc87 100644 --- a/templates/web/login/common/main-content.html.twig +++ b/templates/web/login/include/main-content.html.twig @@ -6,4 +6,4 @@ Best check yo self, you're not looking too good. Best check yo self, you're not {{ text }} {{ text }} -{{ text }} \ No newline at end of file +{{ text }} diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index f55075a4ff..7197a7fedc 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -1,58 +1,76 @@ -{% set home_title = app['phraseanet.registry'].get('GV_homeTitle')|default('Phraseanet') %} - - - - Phraseanet - - + {% block header %} + + + {% block title %}Phraseanet{% endblock title %} + - - - + + + + - - + {% for feed in feeds %} + {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'rss') %} + + {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'atom') %} + + {% endfor %} - - - - - - - - - - - - - - - - - - - - + {% block favicon %} + + {% endblock favicon %} - + {% endblock header_stylesheet %} - window.myCustomTags = ['alert']; // optional - - - + {% block header_javascript %} + + + + + + + + + + + + + + + + + + + + + + + {% endblock header_javascript %} + {% endblock header %} diff --git a/templates/web/login/layout/content-only-layout.html.twig b/templates/web/login/layout/content-only-layout.html.twig index 15535a9b48..d5fd53a733 100644 --- a/templates/web/login/layout/content-only-layout.html.twig +++ b/templates/web/login/layout/content-only-layout.html.twig @@ -10,4 +10,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/web/login/layout/sidebar-layout.html.twig b/templates/web/login/layout/sidebar-layout.html.twig index 8e5f50abbf..67e1ea371f 100644 --- a/templates/web/login/layout/sidebar-layout.html.twig +++ b/templates/web/login/layout/sidebar-layout.html.twig @@ -1,5 +1,9 @@ {% extends "login/layout/base-layout.html.twig" %} +{% block title %} + {{ app['phraseanet.registry'].get('GV_homeTitle')|default('Phraseanet') }} +{% endblock %} + {% block scaffholding %}
@@ -15,11 +19,11 @@
{% block header %}
- Welcome on {{ app['phraseanet.registry'].get('GV_homeTitle')|default('Tf1') }} Media gallery + {% block main_title %}{% endblock %}
- More ... + {% trans "More" %} ...

- Vivamus justo mauris, elementum eu auctor tincidunt, viverra et erat. Nunc pretium dui eget purus rutrum malesuada. Donec pellentesque arcu quis lectus blandit ac mollis magna vehicula. Fusce non leo id leo blandit feugiat et nec massa. Sed viverra viverra fermentum. In sit amet varius turpis. + {% block short_presentation %}{% endblock %}

{% endblock %}
@@ -28,14 +32,14 @@
- {% include "login/common/main-content.html.twig" with {"home_title" : home_title} %} + {% include "login/include/main-content.html.twig" %}
- {% include "login/common/language-block.html.twig" %} + {% include "login/include/language-block.html.twig" %}
{% block sidebar %} {% endblock %} @@ -45,6 +49,3 @@
{% endblock %} - -{% block javascript %} -{% endblock %} \ No newline at end of file diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig index f6aa8ba4a5..9bdff0e36d 100644 --- a/templates/web/login/providers/bind.html.twig +++ b/templates/web/login/providers/bind.html.twig @@ -150,4 +150,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig index 6e9e19dace..77012c4b21 100644 --- a/templates/web/login/providers/mapping.html.twig +++ b/templates/web/login/providers/mapping.html.twig @@ -125,4 +125,5 @@ -{% endblock %} \ No newline at end of file +{% endblock %} + \ No newline at end of file diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig index 85cdef107a..061225e111 100644 --- a/templates/web/login/register-classic.html.twig +++ b/templates/web/login/register-classic.html.twig @@ -65,4 +65,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig index 09e37ae1e9..b78d77c415 100644 --- a/templates/web/login/register-provider.html.twig +++ b/templates/web/login/register-provider.html.twig @@ -80,4 +80,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %}