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 tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-12-05 14:21:50 +01:00
parent 49744c5e2f
commit b341495c88
122 changed files with 963 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/admin/collection/collection.html.twig
View File

@@ -44,7 +44,7 @@
<li>
<label for="adm_{{ user.getId() }}" class="checkbox">
<input name="admins[]" type="checkbox" value="{{ user.getId() }}" id="adm_{{ user.getId() }}" checked />
{{ user.getDisplayName() }}
{{ user.getDisplayName(app['translator']) }}
</label>
</li>
{% endfor %}

6
templates/web/admin/connected-users.html.twig
View File

@@ -10,7 +10,7 @@
<td colspan="2" style="height: 10px;"></td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur nom' | trans }} : </strong>{{ user.getDisplayName() }}</td>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur nom' | trans }} : </strong>{{ user.getDisplayName(app['translator']) }}</td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur societe' | trans }} : </strong>{{ user.getCompany() }}</td>
@@ -102,9 +102,9 @@
<tr title="{{ _self.tooltip_connected_users(row) | e }}" class="{% if loop.index is odd %}odd{% else %}even{% endif %} usrTips" id="TREXP_{{ row.getId()}}">
{% if row.getId() == app['session'].get('session_id') %}
<td style="color:#ff0000"><i>{{ row.getUser().getDisplayName() }}</i></td>
<td style="color:#ff0000"><i>{{ row.getUser().getDisplayName(app['translator']) }}</i></td>
{% else %}
<td>{{ row.getUser().getDisplayName() }}</td>
<td>{{ row.getUser().getDisplayName(app['translator']) }}</td>
{% endif %}
<td>

8
templates/web/admin/dashboard.html.twig
View File

@@ -98,11 +98,11 @@
<fieldset>
<legend>{{ 'setup:: administrateurs de l\'application' | trans }}</legend>
<ul class="unstyled">
{% for usr_id, usr_login in admins %}
{% for user in admins %}
<li>
<label class="checkbox" for="adm_{{ usr_id }}">
<input type="checkbox" id="adm_{{ usr_id }}" name="admins[]" value="{{ usr_id }}" checked />
{{ usr_login }}
<label class="checkbox" for="adm_{{ user.getId() }}">
<input type="checkbox" id="adm_{{ user.getId() }}" name="admins[]" value="{{ user.getId() }}" checked />
{{ user.getLogin() }}
</label>
</li>
{% endfor %}

4
templates/web/admin/editusers.html.twig
View File

@@ -118,7 +118,7 @@
{{ 'Reglages:: reglages d inscitpition automatisee' | trans }}
{% endif %}
{% else %}
{% set display_name = main_user.getDisplayName() %}
{% set display_name = main_user.getDisplayName(app['translator']) %}
{% trans with {'%display_name%' : display_name} %}Edition des droits de %display_name%{% endtrans %}
{% endif %}
{% else %}
@@ -131,7 +131,7 @@
<select name="template">
<option value="">{{ 'boutton::choisir' | trans }}</option>
{% for template in templates %}
<option value="{{ template.getId() }}">{{ template.getDisplayName() }}</option>
<option value="{{ template.getId() }}">{{ template.getDisplayName(app['translator']) }}</option>
{% endfor %}
</select>
<button class="btn" type='button' id='reset_rights'>{{ 'Delete all users rights' | trans }}</button>

2
templates/web/admin/publications/fiche.html.twig
View File

@@ -143,7 +143,7 @@
{{ publisher.getUser().getId() }}
</td>
<td valign="center" align="left">
{{ publisher.getUser().getDisplayName() }}
{{ publisher.getUser().getDisplayName(app['translator']) }}
</td>
<td valign="center" align="left">
{{ publisher.getUser().getEmail() }}

4
templates/web/admin/users.html.twig
View File

@@ -60,7 +60,7 @@
<select name="template_chooser" class="input-medium">
<option value="">{{ 'boutton::choisir' | trans }}</option>
{% for template in templates %}
<option value="{{ template.getId() }}">{{ template.getDisplayName() }}</option>
<option value="{{ template.getId() }}">{{ template.getDisplayName(app['translator']) }}</option>
{% endfor %}
</select>
<button type="submit" class="btn">{{ 'boutton::appliquer' | trans }}</button>
@@ -149,7 +149,7 @@
</td>
{% if usr.getLastModel() is not none %}
<td>
{{ usr.getLastModel().getDisplayName()}}
{{ usr.getLastModel().getDisplayName(app['translator'])}}
</td>
{% endif %}
<td>