hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix indent

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-03-05 16:32:58 +01:00
committed by Romain Neutron
parent 53b20754fa
commit 89f0219609
14 changed files with 324 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
templates/web/login/change-password.html.twig
View File

@@ -10,26 +10,28 @@
<div class="well-large sidebar-block last-child"> <div class="well-large sidebar-block last-child">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 authentication-sidebar-title"> <div class="span12 authentication-sidebar-title">
<div class="text-title">{% trans "Choose a new password" %}</div> <div class="text-title">
{% trans "Choose a new password" %}
</div>
</div> </div>
</div><!-- /row --> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<form <form
ng-controller="passwordChangeFormCtrl" ng-controller="passwordChangeFormCtrl"
novalidate novalidate
name="{{ form.vars.name}}" name="{{ form.vars.name}}"
ng-submit="submit();" ng-submit="submit();"
method="POST" method="POST"
action="{{ path('submit_login_new_password') }}" action="{{ path('submit_login_new_password') }}"
check-form-submission> check-form-submission
>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }} {{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.passwordConfirm, form.vars.name, 'icon-lock', { {{ auth_macro.fieldInput(form.passwordConfirm, form.vars.name, 'icon-lock', {
"ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ", "ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ",
@@ -40,13 +42,15 @@
}} }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<button type="submit" class="btn btn-success btn-trigger ">{% trans "Validate" %}</button> <button type="submit" class="btn btn-success btn-trigger ">
{% trans "Validate" %}
</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div><!-- /row --> </div>
</div> </div>
{% endblock %} {% endblock %}

46
templates/web/login/common/macros.html.twig
View File

@@ -9,7 +9,7 @@
%} %}
{% set attributes = custom_attributes|default({})|merge({ {% 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, 'ng-model' : input_name,
'force-model-update' : '' 'force-model-update' : ''
}) })
@@ -19,7 +19,9 @@
<table class="input-table" ng-class="getInputClass('{{ input_name }}')"> <table class="input-table" ng-class="getInputClass('{{ input_name }}')">
<tr> <tr>
<td class="icon"><i class="{{ icon_name|default('icon-angle-right') }} icon-white"></i></td> <td class="icon">
<i class="{{ icon_name|default('icon-angle-right') }} icon-white"></i>
</td>
<td class="input"> <td class="input">
{{ form_widget(field, { 'attr': attributes })}} {{ form_widget(field, { 'attr': attributes })}}
</td> </td>
@@ -67,10 +69,18 @@
{% macro providerList() %} {% macro providerList() %}
<ul class="unstyled inline provider-list"> <ul class="unstyled inline provider-list">
<li><a href="#"><img src="/skins/login/img/facebook.png" /></a></li> <li>
<li><a href="#"><img src="/skins/login/img/twitter.png" /></a></li> <a href="#"><img src="/skins/login/img/facebook.png" /></a>
<li><a href="#"><img src="/skins/login/img/google.png" /></a></li> </li>
<li><a href="#"><img src="/skins/login/img/linkedin.png" /></a></li> <li>
<a href="#"><img src="/skins/login/img/twitter.png" /></a>
</li>
<li
><a href="#"><img src="/skins/login/img/google.png" /></a>
</li>
<li>
<a href="#"><img src="/skins/login/img/linkedin.png" /></a>
</li>
</ul> </ul>
{% endmacro %} {% endmacro %}
@@ -93,7 +103,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
<span class="visible-phone text-error help-block help-block-error"> <span class="visible-phone text-error help-block help-block-error">
{% if errors|keys|length >= 1 %} {% if errors|keys|length >= 1 %}
@@ -115,21 +125,31 @@
</td> </td>
<td> <td>
<ul class="unstyled"> <ul class="unstyled">
<li class="pseudo one-line"><b>{{ full_name }}</b></li> <li class="pseudo one-line">
<li class="email one-line">{{ email }}</li> <b>{{ full_name }}</b>
</li>
<li class="email one-line">
{{ email }}
</li>
</ul> </ul>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
{% endmacro %} {% endmacro %}
{% macro phraseanetBadge(full_name, email, company) %} {% macro phraseanetBadge(full_name, email, company) %}
<div class="authentication-user-pres-phraseanet well"> <div class="authentication-user-pres-phraseanet well">
<ul class="unstyled"> <ul class="unstyled">
<li class="one-line"><i class="icon-user"></i>{{ full_name }}</li> <li class="one-line">
<li class="one-line"><i class="icon-envelope"></i>{{ email }}</li> <i class="icon-user"></i>{{ full_name }}
<li class="one-line"><i class="icon-briefcase"></i>{{ company }}</li> </li>
<li class="one-line">
<i class="icon-envelope"></i>{{ email }}
</li>
<li class="one-line">
<i class="icon-briefcase"></i>{{ company }}
</li>
</ul> </ul>
</div> </div>
{% endmacro %} {% endmacro %}

41
templates/web/login/forgot-password.html.twig
View File

@@ -10,34 +10,39 @@
<div class="well-large sidebar-block last-child"> <div class="well-large sidebar-block last-child">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-title">{% trans "Forgot your password?" %}</div> <div class="text-title">
{% trans "Forgot your password?" %}
</div>
<div class="sidebar-hint"> <div class="sidebar-hint">
{% trans "Enter your e-mail address to retrieve your password" %} {% trans "Enter your e-mail address to retrieve your password" %}
</div> </div>
</div> </div>
</div><!-- /row --> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<form <form
ng-controller="forgottenPasswordFormCtrl" ng-controller="forgottenPasswordFormCtrl"
novalidate novalidate
name="{{ form.vars.name }}" name="{{ form.vars.name }}"
ng-submit="submit();" ng-submit="submit();"
action="{{ path("submit_login_forgot_password") }}" action="{{ path("submit_login_forgot_password") }}"
method="POST" method="POST"
check-form-submission> check-form-submission
<div class="row-fluid"> >
<div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} {{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<button id="submit-form-login" type="submit" class="btn btn-success btn-trigger">{% trans "Send" %}</button> <button id="submit-form-login" type="submit" class="btn btn-success btn-trigger">
{% trans "Send" %}
</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div><!-- /row --> </div>
</div>
{% endblock %} {% endblock %}

7
templates/web/login/include/language-block.html.twig
View File

@@ -2,11 +2,14 @@
<div id="authentication-sidebar-language" class="text-right well-small"> <div id="authentication-sidebar-language" class="text-right well-small">
<span class="language"><b>{% trans "language" %}</b></span> <span class="language"><b>{% trans "language" %}</b></span>
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown">{{ attribute(languages, app['locale']) }}<span class="caret"></span></button> <button class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown">
En
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
{% for code, language in languages if code != app['locale'] %} {% for code, language in languages if code != app['locale'] %}
<li><a href="#" data-country-code="{{ code }}">{{ language }}</a></li> <li><a href="#" data-country-code="{{ code }}">{{ language }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div> </div>

42
templates/web/login/include/main-content.html.twig
View File

@@ -1 +1,43 @@
{% import "login/common/macros.html.twig" as auth_macro %} {% import "login/common/macros.html.twig" as auth_macro %}
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>
a <br/>

51
templates/web/login/index.html.twig
View File

@@ -26,73 +26,72 @@
<div class="well-large sidebar-block"> <div class="well-large sidebar-block">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 authentication-sidebar-title"> <div class="span12 authentication-sidebar-title">
<div class="text-title">{% trans "Connexion" %}</div> <div class="text-title">
{% trans "Connexion" %}
</div>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.alert() }} {{ auth_macro.alert() }}
<form
<form
ng-controller="LoginFormController" ng-controller="LoginFormController"
novalidate novalidate
name="{{ form.vars.name }}" name="{{ form.vars.name }}"
ng-submit="submit();" ng-submit="submit();"
method="POST" method="POST"
action="{{ path("login_authenticate") }}" action="{{ path("login_authenticate") }}"
check-form-submission> check-form-submission
>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} {{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }} {{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div> </div>
</div> </div>
<div class="text-right">
<div class="text-right"> <a class="forget-password-link" href="{{ path("login_forgot_password") }}">
<a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a> {% trans "Forgot password?" %}
</div> </a>
</div>
{% if recaptcha_display %} {% if recaptcha_display %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ macro.captcha(recaptcha) }} {{ macro.captcha(recaptcha) }}
</div> </div>
</div>
{% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Connexion" %}</button>
</div> </div>
</div> {% endif %}
<div class="row-fluid">
<div class="row-fluid"> <div class="span12">
<button type="submit" class="btn btn-success btn-trigger">
{% trans "Connexion" %}</button>
</div>
</div>
<div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.checkboxInput("remember-me","Remember me"|trans,"remember-me") }} {{ auth_macro.checkboxInput("remember-me","Remember me"|trans,"remember-me") }}
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div><!-- /row --> </div>
</div><!-- /sidebar block --> </div><!-- /sidebar block -->
<div class="well-large sidebar-block {% if not login.register_enabled(app) %}last-child{% endif %}"> <div class="well-large sidebar-block {% if not login.register_enabled(app) %}last-child{% endif %}">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 text-center"> <div class="span12 text-center">
{% trans "Or login with" %} {% trans "Or login with" %}
</div> </div>
</div><!-- /row --> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 text-center"> <div class="span12 text-center">
{{ auth_macro.providerList() }} {{ auth_macro.providerList() }}
</div> </div>
</div><!-- /row --> </div>
</div><!-- /sidebar block --> </div><!-- /sidebar block -->
{% include "login/include/register-link-block.html.twig" with {"login" : login, "last_item" : login.register_enabled(app)} %} {% include "login/include/register-link-block.html.twig" with {"login" : login, "last_item" : login.register_enabled(app)} %}

80
templates/web/login/layout/base-layout.html.twig
View File

@@ -79,45 +79,53 @@
<!--[if lt IE 7]> <!--[if lt IE 7]>
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p> <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<![endif]--> <![endif]-->
<div class="container"> <div class="container full-height">
{% block scaffholding %} {% block scaffholding %}
{% endblock %} {% endblock %}
<div class="row-fluid"> {% block footer_scaffholding %}
<div class="span12"> <div class="row-fluid">
<div class="footer well-small"> <div class="span12">
{% block footer %} <div class="footer well-small">
<div class="row-fluid"> {% block footer %}
<div class="span9" > <div class="row-fluid">
{% block footer_content %} <div class="span9" >
<div class="footer-block"> {% block footer_content %}
<ul class="inline footer-list unstyled"> <div class="footer-block">
<li class="item-first" > <ul class="inline footer-list unstyled">
<a href="{{ path("homepage") }}">{% trans "Home" %}</a> <li class="item-first" >
</li> <a href="{{ path("homepage") }}">{% trans "Home" %}</a>
<li> </li>
<a href="#">{% trans "Help" %}</a> <li>
</li> <a href="#">{% trans "Help" %}</a>
{% if login.get_cgus(app) is not empty %} </li>
<li> {% if login.get_cgus(app) is not empty %}
<a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a> <li>
</li> {% block tou_link %}
{% endif %} <a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a>
<li>&copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</li> {% endblock tou_link %}
</ul> </li>
</div> {% endif %}
{% endblock footer_content %} <li>
</div> {% block copyright %}
<div class="span3"> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}
<div class="footer-block text-right"> {% endblock copyright %}
{% block footer_logo %}Phraseanet{% endblock footer_logo %} </li>
</div> </ul>
</div> </div>
</div> {% endblock footer_content %}
{% endblock footer %} </div>
</div> <div class="span3">
</div><!--/span--> <div class="footer-block text-right">
</div><!--/row--> {% block footer_logo %}Phraseanet{% endblock footer_logo %}
</div>
</div>
</div>
{% endblock footer %}
</div>
</div>
</div>
{% endblock footer_scaffholding %}
</div><!--/.fluid-container--> </div><!--/.fluid-container-->
{% include 'common/analytics.html.twig' %} {% include 'common/analytics.html.twig' %}
</body> </body>

