mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Use path() method to genrate url in view && clean JS code
Fix terms of use paths
This commit is contained in:
Nicolas Le Goff
committed by
Romain Neutron
Romain Neutron
parent
10f8569dde
commit
099dfc311d
@@ -1,13 +1,13 @@
|
||||
{% extends 'account/base.html.twig' %}
|
||||
{% extends "account/base.html.twig" %}
|
||||
|
||||
{% block title %}
|
||||
{% trans 'Granted bases' %}
|
||||
{% trans "Granted bases" %}
|
||||
{% endblock %}
|
||||
|
||||
{% set selected = "access" %}
|
||||
|
||||
{% block content %}
|
||||
<form name="updatingDemand" id="updatingDemand" action="/account/" method="post">
|
||||
<form name="updatingDemand" id="updatingDemand" action="{{ path("submit_update_account") }}" method="post">
|
||||
<table style="table-layout: fixed; width:100%">
|
||||
<tr>
|
||||
<td style="width: 180px; text-align: right"> </td>
|
||||
@@ -15,21 +15,21 @@
|
||||
<td style="width: 180px;"> </td>
|
||||
</tr>
|
||||
{% for sbasId, baseInsc in inscriptions %}
|
||||
{% if baseInsc['CollsRegistered'] or baseInsc['CollsRefuse'] or baseInsc['CollsWait'] or baseInsc['CollsIntime'] or baseInsc['CollsOuttime'] or baseInsc['CollsNonactif'] or baseInsc['CollsCGU'] or baseInsc['Colls'] %}
|
||||
{% if baseInsc["CollsRegistered"] or baseInsc["CollsRefuse"] or baseInsc["CollsWait"] or baseInsc["CollsIntime"] or baseInsc["CollsOuttime"] or baseInsc["CollsNonactif"] or baseInsc["CollsCGU"] or baseInsc["Colls"] %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;"><h3>{{ sbasId | sbas_names(app) }}</h3></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{% if baseInsc['CollsRegistered'] is not none %}
|
||||
{% for base in baseInsc['CollsRegistered']%}
|
||||
{% if baseInsc["CollsRegistered"] is not none %}
|
||||
{% for base in baseInsc["CollsRegistered"]%}
|
||||
{% for collId, isTrue in base %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align:center;">
|
||||
{% trans 'login::register: acces authorise sur la collection ' %}{{ sbasId |sbas_names(app) }}
|
||||
{% if isTrue | trim != '' %}
|
||||
<a class="inscriptlink" href="/prod/TOU/?to_display[]={{sbasId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
|
||||
{% trans "login::register: acces authorise sur la collection " %}{{ sbasId |sbas_names(app) }}
|
||||
{% if isTrue | trim != "" %}
|
||||
<a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -41,14 +41,14 @@
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{% if baseInsc['CollsRefuse'] %}
|
||||
{% for collId, isTrue in baseInsc['CollsRefuse'] %}
|
||||
{% if baseInsc["CollsRefuse"] %}
|
||||
{% for collId, isTrue in baseInsc["CollsRefuse"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">
|
||||
<span style="color: red;">{% trans 'login::register: acces refuse sur la collection ' %}{{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue | trim != '' %}
|
||||
<a class="inscriptlink" href="/prod/TOU/?to_display[]={{sbasId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
|
||||
<span style="color: red;">{% trans "login::register: acces refuse sur la collection " %}{{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue | trim != "" %}
|
||||
<a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -59,14 +59,14 @@
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
{% if baseInsc['CollsWait'] %}
|
||||
{% for collId, isTrue in baseInsc['CollsWait'] %}
|
||||
{% if baseInsc["CollsWait"] %}
|
||||
{% for collId, isTrue in baseInsc["CollsWait"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">
|
||||
<span style="color: orange;">{% trans 'login::register: en attente d\'acces sur' %} {{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue | trim != '' %}
|
||||
<a class="inscriptlink" href="/prod/TOU/?to_display[]={{sbasId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
|
||||
<span style="color: orange;">{% trans "login::register: en attente d\'acces sur" %} {{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue | trim != "" %}
|
||||
<a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -74,14 +74,14 @@
|
||||
<tr style="height: 5px;"><td></td></tr>
|
||||
{% endif %}
|
||||
|
||||
{% if baseInsc['CollsIntime'] %}
|
||||
{% for collId, isTrue in baseInsc['CollsIntime'] %}
|
||||
{% if baseInsc["CollsIntime"] %}
|
||||
{% for collId, isTrue in baseInsc["CollsIntime"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">
|
||||
<span>{% trans 'login::register: acces temporaire sur' %} {{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue |trim != '' %}
|
||||
<a class="inscriptlink" href="/prod/TOU/?to_display[]={{sbasId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
|
||||
<span>{% trans "login::register: acces temporaire sur" %} {{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue |trim != "" %}
|
||||
<a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -89,14 +89,14 @@
|
||||
<tr style="height: 5px;"><td></td></tr>
|
||||
{% endif %}
|
||||
|
||||
{% if baseInsc['CollsOuttime'] %}
|
||||
{% for collId, isTrue in baseInsc['CollsOuttime'] %}
|
||||
{% if baseInsc["CollsOuttime"] %}
|
||||
{% for collId, isTrue in baseInsc["CollsOuttime"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">
|
||||
<span style="color:red;">{% trans 'login::register: acces temporaire termine sur ' %}{{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue |trim != '' %}
|
||||
<a class="inscriptlink" href="/prod/TOU/?to_display[]={{sbasId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
|
||||
<span style="color:red;">{% trans "login::register: acces temporaire termine sur " %}{{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue |trim != "" %}
|
||||
<a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -104,14 +104,14 @@
|
||||
<tr style="height: 5px;"><td></td></tr>
|
||||
{% endif %}
|
||||
|
||||
{% if baseInsc['CollsNonactif'] %}
|
||||
{% for collId, isTrue in baseInsc['CollsNonactif'] %}
|
||||
{% if baseInsc["CollsNonactif"] %}
|
||||
{% for collId, isTrue in baseInsc["CollsNonactif"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">
|
||||
<span style="color:red;">{% trans 'login::register: acces supendu sur' %} {{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue |trim != '' %}
|
||||
<a class="inscriptlink" href="/prod/TOU/?to_display[]={{sbasId}}">{% trans 'login::register::CGU: lire les CGU' %}</a>
|
||||
<span style="color:red;">{% trans "login::register: acces supendu sur" %} {{ sbasId |sbas_names(app) }}</span>
|
||||
{% if isTrue |trim != "" %}
|
||||
<a class="inscriptlink" href="{{ path('get_tou', {'to_display[]' : sbasId}) }}">{% trans "login::register::CGU: lire les CGU" %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -119,48 +119,48 @@
|
||||
<tr style="height: 5px;"><td></td></tr>
|
||||
{% endif %}
|
||||
|
||||
{% if (baseInsc['CollsCGU'] or baseInsc['Colls']) and baseInsc['inscript'] %}
|
||||
{% if baseInsc['Colls'] %}
|
||||
{% if baseInsc['CGU'] %}
|
||||
{% if (baseInsc["CollsCGU"] or baseInsc["Colls"]) and baseInsc["inscript"] %}
|
||||
{% if baseInsc["Colls"] %}
|
||||
{% if baseInsc["CGU"] %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">{% trans 'login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes' %}</td>
|
||||
<td colspan="3" style="text-align: center;">{% trans "login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes" %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;"><div style="width: 90%; height: 120px; text-align: left; overflow: auto;">{{ baseInsc['CGU'] }}</div></td>
|
||||
<td colspan="3" style="text-align: center;"><div style="width: 90%; height: 120px; text-align: left; overflow: auto;">{{ baseInsc["CGU"] }}</div></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% for collId, collName in baseInsc['Colls'] %}
|
||||
{% for collId, collName in baseInsc["Colls"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td style="text-align: right;">{{ collName }}</td>
|
||||
<td></td>
|
||||
<td class="TD_R" style="width: 200px;">
|
||||
<input style="width: 15px;" class="checkbox" type="checkbox" name="demand[]" value="{{ base_id }}" />
|
||||
<span>{% trans 'login::register: Faire une demande d\'acces' %}</span>
|
||||
<span>{% trans "login::register: Faire une demande d\'acces" %}</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if baseInsc['CollsCGU'] %}
|
||||
{% for collId, collDesc in baseInsc['CollsCGU'] %}
|
||||
{% if baseInsc["CollsCGU"] %}
|
||||
{% for collId, collDesc in baseInsc["CollsCGU"] %}
|
||||
{% set base_id = sbasId |base_from_coll(collId, app) %}
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;"><hr style="width: 80%"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">{% trans 'login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes' %}</td>
|
||||
<td colspan="3" style="text-align: center;">{% trans "login::register: L\'acces aux bases ci-dessous implique l\'acceptation des Conditions Generales d\'Utilisation (CGU) suivantes" %}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" style="text-align: center;">
|
||||
<div style="width: 90%; height: 120px; text-align: left; overflow: auto;">{{ collDesc['CGU'] }}</div>
|
||||
<div style="width: 90%; height: 120px; text-align: left; overflow: auto;">{{ collDesc["CGU"] }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: right;">{{ collDesc['name'] }}</td>
|
||||
<td style="text-align: right;">{{ collDesc["name"] }}</td>
|
||||
<td></td>
|
||||
<td class="TD_R" style="width: 200px;">
|
||||
<input style="width: 15px;" class="checkbox" type="checkbox" name="demand[]" value="{{ base_id }}" />
|
||||
<span>{% trans 'login::register: Faire une demande d\'acces' %}</span>
|
||||
<span>{% trans "login::register: Faire une demande d\'acces" %}</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
@@ -169,7 +169,7 @@
|
||||
{% endfor %}
|
||||
</table>
|
||||
<div class="form-actions">
|
||||
<input type="submit" class="btn btn-primary" value="{% trans 'boutton::valider' %}">
|
||||
<input type="submit" class="btn btn-info" value="{% trans "boutton::valider" %}">
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user