diff --git a/resources/www/common/images/icons/basket_push.png b/resources/www/common/images/icons/basket_push.png index 97e038241c..7137a58251 100644 Binary files a/resources/www/common/images/icons/basket_push.png and b/resources/www/common/images/icons/basket_push.png differ diff --git a/resources/www/common/images/icons/basket_push_unread.png b/resources/www/common/images/icons/basket_push_unread.png index b09552bcf7..a55080d4ba 100644 Binary files a/resources/www/common/images/icons/basket_push_unread.png and b/resources/www/common/images/icons/basket_push_unread.png differ diff --git a/resources/www/common/images/icons/basket_validation.png b/resources/www/common/images/icons/basket_validation.png index cddaac1db1..dbf618043a 100644 Binary files a/resources/www/common/images/icons/basket_validation.png and b/resources/www/common/images/icons/basket_validation.png differ diff --git a/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css b/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css index 9869ae9201..fad297b2f2 100755 --- a/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css +++ b/resources/www/common/styles/fonts/PhraseanetIcomoon/style.css @@ -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 */ font-family: 'icomoon' !important; speak: none; diff --git a/templates/web/prod/WorkZone/Macros.html.twig b/templates/web/prod/WorkZone/Macros.html.twig index 3d16fabf1f..926c6cf660 100644 --- a/templates/web/prod/WorkZone/Macros.html.twig +++ b/templates/web/prod/WorkZone/Macros.html.twig @@ -381,7 +381,10 @@ {% for choice in basket_element.getValidationDatas() %} {% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or choice.getParticipant().getUser() == app.getAuthenticatedUser() %} - {{ choice.getParticipant().getUser().getDisplayName() }} + + {{ choice.getParticipant().getUser().getDisplayName() }} + + {% if choice.getParticipant().getCanAgree() %} {% if choice.getAgreement() == true %}