4
templates/web/login/layout/content-only-layout.html.twig
View File

@@ -8,6 +8,6 @@
{% endblock %} {% endblock %}
</div> </div>
</div><!--/span--> </div>
</div><!--/row--> </div>
{% endblock %} {% endblock %}

4
templates/web/login/layout/sidebar-layout.html.twig
View File

@@ -38,7 +38,7 @@
</div> </div>
</div> </div>
</div> </div>
</div><!--/span--> </div>
<div class="span4 right-content"> <div class="span4 right-content">
<div class="authentication-sidebar"> <div class="authentication-sidebar">
{% include "login/include/language-block.html.twig" %} {% include "login/include/language-block.html.twig" %}
@@ -48,6 +48,6 @@
</div> </div>
</div> </div>
</div> </div>
</div><!--/span--> </div>
</div> </div>
{% endblock %} {% endblock %}

66
templates/web/login/providers/bind.html.twig
View File

@@ -17,7 +17,9 @@
<div class="well-large sidebar-block"> <div class="well-large sidebar-block">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-title">{% trans "Connexion" %}</div> <div class="text-title">
{% trans "Connexion" %}
</div>
<div class="match-hint"> <div class="match-hint">
{% trans %} {% trans %}
Your {{ provider_name }} account matchs a Phraseanet account Your {{ provider_name }} account matchs a Phraseanet account
@@ -31,14 +33,14 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-center well-small"> <div class="text-center well-small">
<img src="/skins/login/img/link.png" style="height:30px;"/> <img src="/skins/login/img/link.png" style="height:30px;"/>
</div> </div>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.phraseanetBadge("Monsieur Grincheux","mr.grincheux@email.com", "Alchemy") }} {{ auth_macro.phraseanetBadge("Monsieur Grincheux","mr.grincheux@email.com", "Alchemy") }}
</div> </div>
</div> </div>
@@ -50,46 +52,44 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.alert() }} {{ auth_macro.alert() }}
<form <form
ng-controller="LoginFormController" ng-controller="LoginFormController"
novalidate novalidate
name="{{ form.vars.name }}" name="{{ form.vars.name }}"
ng-submit="submit();" ng-submit="submit();"
action="{{ path("login_authentication_provider_bind") }}" action="{{ path("login_authentication_provider_bind") }}"
method="POST" method="POST"
check-form-submission check-form-submission
> >
<div class="row-fluid hidden"> <div class="row-fluid hidden">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} {{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }} {{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div> </div>
</div> </div>
<div class="text-right">
<div class="text-right"> <a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a>
<a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a> </div>
</div>
{% if recaptcha_display %} {% if recaptcha_display %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ macro.captcha(recaptcha) }} {{ macro.captcha(recaptcha) }}
</div> </div>
</div>
{% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Connexion" %}</button>
</div> </div>
</div> {% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">
{% trans "Connexion" %}
</button>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>
@@ -97,12 +97,14 @@
<div class="well-large sidebar-block {% if not login.register_enabled(app) %}last-child{% endif %}"> <div class="well-large sidebar-block {% if not login.register_enabled(app) %}last-child{% endif %}">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 text-center"> <div class="span12 text-center">
{% trans "These informations do not match?" %} {% trans "These informations do not match?" %}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 text-center"> <div class="span12 text-center">
<a href="{{ path("homepage") }}" class="btn btn-info btn-trigger">{% trans "Use my Phraseanet account" %}</a> <a href="{{ path("homepage") }}" class="btn btn-info btn-trigger">
{% trans "Use my Phraseanet account" %}
</a>
</div> </div>
</div> </div>
</div> </div>

53
templates/web/login/providers/mapping.html.twig
View File

@@ -17,7 +17,9 @@
<div class="well-large sidebar-block"> <div class="well-large sidebar-block">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-title">{% trans "Connexion" %}</div> <div class="text-title">
{% trans "Connexion" %}
</div>
<div class="match-hint"> <div class="match-hint">
{% trans %} {% trans %}
Your {{ provider_name }} account matchs a Phraseanet account Your {{ provider_name }} account matchs a Phraseanet account
@@ -26,8 +28,8 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ 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") }}
</div> </div>
</div> </div>
</div> </div>
@@ -38,45 +40,44 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.alert() }} {{ auth_macro.alert() }}
<form <form
ng-controller="LoginFormController" ng-controller="LoginFormController"
novalidate novalidate
name="{{ form.vars.name }}" name="{{ form.vars.name }}"
ng-submit="submit();" ng-submit="submit();"
action="{{ path("login_authentication_provider_mapping") }}" action="{{ path("login_authentication_provider_mapping") }}"
method="POST" method="POST"
check-form-submission> check-form-submission
>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} {{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }} {{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div> </div>
</div> </div>
<div class="text-right">
<div class="text-right"> <a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a>
<a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a> </div>
</div>
{% if recaptcha_display %} {% if recaptcha_display %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ macro.captcha(recaptcha) }} {{ macro.captcha(recaptcha) }}
</div> </div>
</div>
{% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Connexion" %}</button>
</div> </div>
</div> {% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">
{% trans "Connexion" %}
</button>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>

34
templates/web/login/register-classic.html.twig
View File

@@ -10,7 +10,9 @@
<div class="well-large sidebar-block last-child"> <div class="well-large sidebar-block last-child">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-title">{% trans "Inscription" %}</div> <div class="text-title">
{% trans "Inscription" %}
</div>
<div class="sidebar-hint"> <div class="sidebar-hint">
{% trans %} {% trans %}
Complete the fields below to register on {{ home_title }}! Complete the fields below to register on {{ home_title }}!
@@ -20,21 +22,21 @@
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<form name="registerForm" class="authentication-sidebar-form"> <form name="registerForm" class="authentication-sidebar-form">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }} {{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }} {{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} {{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div> </div>
@@ -46,25 +48,29 @@
</div> </div>
</div> </div>
<div class="sidebar-hint"> <div class="sidebar-hint">
* {% trans "Mandatory fields" %} * {% trans "Mandatory fields" %}
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{% set label %} {% set label %}
<a href="{{ path("login_cgus") }}">{% trans "I have read the terms of use" %}</a> <a href="{{ path("login_cgus") }}">
{% trans "I have read the terms of use" %}
</a>
{% endset %} {% endset %}
{{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }} {{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Resquest access" %}</button> <button type="submit" class="btn btn-success btn-trigger">
{% trans "Resquest access" %}
</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>

56
templates/web/login/register-provider.html.twig
View File

@@ -11,7 +11,9 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="text-title">{% trans "Completion of your registration" %}</div> <div class="text-title">
{% trans "Completion of your registration" %}
</div>
</div> </div>
</div> </div>
@@ -22,65 +24,67 @@
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 sidebar-hint"> <div class="span12 sidebar-hint">
{% trans "Please complete the information to complete your registration" %} {% trans "Please complete the information to complete your registration" %}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<form class="authentication-sidebar-form"> <form class="authentication-sidebar-form">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }} {{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }}
</div> </div>
</div> </div>
<div class="row-fluid">
<div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }} {{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }}
</div> </div>
</div> </div>
<div class="row-fluid">
<div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }} {{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.company, form.vars.name, 'icon-briefcase') }} {{ auth_macro.fieldInput(form.company, form.vars.name, 'icon-briefcase') }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ auth_macro.fieldInput(form.job, form.vars.name, 'icon-briefcase') }} {{ auth_macro.fieldInput(form.job, form.vars.name, 'icon-briefcase') }}
</div> </div>
</div>
<div class="sidebar-hint">
* {% trans "Mandatory fields" %}
</div> </div>
<div class="row-fluid"> <div class="sidebar-hint">
* {% trans "Mandatory fields" %}
</div>
<div class="row-fluid">
<div class="span12"> <div class="span12">
{% set label %} {% set label %}
<a href="{{ path("login_cgus") }}">{% trans "I have read the terms of use" %}</a> <a href="{{ path("login_cgus") }}">
{% trans "I have read the terms of use" %}
</a>
{% endset %} {% endset %}
{{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }} {{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Resquest access" %}</button> <button type="submit" class="btn btn-success btn-trigger">
{% trans "Resquest access" %}
</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div><!-- /row --> </div>
</div> </div>
{% endblock %} {% endblock %}

23
templates/web/login/register.html.twig
View File

@@ -10,25 +10,32 @@
<div class="well-large sidebar-block"> <div class="well-large sidebar-block">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 authentication-sidebar-title"> <div class="span12 authentication-sidebar-title">
<div class="text-title">{% trans "Inscription" %}</div> <div class="text-title">
{% trans "Inscription" %}
</div>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<a href="{{ path("login_register_classic") }}" class="btn btn-success btn-trigger"> <a href="{{ path("login_register_classic") }}" class="btn btn-success btn-trigger">
<span class="pull-left">{% trans "Create an account manually" %}</span> <span class="pull-left">
<span class="pull-right"><i class="icon-arrow-right icon-white"></i></span> {% trans "Create an account manually" %}
</a> </span>
</div> <span class="pull-right">
<i class="icon-arrow-right icon-white"></i>
</span>
</a>
</div>
</div> </div>
</div> </div>
<div class="well-large sidebar-block last-child"> <div class="well-large sidebar-block last-child">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 text-center"> <div class="span12 text-center">
{% trans "Or login with" %} {% trans "Or login with" %}
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12 text-center"> <div class="span12 text-center">
{{ auth_macro.providerList() }} {{ auth_macro.providerList() }}
</div> </div>