mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Bootstrap backbone application
This commit is contained in:
@@ -22,19 +22,18 @@
|
|||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.flashes() }}
|
{{ auth_macro.flashes() }}
|
||||||
<form
|
<form
|
||||||
ng-controller="forgottenPasswordFormCtrl"
|
|
||||||
novalidate
|
novalidate
|
||||||
name="forgottenPasswordForm"
|
name="forgottenPasswordForm"
|
||||||
ng-submit="submit();"
|
|
||||||
action="{{ path("login_forgot_password") }}"
|
action="{{ path("login_forgot_password") }}"
|
||||||
method="POST"
|
method="POST"
|
||||||
check-form-submission
|
|
||||||
>
|
>
|
||||||
<div class="row-fluid">
|
{% if form.vars.errors|length > 0 %}
|
||||||
<div class="span12">
|
<div class="row-fluid">
|
||||||
{{ form_errors(form) }}
|
<div class="span12">
|
||||||
|
{{ form_errors(form) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "icon-envelope") }}
|
{{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "icon-envelope") }}
|
||||||
@@ -53,3 +52,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
{{ parent() }}
|
||||||
|
<script type="text/javascript" src="/scripts/apps/login/home/forgotPassword.js"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|||||||
@@ -16,11 +16,6 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block header_javascript %}
|
|
||||||
{{ parent() }}
|
|
||||||
{% include "login/common/templates.html.twig" %}
|
|
||||||
{% endblock header_javascript %}
|
|
||||||
|
|
||||||
{% block sidebar %}
|
{% block sidebar %}
|
||||||
<div class="well-large sidebar-block">
|
<div class="well-large sidebar-block">
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
@@ -52,7 +47,14 @@
|
|||||||
method="POST"
|
method="POST"
|
||||||
action="{{ path("login_authenticate") }}"
|
action="{{ path("login_authenticate") }}"
|
||||||
>
|
>
|
||||||
{{ form_errors(form) }}
|
{% if form.vars.errors|length > 0 %}
|
||||||
|
<div class="row-fluid">
|
||||||
|
<div class="span12">
|
||||||
|
{{ form_errors(form) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope') }}
|
{{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope') }}
|
||||||
@@ -115,3 +117,8 @@
|
|||||||
{% block left_content %}
|
{% block left_content %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
{{ parent() }}
|
||||||
|
<script type="text/javascript" src="/scripts/apps/login/home/login.js"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|||||||
@@ -33,6 +33,9 @@
|
|||||||
{% endblock header_stylesheet %}
|
{% endblock header_stylesheet %}
|
||||||
|
|
||||||
{% block header_javascript %}
|
{% block header_javascript %}
|
||||||
|
{# include backbone templates #}
|
||||||
|
{% include "login/common/templates.html.twig" %}
|
||||||
|
|
||||||
<script type="text/javascript" src="{{ path('minifier', {'g' : 'authentication'}) }}"></script>
|
<script type="text/javascript" src="{{ path('minifier', {'g' : 'authentication'}) }}"></script>
|
||||||
{% endblock header_javascript %}
|
{% endblock header_javascript %}
|
||||||
{% endblock header %}
|
{% endblock header %}
|
||||||
@@ -91,8 +94,6 @@
|
|||||||
</div><!--/.fluid-container-->
|
</div><!--/.fluid-container-->
|
||||||
{% include 'common/analytics.html.twig' %}
|
{% include 'common/analytics.html.twig' %}
|
||||||
|
|
||||||
{% block scripts %}
|
{% block scripts %}{% endblock %}
|
||||||
<script type="text/javascript" src="/include/minify/?f=/assets/requirejs/require.js,/scripts/apps/login/home/main.js"></script>
|
|
||||||
{% endblock %}
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -31,11 +31,14 @@
|
|||||||
method="POST"
|
method="POST"
|
||||||
action="{{ path("login_register_classic") }}"
|
action="{{ path("login_register_classic") }}"
|
||||||
>
|
>
|
||||||
<div class="row-fluid">
|
{% if form.vars.errors|length > 0 %}
|
||||||
<div class="span12">
|
<div class="row-fluid">
|
||||||
{{ form_errors(form) }}
|
<div class="span12">
|
||||||
|
{{ form_errors(form) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
|
{{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
|
||||||
@@ -50,13 +53,7 @@
|
|||||||
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.passwordConfirm, "registerForm", 'icon-lock', {
|
{{ auth_macro.fieldInput(form.passwordConfirm, "registerForm", 'icon-lock') }}
|
||||||
"ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ",
|
|
||||||
"ui-validate-watch" : "'" ~ form.password.vars.name ~ "'"
|
|
||||||
}, {
|
|
||||||
"validate_message" : "Passwords do not match"|trans
|
|
||||||
})
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -85,7 +82,7 @@
|
|||||||
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ form_row(form.collections) }}
|
{{ auth_macro.selectInput(form.collections) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -111,3 +108,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
{{ parent() }}
|
||||||
|
<script type="text/javascript" src="/scripts/apps/login/home/register.js"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|||||||
@@ -32,38 +32,29 @@
|
|||||||
<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">
|
{% if form.vars.errors|length > 0 %}
|
||||||
<div class="span12">
|
<div class="row-fluid">
|
||||||
{{ form_errors(form) }}
|
<div class="span12">
|
||||||
|
{{ form_errors(form) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
<div class="row-fluid">
|
|
||||||
<div class="span12">
|
|
||||||
{{ auth_macro.fieldInput(form.firstName, "registerForm", 'icon-user') }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row-fluid">
|
|
||||||
<div class="span12">
|
|
||||||
{{ auth_macro.fieldInput(form.lastName, "registerForm", 'icon-user') }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
|
{{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row-fluid">
|
{% for field in app['registration.fields'] %}
|
||||||
<div class="span12">
|
{% set name = field['name'] %}
|
||||||
{{ auth_macro.fieldInput(form.company, "registerForm", 'icon-briefcase') }}
|
{% if name in app['registration.optional-fields']|keys %}
|
||||||
</div>
|
<div class="row-fluid">
|
||||||
</div>
|
<div class="span12">
|
||||||
|
{{ auth_macro.fieldInput(attribute(form, name|camelize), "registerForm") }}
|
||||||
<div class="row-fluid">
|
</div>
|
||||||
<div class="span12">
|
</div>
|
||||||
{{ auth_macro.fieldInput(form.job, "registerForm", 'icon-briefcase') }}
|
{% endif %}
|
||||||
</div>
|
{% endfor %}
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="sidebar-hint">
|
<div class="sidebar-hint">
|
||||||
* {% trans "Mandatory fields" %}
|
* {% trans "Mandatory fields" %}
|
||||||
|
|||||||
@@ -19,19 +19,19 @@
|
|||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.flashes() }}
|
{{ auth_macro.flashes() }}
|
||||||
<form
|
<form
|
||||||
ng-controller="passwordRenewFormCtrl"
|
|
||||||
novalidate
|
novalidate
|
||||||
name="passwordRenewForm"
|
name="passwordRenewForm"
|
||||||
ng-submit="submit();"
|
|
||||||
method="POST"
|
method="POST"
|
||||||
action="{{ path('login_renew_password') }}"
|
action="{{ path('login_renew_password') }}"
|
||||||
check-form-submission
|
|
||||||
>
|
>
|
||||||
<div class="row-fluid">
|
{% if form.vars.errors|length > 0 %}
|
||||||
<div class="span12">
|
<div class="row-fluid">
|
||||||
{{ form_errors(form) }}
|
<div class="span12">
|
||||||
|
{{ form_errors(form) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
{% endif %}
|
||||||
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.password, "passwordRenewForm", 'icon-lock') }}
|
{{ auth_macro.fieldInput(form.password, "passwordRenewForm", 'icon-lock') }}
|
||||||
@@ -39,13 +39,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
{{ auth_macro.fieldInput(form.passwordConfirm, "passwordRenewForm", 'icon-lock', {
|
{{ auth_macro.fieldInput(form.passwordConfirm, "passwordRenewForm", 'icon-lock') }}
|
||||||
"ui-validate" : " '$value==" ~ form.password.vars.name ~ "' ",
|
|
||||||
"ui-validate-watch" : "'" ~ form.password.vars.name ~ "'"
|
|
||||||
}, {
|
|
||||||
"validate_message" : "Passwords do not match"|trans
|
|
||||||
})
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{ form_rest(form) }}
|
{{ form_rest(form) }}
|
||||||
@@ -61,3 +55,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block scripts %}
|
||||||
|
{{ parent() }}
|
||||||
|
<script type="text/javascript" src="/scripts/apps/login/home/renewPassword.js"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user