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-2565/prompt-for-provisioning

Browse Source
This commit is contained in:
Nicolas Maillat
2019-06-12 16:22:14 +02:00
committed by GitHub
parent dc44ddb59b 5a466f6bd1
commit 23a9e1385d
5 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/www/common/images/icons/basket_push.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/www/common/images/icons/basket_push_unread.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/basket_validation.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1010 B

After

Width:  |  Height:  |  Size: 1.3 KiB

2
resources/www/common/styles/fonts/PhraseanetIcomoon/style.css
View File

@@ -1,5 +1,5 @@
[class^="icon-"], [class*=" icon-"] { [class^="icon-"].icomoon, [class*=" icon-"].icomoon {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important; font-family: 'icomoon' !important;
speak: none; speak: none;

5
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -381,7 +381,10 @@
{% for choice in basket_element.getValidationDatas() %} {% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app.getAuthenticatedUser() %} {% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app.getAuthenticatedUser() %}
<tr> <tr>
<td> {{ choice.getParticipant().getUser().getDisplayName() }} </td> <td style="position: relative">
<span class="feedback_user_name">{{ choice.getParticipant().getUser().getDisplayName() }}</span>
<span class="line_separator"></span>
</td>
<td> <td>
{% if choice.getParticipant().getCanAgree() %} {% if choice.getParticipant().getCanAgree() %}
{% if choice.getAgreement() == true %} {% if choice.getAgreement() == true %}