diff --git a/templates/web/login/change-password.html.twig b/templates/web/login/change-password.html.twig index 630580a303..b80870791d 100644 --- a/templates/web/login/change-password.html.twig +++ b/templates/web/login/change-password.html.twig @@ -10,26 +10,28 @@
-
{% trans "Choose a new password" %}
+
+ {% trans "Choose a new password" %} +
-
+
-
-
- -
+
+ +
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
-
-
+
+
{{ auth_macro.fieldInput(form.passwordConfirm, form.vars.name, 'icon-lock', { "ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ", @@ -40,13 +42,15 @@ }}
-
+
- +
-
+
{% endblock %} diff --git a/templates/web/login/common/macros.html.twig b/templates/web/login/common/macros.html.twig index 06bb4fb238..76a2251751 100644 --- a/templates/web/login/common/macros.html.twig +++ b/templates/web/login/common/macros.html.twig @@ -9,7 +9,7 @@ %} {% set attributes = custom_attributes|default({})|merge({ - 'class': app['browser'].getBrowser() == constant('Browser::BROWSER_IE') and app['browser'].getVersion() <= 7 ? '' : 'input-block-level', + 'class': app['browser'].getBrowser() == constant('Browser::BROWSER_IE') and app['browser'].getVersion() <= 8 ? '' : 'input-block-level', 'ng-model' : input_name, 'force-model-update' : '' }) @@ -19,7 +19,9 @@ - + @@ -67,10 +69,18 @@ {% macro providerList() %} {% endmacro %} @@ -93,7 +103,7 @@
+ + {{ form_widget(field, { 'attr': attributes })}}
- + {% if errors|keys|length >= 1 %} @@ -115,21 +125,31 @@ - + {% endmacro %} {% macro phraseanetBadge(full_name, email, company) %}
{% endmacro %} diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig index d54e9214ac..57e0591ba5 100644 --- a/templates/web/login/forgot-password.html.twig +++ b/templates/web/login/forgot-password.html.twig @@ -10,34 +10,39 @@
-
{% trans "Forgot your password?" %}
+
+ {% trans "Forgot your password?" %} +
{% trans "Enter your e-mail address to retrieve your password" %}
-
+
-
-
-
+
+ +
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} -
-
-
+
+
- +
-
+
-
+ + {% endblock %} diff --git a/templates/web/login/include/language-block.html.twig b/templates/web/login/include/language-block.html.twig index 201a14d55b..065aeee3fb 100644 --- a/templates/web/login/include/language-block.html.twig +++ b/templates/web/login/include/language-block.html.twig @@ -2,11 +2,14 @@
{% trans "language" %}
- +
    {% for code, language in languages if code != app['locale'] %}
  • {{ language }}
    • {% endfor %}
-
+
diff --git a/templates/web/login/include/main-content.html.twig b/templates/web/login/include/main-content.html.twig index 7b079a7053..907ea53d6d 100644 --- a/templates/web/login/include/main-content.html.twig +++ b/templates/web/login/include/main-content.html.twig @@ -1 +1,43 @@ {% import "login/common/macros.html.twig" as auth_macro %} + +a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
\ No newline at end of file diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index 1c48ecd0b5..4fa70805e5 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -26,73 +26,72 @@
-
{% trans "Connexion" %}
+
+ {% trans "Connexion" %} +
-
- {{ auth_macro.alert() }} - -
+ {{ auth_macro.alert() }} + - + check-form-submission + >
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
-
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
- -
- {% trans "Forgot password?" %} -
- +
+ + {% trans "Forgot password?" %} + +
{% if recaptcha_display %}
{{ macro.captcha(recaptcha) }}
-
- {% endif %} - -
-
-
-
- -
+ {% endif %} +
+
+ +
+
+
{{ auth_macro.checkboxInput("remember-me","Remember me"|trans,"remember-me") }}
-
+
-
+
{% trans "Or login with" %}
-
+
{{ auth_macro.providerList() }}
-
+ {% include "login/include/register-link-block.html.twig" with {"login" : login, "last_item" : login.register_enabled(app)} %} diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index 5d325865ae..c8daaf4289 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -79,45 +79,53 @@ -
+
{% block scaffholding %} {% endblock %} -
-
-
- {% block footer %} -
-
- {% block footer_content %} -
- -
- {% endblock footer_content %} -
-
-
- {% block footer_logo %}Phraseanet{% endblock footer_logo %} -
-
-
- {% endblock footer %} -
-
-
+ {% block footer_scaffholding %} +
+
+
+ {% block footer %} +
+
+ {% block footer_content %} +
+ +
+ {% endblock footer_content %} +
+
+
+ {% block footer_logo %}Phraseanet{% endblock footer_logo %} +
+
+
+ {% endblock footer %} +
+
+
+ {% endblock footer_scaffholding %}
{% include 'common/analytics.html.twig' %} diff --git a/templates/web/login/layout/content-only-layout.html.twig b/templates/web/login/layout/content-only-layout.html.twig index d5fd53a733..b56ac59e4d 100644 --- a/templates/web/login/layout/content-only-layout.html.twig +++ b/templates/web/login/layout/content-only-layout.html.twig @@ -8,6 +8,6 @@ {% endblock %}
- - + + {% endblock %} diff --git a/templates/web/login/layout/sidebar-layout.html.twig b/templates/web/login/layout/sidebar-layout.html.twig index a2d44888d2..32afc48384 100644 --- a/templates/web/login/layout/sidebar-layout.html.twig +++ b/templates/web/login/layout/sidebar-layout.html.twig @@ -38,7 +38,7 @@ - +
{% include "login/include/language-block.html.twig" %} @@ -48,6 +48,6 @@
- + {% endblock %} diff --git a/templates/web/login/providers/bind.html.twig b/templates/web/login/providers/bind.html.twig index 7812e279bc..1887c6ff79 100644 --- a/templates/web/login/providers/bind.html.twig +++ b/templates/web/login/providers/bind.html.twig @@ -17,7 +17,9 @@
-
{% trans "Connexion" %}
+
+ {% trans "Connexion" %} +
{% trans %} Your {{ provider_name }} account matchs a Phraseanet account @@ -31,14 +33,14 @@
-
-
- -
+
+
+ +
-
+
{{ auth_macro.phraseanetBadge("Monsieur Grincheux","mr.grincheux@email.com", "Alchemy") }}
@@ -50,46 +52,44 @@
-
- {{ auth_macro.alert() }} -
+
+ {{ auth_macro.alert() }} + -
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
- -
- {% trans "Forgot password?" %} -
- +
+ {% trans "Forgot password?" %} +
{% if recaptcha_display %}
{{ macro.captcha(recaptcha) }}
-
- {% endif %} - -
-
-
-
+ {% endif %} +
+
+ +
+
@@ -97,12 +97,14 @@
- {% trans "These informations do not match?" %} + {% trans "These informations do not match?" %}
- {% trans "Use my Phraseanet account" %} + + {% trans "Use my Phraseanet account" %} +
diff --git a/templates/web/login/providers/mapping.html.twig b/templates/web/login/providers/mapping.html.twig index 1b1adb4e26..d0f3d3b905 100644 --- a/templates/web/login/providers/mapping.html.twig +++ b/templates/web/login/providers/mapping.html.twig @@ -17,7 +17,9 @@
-
{% trans "Connexion" %}
+
+ {% trans "Connexion" %} +
{% trans %} Your {{ provider_name }} account matchs a Phraseanet account @@ -26,8 +28,8 @@
-
- {{ 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") }} +
+ {{ 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") }}
@@ -38,45 +40,44 @@
-
- {{ auth_macro.alert() }} -
+
+ {{ auth_macro.alert() }} +
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
-
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
- -
- {% trans "Forgot password?" %} -
- +
+ {% trans "Forgot password?" %} +
{% if recaptcha_display %}
{{ macro.captcha(recaptcha) }}
-
- {% endif %} - -
-
-
-
+ {% endif %} +
+
+ +
+
diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig index cd474b3d61..bb89e141aa 100644 --- a/templates/web/login/register-classic.html.twig +++ b/templates/web/login/register-classic.html.twig @@ -10,7 +10,9 @@
-
{% trans "Inscription" %}
+
+ {% trans "Inscription" %} +
{% trans %} Complete the fields below to register on {{ home_title }}! @@ -20,21 +22,21 @@
-
-
+
+
{{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }}
-
+
{{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }}
-
+
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
@@ -46,25 +48,29 @@
-
- * {% trans "Mandatory fields" %} -
+
+ * {% trans "Mandatory fields" %} +
-
+
{% set label %} - {% trans "I have read the terms of use" %} + + {% trans "I have read the terms of use" %} + {% endset %} {{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }}
-
+
-
+
- +
-
+
diff --git a/templates/web/login/register-provider.html.twig b/templates/web/login/register-provider.html.twig index a8652065e3..b55a9011c5 100644 --- a/templates/web/login/register-provider.html.twig +++ b/templates/web/login/register-provider.html.twig @@ -11,7 +11,9 @@
-
{% trans "Completion of your registration" %}
+
+ {% trans "Completion of your registration" %} +
@@ -22,65 +24,67 @@
-
+
{% trans "Please complete the information to complete your registration" %}
-
-
-
+
+ +
{{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }}
-
- -
+
+
{{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }}
-
- -
+
+
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
-
+
-
+
{{ auth_macro.fieldInput(form.company, form.vars.name, 'icon-briefcase') }}
-
+
-
+
{{ auth_macro.fieldInput(form.job, form.vars.name, 'icon-briefcase') }}
-
- -
- * {% trans "Mandatory fields" %}
-
+
+ * {% trans "Mandatory fields" %} +
+ +
{% set label %} - {% trans "I have read the terms of use" %} + + {% trans "I have read the terms of use" %} + {% endset %} {{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }}
-
+
-
+
- +
-
+
-
+
{% endblock %} diff --git a/templates/web/login/register.html.twig b/templates/web/login/register.html.twig index c35501e878..ab4d83b04f 100644 --- a/templates/web/login/register.html.twig +++ b/templates/web/login/register.html.twig @@ -10,25 +10,32 @@
-
{% trans "Inscription" %}
+
+ {% trans "Inscription" %} +
-
- - {% trans "Create an account manually" %} - - -
+
+ + + {% trans "Create an account manually" %} + + + + + +
+
{% trans "Or login with" %}
-
+
{{ auth_macro.providerList() }}