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

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

@@ -10,9 +10,11 @@
<div class="well-large sidebar-block last-child">
<div class="row-fluid">
<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 class="row-fluid">
<div class="span12">
<form
@@ -22,8 +24,8 @@
ng-submit="submit();"
method="POST"
action="{{ path('submit_login_new_password') }}"
check-form-submission>
check-form-submission
>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
@@ -42,11 +44,13 @@
</div>
<div class="row-fluid">
<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>
</form>
</div>
</div><!-- /row -->
</div>
</div>
{% endblock %}

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

@@ -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 @@
<table class="input-table" ng-class="getInputClass('{{ input_name }}')">
<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">
{{ form_widget(field, { 'attr': attributes })}}
</td>
@@ -67,10 +69,18 @@
{% macro providerList() %}
<ul class="unstyled inline provider-list">
<li><a href="#"><img src="/skins/login/img/facebook.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>
<li>
<a href="#"><img src="/skins/login/img/facebook.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>
{% endmacro %}
@@ -115,8 +125,12 @@
</td>
<td>
<ul class="unstyled">
<li class="pseudo one-line"><b>{{ full_name }}</b></li>
<li class="email one-line">{{ email }}</li>
<li class="pseudo one-line">
<b>{{ full_name }}</b>
</li>
<li class="email one-line">
{{ email }}
</li>
</ul>
</td>
</tr>
@@ -127,9 +141,15 @@
{% macro phraseanetBadge(full_name, email, company) %}
<div class="authentication-user-pres-phraseanet well">
<ul class="unstyled">
<li class="one-line"><i class="icon-user"></i>{{ full_name }}</li>
<li class="one-line"><i class="icon-envelope"></i>{{ email }}</li>
<li class="one-line"><i class="icon-briefcase"></i>{{ company }}</li>
<li class="one-line">
<i class="icon-user"></i>{{ full_name }}
</li>
<li class="one-line">
<i class="icon-envelope"></i>{{ email }}
</li>
<li class="one-line">
<i class="icon-briefcase"></i>{{ company }}
</li>
</ul>
</div>
{% endmacro %}

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

@@ -10,12 +10,14 @@
<div class="well-large sidebar-block last-child">
<div class="row-fluid">
<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">
{% trans "Enter your e-mail address to retrieve your password" %}
</div>
</div>
</div><!-- /row -->
</div>
<div class="row-fluid">
<div class="span12">
<form
@@ -25,19 +27,22 @@
ng-submit="submit();"
action="{{ path("submit_login_forgot_password") }}"
method="POST"
check-form-submission>
check-form-submission
>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div>
</div>
</div>
<div class="row-fluid">
<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>
</form>
</div>
</div><!-- /row -->
</div>
</div>
{% endblock %}

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

@@ -2,7 +2,10 @@
<div id="authentication-sidebar-language" class="text-right well-small">
<span class="language"><b>{% trans "language" %}</b></span>
<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">
{% for code, language in languages if code != app['locale'] %}
<li><a href="#" data-country-code="{{ code }}">{{ language }}</a></li>

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

@@ -1 +1,43 @@
{% 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/>

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

@@ -26,14 +26,15 @@
<div class="well-large sidebar-block">
<div class="row-fluid">
<div class="span12 authentication-sidebar-title">
<div class="text-title">{% trans "Connexion" %}</div>
<div class="text-title">
{% trans "Connexion" %}
</div>
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.alert() }}
<form
ng-controller="LoginFormController"
novalidate
@@ -41,24 +42,23 @@
ng-submit="submit();"
method="POST"
action="{{ path("login_authenticate") }}"
check-form-submission>
check-form-submission
>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div>
</div>
<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>
{% if recaptcha_display %}
<div class="row-fluid">
<div class="span12">
@@ -66,13 +66,12 @@
</div>
</div>
{% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Connexion" %}</button>
<button type="submit" class="btn btn-success btn-trigger">
{% trans "Connexion" %}</button>
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.checkboxInput("remember-me","Remember me"|trans,"remember-me") }}
@@ -80,19 +79,19 @@
</div>
</form>
</div>
</div><!-- /row -->
</div>
</div><!-- /sidebar block -->
<div class="well-large sidebar-block {% if not login.register_enabled(app) %}last-child{% endif %}">
<div class="row-fluid">
<div class="span12 text-center">
{% trans "Or login with" %}
</div>
</div><!-- /row -->
</div>
<div class="row-fluid">
<div class="span12 text-center">
{{ auth_macro.providerList() }}
</div>
</div><!-- /row -->
</div>
</div><!-- /sidebar block -->
{% include "login/include/register-link-block.html.twig" with {"login" : login, "last_item" : login.register_enabled(app)} %}

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

