diff --git a/templates/web/login/cgus.html.twig b/templates/web/login/cgus.html.twig new file mode 100644 index 0000000000..3145a37eae --- /dev/null +++ b/templates/web/login/cgus.html.twig @@ -0,0 +1,25 @@ +{% extends "login/layout/content-only-layout.html.twig" %} + +{% 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. +

+
+ + {% trans "Return to login page" %} + +
+
+{% endblock %} diff --git a/templates/web/login/change-password.html.twig b/templates/web/login/change-password.html.twig new file mode 100644 index 0000000000..e3ea17c97d --- /dev/null +++ b/templates/web/login/change-password.html.twig @@ -0,0 +1,98 @@ +{% extends "login/layout/sidebar-layout.html.twig" %} + +{% import "login/common/macros.html.twig" as auth_macro %} + +{% block sidebar %} +
+
+
+
{% trans "Choose a new password" %}
+
+
+
+
+
+
+
+ + + + + + +
+ +
+
+ {{ auth_macro.fieldError("This field is required") }} +
+ {#{% verbatim %} + passwordChangeForm.password.$valid = {{passwordChangeForm.password.$valid}}
+ passwordChangeForm.password.$error = {{passwordChangeForm.password.$error}}
+ passwordChangeForm.$valid = {{passwordChangeForm.$valid}}
+ passwordChangeForm.password.errors.filled = {{passwordChangeForm.password.errors.filled}}
+ {% endverbatim %}#} + +
+
+
+
+ + + + + + +
+ +
+
+ {{ auth_macro.fieldError("Passwords do not match!") }} +
+ {#{% verbatim %} + passwordChangeForm.passwordConfirm.$valid = {{passwordChangeForm.passwordConfirm.$valid}}
+ passwordChangeForm.passwordConfirm.$error = {{passwordChangeForm.passwordConfirm.$error}}
+ passwordChangeForm.$valid = {{passwordChangeForm.$valid}}
+ passwordChangeForm.passwordConfirm.errors.filled = {{passwordChangeForm.passwordConfirm.errors.filled}}
+ passwordChangeForm.passwordConfirm.$error.validator = {{passwordChangeForm.passwordConfirm.$error.validator}}
+ {% endverbatim %}#} +
+
+ + +
+
+ +
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/web/login/common/form_div_layout.html.twig b/templates/web/login/common/form_div_layout.html.twig new file mode 100644 index 0000000000..bebcf980ba --- /dev/null +++ b/templates/web/login/common/form_div_layout.html.twig @@ -0,0 +1,11 @@ +{% extends "form_div_layout.html.twig" %} + +{% import "login/common/macros.html.twig" as auth_macro %} + +{% block form_errors %} + {% spaceless %} + {% if errors|length > 0 %} + {{ auth_macro.fieldError(errors) }} + {% endif %} + {% endspaceless %} +{% endblock form_errors %} diff --git a/templates/web/login/common/language-block.html.twig b/templates/web/login/common/language-block.html.twig new file mode 100644 index 0000000000..b9ac9d15b9 --- /dev/null +++ b/templates/web/login/common/language-block.html.twig @@ -0,0 +1,11 @@ +
+ {% trans "language" %} +
+ + +
+
diff --git a/templates/web/login/common/macros.html.twig b/templates/web/login/common/macros.html.twig new file mode 100644 index 0000000000..3f967f5df0 --- /dev/null +++ b/templates/web/login/common/macros.html.twig @@ -0,0 +1,124 @@ +{% macro fieldInput(id, label, name, value, type, required, icon, placeholder, state, size) %} + {% if label is not none and label is not empty %} + + {% endif %} + + + + + + +
+ +
+{% endmacro %} + +{% macro checkboxInput (id, label, name, checked) %} +
+
+ +
+
+
+ +
+{% endmacro %} + +{% macro providerList() %} + +{% endmacro %} + +{% macro fieldError(errors) %} +
+
+
+ + + + {% if errors|keys|length >= 1 %} + {% for error in errors if error.messagePluralization is defined %} + + {% endfor %} + {% else %} + + {% endif %} + +
+ {{ error.messageTemplate|trans(error.messageParameters, 'validators') }} + {{ errors|trans }}
+
+
+ + + {% if errors|keys|length >= 1 %} + {% for error in errors if error.messagePluralization is defined %} + {{ error.messageTemplate|trans(error.messageParameters, 'validators') }} + {% endfor %} + {% else %} + {{ errors|trans }} + {% endif %} + +{% endmacro %} + +{% macro providerBadge(provider, img_url, full_name, email) %} +
+ + + + + +
+ + +
    +
  • {{ full_name }}
    • + +
+
+
+{% endmacro %} + +{% macro phraseanetBadge(full_name, email, company) %} +
+ +
+{% endmacro %} + +{% macro alert() %} + {% for type, messages in app['session'].getFlashBag().all() %} + {% 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/common/main-content.html.twig b/templates/web/login/common/main-content.html.twig new file mode 100644 index 0000000000..60e103086c --- /dev/null +++ b/templates/web/login/common/main-content.html.twig @@ -0,0 +1,9 @@ +{% import "login/common/macros.html.twig" as auth_macro %} + +{% set text %} +Best check yo self, you're not looking too good. Best check yo self, you're not looking too good. Best check yo self, you're not looking too good. +{% endset %} + +{{ text }} +{{ text }} +{{ text }} \ No newline at end of file diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig index d2dbd3e009..15be2d9a66 100644 --- a/templates/web/login/forgot-password.html.twig +++ b/templates/web/login/forgot-password.html.twig @@ -1,153 +1,66 @@ -{% extends 'account/base.html.twig' %} +{% extends "login/layout/sidebar-layout.html.twig" %} +{% import "login/common/macros.html.twig" as auth_macro %} -{% block title %} - {% trans 'admin::compte-utilisateur changer mon mot de passe' %} -{% endblock %} - -{% block head %} - - - - -{% endblock %} - -{% block menu %} - -{% endblock %} - -{% block content %} - -{% if tokenize %} - - {% if app['request'].get('salt') %} -
- {% trans 'Pour ameliorer la securite de l\'application, vous devez mettre a jour votre mot de passe.' %}
- {% trans 'Cette tache ne pouvant etre automatisee, merci de bien vouloir la realiser.' %} -
- {% endif %} - -
- - - - - - - - - - - - - - - - -
-
- -
- 		-
- {% if passwordMsg is not none %} - {{ passwordMsg }} - {% endif %} -
-
 
-
-
-
-
-
-
- -
- -
- 		-
- {% if passwordMsg is not none %} - {{ passwordMsg }} - {% endif %} -
-
- - - - {% trans 'login:: Retour a l\'accueil' %} -
-
- -{% endif %} - -{% if not tokenize %} -
- {% if errorMsg is not none %} -
- × - {{ errorMsg }} +{% block sidebar %} +
+
+
+
{% trans "Forgot your password?" %}
+
+ {% trans "Enter your e-mail address to retrieve your password" %} +
- {% endif %} - - {% if sentMsg is not none %} -
{{ sentMsg }}
- {% endif %} - -
- {% trans 'login:: Forgot your password' %} -
-
- {% trans 'login:: Entrez votre adresse email' %} -
-
- -
-
- - {% trans 'login:: Retour a l\'accueil' %} -
- -{% endif %} - +
+
+
+
+
+
+
+ + + + + + +
+ +
+
+ {{ auth_macro.fieldError("This field is required") }} +
+
+ {{ auth_macro.fieldError("Thes field is not valid") }} +
+ {#{% verbatim %} + forgottenPasswordForm.email.$valid = {{forgottenPasswordForm.email.$valid}}
+ forgottenPasswordForm.email.$error = {{forgottenPasswordForm.email.$error}}
+ forgottenPasswordForm.$valid = {{forgottenPasswordForm.$valid}}
+ forgottenPasswordForm.email.errors.filled = {{forgottenPasswordForm.email.errors.filled}}
+ forgottenPasswordForm.email.errors.valid = {{forgottenPasswordForm.email.errors.valid}}
+ {% endverbatim %}#} +
+
+
+
+
+ +
+
+
+
+
{% endblock %} diff --git a/templates/web/login/head.html.twig b/templates/web/login/head.html.twig deleted file mode 100644 index aa175ef46c..0000000000 --- a/templates/web/login/head.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{{module_name}} - - - - - -{% 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 %} - - - - diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index c051e3c679..31bcb77268 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -1,184 +1,130 @@ - - - {% include 'login/head.html.twig' %} - - -
{{ app['phraseanet.registry'].get('GV_metaDescription') }}
- +{% extends "login/layout/sidebar-layout.html.twig" %} - {% if app['browser'].isOldBrowser %} - - {% endif %} - {% if app['phraseanet.registry'].get('GV_display_gcf', 1) and app['request'].cookies.get('gfc_box') == false %} - - {% endif %} - {% if captcha_system != '' %} - - {% endif %} - -
-
- - - - - -
{{ app['phraseanet.registry'].get('GV_homeTitle') }} - {{ app['phraseanet.registry'].get('GV_metaDescription') }} - {% trans 'phraseanet:: aide' %} - {% if login.register_enabled(app) %} - {% trans 'login:: register' %} - {% endif %} - {% if login.get_cgus(app) != '' %} - {% trans 'login:: CGUs' %} - {% endif %} - {% trans 'login:: accueil' %} -
-
-
-
-
- {% for provider in app['authentication.providers'] %} - {{ provider.getId() }} - {% endfor %} - {% if display_layout == 'DISPLAYx1' %} - {% include 'login/index_layout_displayx1.html.twig' %} - {% elseif display_layout == 'DISPLAYx4' %} - - {% elseif display_layout == 'COOLIRIS' %} - {% include 'login/index_layout_displaycooliris.html.twig' %} - {% elseif display_layout == 'SCROLL' %} - {% include 'login/index_layout_displayscroll.html.twig' %} - {% else %} - {% include 'login/index_layout_displayx1.html.twig' %} - {% endif %} - -
-
- {% if login.get_cgus(app) != '' %} - +
+
+
+ {% trans "Or login with" %} +
+
+
+
+ {{ auth_macro.providerList() }} +
+
+
+
+
+
+ {% trans "No account yet?" %}
- {% include 'common/analytics.html.twig' %} - - +
+
+ {% trans "Register" %} +
+
+
+{% endblock %} diff --git a/templates/web/login/index_layout_displaycooliris.html.twig b/templates/web/login/index_layout_displaycooliris.html.twig deleted file mode 100644 index bdf199194b..0000000000 --- a/templates/web/login/index_layout_displaycooliris.html.twig +++ /dev/null @@ -1,70 +0,0 @@ -
-
-
- {{login.get_register_link(app) |raw}} - {{login.get_guest_link(app) |raw}} -
- -
-
- - - -
-
-
- {{captcha_system|raw}} -
-
- - {% if logged_out == 'user' %} -
- {% trans 'Vous etes maintenant deconnecte. A bientot.' %} -
- {% endif %} - {{ warning }}{{ notice }} -
-
-
{% trans 'admin::compte-utilisateur identifiant' %}
-
- -
-
-
-
{% trans 'admin::compte-utilisateur mot de passe' %}
-
-
-
-
-
-
- - - - - - - - - -
diff --git a/templates/web/login/index_layout_displayscroll.html.twig b/templates/web/login/index_layout_displayscroll.html.twig deleted file mode 100644 index a6d76f5253..0000000000 --- a/templates/web/login/index_layout_displayscroll.html.twig +++ /dev/null @@ -1,61 +0,0 @@ -
-
-
- {{login.get_register_link(app) |raw}} - {{login.get_guest_link(app) |raw}} -
- -
-
- -
-
-
- {{captcha_system|raw}} -
-
- - {% if logged_out == 'user' %} -
- {% trans 'Vous etes maintenant deconnecte. A bientot.' %} -
- {% endif %} - {{ warning }}{{ notice }} -
-
-
{% trans 'admin::compte-utilisateur identifiant' %}
-
- -
-
-
-
{% trans 'admin::compte-utilisateur mot de passe' %}
-
- -
-
-
-
-
- - - - - - - - -
diff --git a/templates/web/login/index_layout_displayx1.html.twig b/templates/web/login/index_layout_displayx1.html.twig deleted file mode 100644 index 0bb6c29e49..0000000000 --- a/templates/web/login/index_layout_displayx1.html.twig +++ /dev/null @@ -1,63 +0,0 @@ - -
-
- - - - - - - - -
-
- -
-
-
- - {% if logged_out == 'user' %} -
- {% trans 'Vous etes maintenant deconnecte. A bientot.' %} -
- {% endif %} - {{ warning }}{{ notice }} -
-
-
{% trans 'admin::compte-utilisateur identifiant' %}
-
-
-
-
{% trans 'admin::compte-utilisateur mot de passe' %}
-
- -
- {{captcha_system|raw}} -
-
-
-
-
-
-
-
- {{login.get_register_link(app) |raw}} -
-
- {{login.get_guest_link(app) |raw}} -
-
-
diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig new file mode 100644 index 0000000000..f55075a4ff --- /dev/null +++ b/templates/web/login/layout/base-layout.html.twig @@ -0,0 +1,91 @@ +{% set home_title = app['phraseanet.registry'].get('GV_homeTitle')|default('Phraseanet') %} + + + + + + + + + + Phraseanet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {% block scaffholding %} + + {% endblock %} +
+
+
+
+
+ +
+
+
+
+ Phraseanet +
+
+
+
+
+
+ {% block javascript %} + + {% endblock %} + + diff --git a/templates/web/login/layout/content-only-layout.html.twig b/templates/web/login/layout/content-only-layout.html.twig new file mode 100644 index 0000000000..15535a9b48 --- /dev/null +++ b/templates/web/login/layout/content-only-layout.html.twig @@ -0,0 +1,13 @@ +{% extends "login/layout/base-layout.html.twig" %} + +{% block scaffholding %} +
+
+
+ {% block content %} + + {% endblock %} +
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/web/login/layout/sidebar-layout.html.twig b/templates/web/login/layout/sidebar-layout.html.twig new file mode 100644 index 0000000000..32fa3e82b2 --- /dev/null +++ b/templates/web/login/layout/sidebar-layout.html.twig @@ -0,0 +1,50 @@ +{% extends "login/layout/base-layout.html.twig" %} + +{% block scaffholding %} +
+
+
+
+ +
+
+
+
+
+ {% block header %} +
+ Welcome on {{ app['phraseanet.registry'].get('GV_homeTitle')|default('Tf1') }} Media gallery +
+ 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. +

+ {% endblock %} +
+
+
+
+
+
+ {% include "login/common/main-content.html.twig" with {"home_title" : home_title} %} +
+
+
+
+
+
+ {% include "login/common/language-block.html.twig" %} +
+
+ {% block sidebar %} {% endblock %} +
+
+
+
+
+{% 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 new file mode 100644 index 0000000000..f6aa8ba4a5 --- /dev/null +++ b/templates/web/login/providers/bind.html.twig @@ -0,0 +1,153 @@ +{% extends "login/layout/sidebar-layout.html.twig" %} + +{% import "common/macros.html.twig" as macro %} +{% import "login/common/macros.html.twig" as auth_macro %} + +{% block sidebar %} +
+
+
+
{% trans "Connexion" %}
+
+ {% set provider_name = "Facebook" %} + {% trans %} + Your {{ provider_name }} account matchs a Phraseanet account + {% endtrans %} +
+
+
+
+
+ {{ auth_macro.providerBadge("facebook-badge","http://profile.ak.fbcdn.net/hprofile-ak-ash4/188043_268328669948930_728750033_q.jpg","Monsieur Grincheux","mr.grincheux@email.com") }} +
+
+
+
+
+ +
+
+
+
+
+ {{ auth_macro.phraseanetBadge("Monsieur Grincheux","mr.grincheux@email.com", "Alchemy") }} +
+
+
+
+
+
+ {% trans "Login to link your account" %} +
+
+
+
+ {{ auth_macro.alert() }} +
+ {# Note this is hidden for the moment to see how submit the user login #} + + +
+
+ + + + + + +
+ +
+
+ {{ auth_macro.fieldError("This field is required") }} +
+
+
+ +
+ {% trans "Forgot password?" %} +
+ + {% set recaptcha_display = true %} + {% if recaptcha_display %} +
+
+ {% set recaptcha = "" %} + {{ macro.captcha(recaptcha) }} +
+
+ {% endif %} + +
+
+ +
+
+
+
+
+
+
+
+
+ {% trans "These informations do not match?" %} +
+
+
+
+ {% trans "Use my Phraseanet account" %} +
+
+
+
+
+
+ {% trans "No account yet?" %} +
+
+
+
+ {% trans "Register" %} +
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig new file mode 100644 index 0000000000..6e9e19dace --- /dev/null +++ b/templates/web/login/providers/mapping.html.twig @@ -0,0 +1,128 @@ +{% extends "login/layout/sidebar-layout.html.twig" %} + +{% import "common/macros.html.twig" as macro %} +{% import "login/common/macros.html.twig" as auth_macro %} + +{% block sidebar %} +
+
+
+
{% trans "Connexion" %}
+
+ {% set provider_name = "Google plus" %} + {% trans %} + Your {{ provider_name }} account matchs a Phraseanet account + {% endtrans %} +
+
+
+
+
+ {{ auth_macro.providerBadge("google-plus-badge","http://profile.ak.fbcdn.net/hprofile-ak-ash4/188043_268328669948930_728750033_q.jpg","Monsieur Grincheux","mr.grincheux@email.com") }} +
+
+
+
+
+
+ {% trans "Login to link your account" %} +
+
+
+
+ {{ auth_macro.alert() }} +
+
+
+ + + + + +
+ +
+
+ {{ auth_macro.fieldError("This field is required") }} +
+
+ {{ auth_macro.fieldError("This field is not valid") }} +
+
+
+ +
+
+ + + + + + +
+ +
+
+ {{ auth_macro.fieldError("This field is required") }} +
+
+
+ +
+ {% trans "Forgot password?" %} +
+ + {% set recaptcha_display = true %} + {% if recaptcha_display %} +
+
+ {% set recaptcha = "" %} + {{ macro.captcha(recaptcha) }} +
+
+ {% endif %} + +
+
+ +
+
+
+
+
+
+
+
+
+ {% trans "No account yet?" %} +
+
+
+
+ {% trans "Register" %} +
+
+
+{% 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 new file mode 100644 index 0000000000..85cdef107a --- /dev/null +++ b/templates/web/login/register-classic.html.twig @@ -0,0 +1,68 @@ +{% extends "login/layout/sidebar-layout.html.twig" %} + +{% import "login/common/macros.html.twig" as auth_macro %} + +{% block sidebar %} +
+
+
+
{% trans "Inscription" %}
+
+ {% trans %} + Complete the fields below to register on {{ home_title }}! + {% endtrans %} +
+
+
+ +
+
+
+
+
+ {{ auth_macro.fieldInput("first-name","First name","first_name",null,"text","icon-user", "Your first name") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("last-name","Last name","last_name",null,"text","icon-user", "Your last name") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("email","E-mail","email",null,"email","icon-envelope", "Your e-mail address") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("company","Company","company",null,"text","icon-briefcase", "Your company name") }} +
+
+ +
+ * {% trans "Mandatory fields" %} +
+ +
+
+ {% set label %} + {% trans "I have read the terms of use" %} + {% endset %} + + {{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }} +
+
+ +
+
+ +
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig new file mode 100644 index 0000000000..09e37ae1e9 --- /dev/null +++ b/templates/web/login/register-provider.html.twig @@ -0,0 +1,83 @@ +{% extends "login/layout/sidebar-layout.html.twig" %} + +{% import "login/common/macros.html.twig" as auth_macro %} + +{% block sidebar %} +
+ +
+
+
{% trans "Completion of your registration" %}
+
+
+ +
+
+ {{ auth_macro.providerBadge("facebook-badge","http://profile.ak.fbcdn.net/hprofile-ak-ash4/188043_268328669948930_728750033_q.jpg","Monsieur Grincheux","mr.grincheux@email.com") }} +
+
+ +
+
+ {% trans "Please complete the information to complete your registration" %} +
+
+ +
+
+
+
+
+ {{ auth_macro.fieldInput("first-name","First name","first_name",null,"text","icon-user", "Your first name") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("last-name","Last name","last_name",null,"text","icon-user", "Your last name") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("email","E-mail","email",null,"email","icon-envelope", "Your e-mail address") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("company","Company","company",null,"text","icon-briefcase", "Your company name", "error") }} + {{ auth_macro.fieldError("Sed posuere consectetur est at lobortis.") }} +
+
+ +
+
+ {{ auth_macro.fieldInput("job","Job","job",null,"text","icon-briefcase", "Your job name", "success") }} +
+
+ +
+ * {% trans "Mandatory fields" %} +
+ +
+
+ {% set label %} + {% trans "I have read the terms of use" %} + {% endset %} + + {{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }} +
+
+ +
+
+ +
+
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/web/login/register.html.twig b/templates/web/login/register.html.twig index 0a775088f4..40a463a9a1 100644 --- a/templates/web/login/register.html.twig +++ b/templates/web/login/register.html.twig @@ -1,387 +1,33 @@ -{% extends 'account/base.html.twig' %} +{% extends "login/layout/sidebar-layout.html.twig" %} -{% block title %} - {% trans 'login:: register' %} -{% endblock %} +{% import "login/common/macros.html.twig" as auth_macro %} -{% block menu %} - -{% endblock %} - -{% block head %} - - - -{% endblock %} - -{% block content %} - {% if captcha_system != '' %} - - {% endif %} -
-
-
- -
- -

{{ needed['form_login'] is defined ? needed['form_login'] : '' }}

-
+{% block sidebar %} +
+
+
+
{% trans "Inscription" %}
-
- -
- -

- {% trans 'Resistance du mot de passe' %}
- {{ needed['form_password'] is defined ? needed['form_password'] : '' }} -

-

 

-
-
-
-
-

-
-
-
- -
- -

{{ needed['form_password_confirm'] is defined ? needed['form_password_confirm'] : '' }}

-
-
-
- {% trans 'admin::compte-utilisateur A propos de la securite des mots de passe' %} - -
-
-
- -
- -

{{ needed['form_email'] is defined ? needed['form_email'] : '' }}

-
-
-
- -
- -

{{ needed['form_geonameid'] is defined ? needed['form_geonameid'] : '' }}

-
-
-
- -
- - - -

{{ needed['form_gender'] is defined ? needed['form_gender'] : '' }}

-
-
-
- -
- -

{{ needed['form_lastname'] is defined ? needed['form_lastname'] : '' }}

-
-
-
- -
- -

{{ needed['form_firstname'] is defined ? needed['form_firstname'] : '' }}

-
-
-
- -
- -

{{ needed['form_job'] is defined ? needed['form_job'] : '' }}

-
-
-
- -
- -

{{ needed['form_activity'] is defined ? needed['form_activity'] : '' }}

-
-
-
- -
- -

{{ needed['form_phone'] is defined ? needed['form_phone'] : '' }}

-
-
-
- -
- -

{{ needed['form_fax'] is defined ? needed['form_fax'] : '' }}

-
-
-
- -
- -

{{ needed['form_company'] is defined ? needed['form_company'] : '' }}

-
-
-
- -
- -

{{ needed['form_address'] is defined ? needed['form_address'] : '' }}

-
-
-
- -
- -

{{ needed['form_zip'] is defined ? needed['form_zip'] : '' }}

-
-
-
- -
- {{ captcha_system | raw }} -
-
-
-
- - {% if app['phraseanet.registry'].get('GV_autoselectDB') %} -
-

- {% trans 'admin::compte-utilisateur actuellement, acces aux bases suivantes : ' %} -

- -

- {{ needed['demand'] is defined ? needed['demand'] : '' }} -

- - - {% for sbasId, baseInsc in inscriptions %} - {% if (baseInsc['CollsCGU'] or baseInsc['Colls']) and baseInsc['inscript'] %} - - - - {% if baseInsc['Colls'] %} - {% if baseInsc['CGU'] %} - - - - {% endif %} - {% for collId, collName in baseInsc['Colls'] %} - {% set baseId = sbasId |base_from_coll(collId, app) %} - - - - - {% endfor %} - {% endif %} - {% if baseInsc['CollsCGU'] %} - {% for collId, collDesc in baseInsc['CollsCGU'] %} - {% set baseId = sbasId |base_from_coll(collId, app) %} - - - - - - - - - - - {% endfor %} - {% endif %} - {% endif %} - {% endfor %} -
-

{{ sbasId |sbas_names(app) }}

-
- {% trans 'login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes' %}
- {% trans 'login::register::CGU: ouvrir dans une nouvelle fenetre' %} -
{{ collName }} - - {% trans 'login::register: Faire une demande d\'acces' %} -
-
-
- {% trans 'login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes' %}
- {% trans 'login::register::CGU: ouvrir dans une nouvelle fenetre' %} -
{{ collDesc['name'] }} - - {% trans 'login::register: Faire une demande d\'acces' %} -
-
- {% endif %} - - -
-
- - - +
+
+ + {% trans "Create an account manually" %} + + +
+
+
+
+
+
+ {% trans "Or login with" %} +
+
+
+
+ {{ auth_macro.providerList() }} +
+
+
{% endblock %}