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

Merge branch 'master' into PHRAS-2282_design_of_new_Browser_basket_windows

Browse Source
This commit is contained in:
Nicolas Maillat
2019-09-10 12:37:39 +02:00
committed by GitHub
parent 816225036f bb19ebb39c
commit 3c6f12c5d9
32 changed files with 465 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,7 +512,7 @@
{{ 'admin::compte-utilisateur poste' | trans }}
</td>
<td>
<input type="text" name="function" value="{{main_user.getActivity()}}"/>
<input type="text" name="function" value="{{main_user.getJob()}}"/>
</td>
</tr>
<tr>
@@ -528,7 +528,7 @@
{{ 'admin::compte-utilisateur activite' | trans }}
</td>
<td>
<input type="text" name="activite" value="{{main_user.getJob()}}"/>
<input type="text" name="activite" value="{{main_user.getActivity()}}"/>
</td>
</tr>

2
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -51,7 +51,7 @@
{% if Basket.getPusher() %}
<p>
{% set user_name = '<a href="/user/' ~ Basket.getPusher().get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% set user_name = '<a href="/user/' ~ Basket.getPusher().getId() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).getDisplayName() ~ '</a>' %}
{% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
</p>
{% endif %}