@@ -79,10 +79,11 @@
<!--[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>
<![endif]-->
<div class="container">
<div class="container full-height">
{% block scaffholding %}
{% endblock %}
{% block footer_scaffholding %}
<div class="row-fluid">
<div class="span12">
<div class="footer well-small">
@@ -100,10 +101,16 @@
</li>
{% if login.get_cgus(app) is not empty %}
<li>
{% block tou_link %}
<a href="{{ path("login_cgus") }}">{% trans "Terms of use" %}</a>
{% endblock tou_link %}
</li>
{% endif %}
<li>&copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</li>
<li>
{% block copyright %}
&copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}
{% endblock copyright %}
</li>
</ul>
</div>
{% endblock footer_content %}
@@ -116,8 +123,9 @@
</div>
{% endblock footer %}
</div>
</div><!--/span-->
</div><!--/row-->
</div>
</div>
{% endblock footer_scaffholding %}
</div><!--/.fluid-container-->
{% include 'common/analytics.html.twig' %}
</body>

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

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

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

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

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

@@ -17,7 +17,9 @@
<div class="well-large sidebar-block">
<div class="row-fluid">
<div class="span12">
<div class="text-title">{% trans "Connexion" %}</div>
<div class="text-title">
{% trans "Connexion" %}
</div>
<div class="match-hint">
{% trans %}
Your {{ provider_name }} account matchs a Phraseanet account
@@ -66,17 +68,14 @@
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div>
</div>
<div class="text-right">
<a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a>
</div>
{% if recaptcha_display %}
<div class="row-fluid">
<div class="span12">
@@ -84,10 +83,11 @@
</div>
</div>
{% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Connexion" %}</button>
<button type="submit" class="btn btn-success btn-trigger">
{% trans "Connexion" %}
</button>
</div>
</div>
</form>
@@ -102,7 +102,9 @@
</div>
<div class="row-fluid">
<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>

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

@@ -17,7 +17,9 @@
<div class="well-large sidebar-block">
<div class="row-fluid">
<div class="span12">
<div class="text-title">{% trans "Connexion" %}</div>
<div class="text-title">
{% trans "Connexion" %}
</div>
<div class="match-hint">
{% trans %}
Your {{ provider_name }} account matchs a Phraseanet account
@@ -47,23 +49,21 @@
ng-submit="submit();"
action="{{ path("login_authentication_provider_mapping") }}"
method="POST"
check-form-submission>
check-form-submission
>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, form.vars.name, 'icon-lock') }}
</div>
</div>
<div class="text-right">
<a class="forget-password-link" href="{{ path("login_forgot_password") }}">{% trans "Forgot password?" %}</a>
</div>
{% if recaptcha_display %}
<div class="row-fluid">
<div class="span12">
@@ -71,10 +71,11 @@
</div>
</div>
{% endif %}
<div class="row-fluid">
<div class="span12">
<button type="submit" class="btn btn-success btn-trigger">{% trans "Connexion" %}</button>
<button type="submit" class="btn btn-success btn-trigger">
{% trans "Connexion" %}
</button>
</div>
</div>
</form>

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

@@ -10,7 +10,9 @@
<div class="well-large sidebar-block last-child">
<div class="row-fluid">
<div class="span12">
<div class="text-title">{% trans "Inscription" %}</div>
<div class="text-title">
{% trans "Inscription" %}
</div>
<div class="sidebar-hint">
{% trans %}
Complete the fields below to register on {{ home_title }}!
@@ -53,7 +55,9 @@
<div class="row-fluid">
<div class="span12">
{% 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 %}
{{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }}
@@ -62,7 +66,9 @@
<div class="row-fluid">
<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>
</form>

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

@@ -11,7 +11,9 @@
<div class="row-fluid">
<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>
@@ -35,13 +37,11 @@
{{ auth_macro.fieldInput(form.firstName, form.vars.name, 'icon-user') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.lastName, form.vars.name, 'icon-user') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, form.vars.name, 'icon-envelope') }}
@@ -67,7 +67,9 @@
<div class="row-fluid">
<div class="span12">
{% 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 %}
{{ auth_macro.checkboxInput("terms-of-use",label,"terms_of_use") }}
@@ -76,11 +78,13 @@
<div class="row-fluid">
<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>
</form>
</div>
</div><!-- /row -->
</div>
</div>
{% endblock %}

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

@@ -10,18 +10,25 @@
<div class="well-large sidebar-block">
<div class="row-fluid">
<div class="span12 authentication-sidebar-title">
<div class="text-title">{% trans "Inscription" %}</div>
<div class="text-title">
{% trans "Inscription" %}
</div>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<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-right"><i class="icon-arrow-right icon-white"></i></span>
<span class="pull-left">
{% trans "Create an account manually" %}
</span>
<span class="pull-right">
<i class="icon-arrow-right icon-white"></i>
</span>
</a>
</div>
</div>
</div>
<div class="well-large sidebar-block last-child">
<div class="row-fluid">
<div class="span12 text-center">