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 pull request #3258 from jygaulier/PHRAS-2631_feedback-icon

Browse Source 
PHRAS-2631 #comment merge _basket-feedback-icon
This commit is contained in:
Nicolas Maillat
2019-12-05 17:52:05 +01:00
committed by GitHub
parent 0ad050658f 0967f3c810
commit 80392c6742
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/PushController.php
View File

@@ -193,7 +193,7 @@ class PushController extends Controller
'Validation from %user%', [
'%user%' => $this->getAuthenticatedUser()->getDisplayName(),
]));
$validation_description = $request->request->get('validation_description');
$validation_description = $request->request->get('message');
$participants = $request->request->get('participants');

BIN
resources/www/common/images/icons/basket_feedback_read.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/www/common/images/icons/basket_feedback_unread.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

@@ -16,9 +16,10 @@
<a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
<span>
{% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title=''/>
<img src='/assets/common/images/icons/basket_feedback_unread.png' title=''/>
{% else %}
<img src='/assets/common/images/icons/basket_feedback_read.png' title=''/>
{% endif %}
<img src='/assets/common/images/icons/basket.png' title=''/>
{{basket.getName()|e}}
</span>
</a>
@@ -26,11 +27,9 @@
<table>
<tr>
<td>
<img
title="{{ basket.getDescription() }}"
class="basketTips basket_title"
src="/assets/common/images/icons/valid.png"
/>
<img title="{{ basket.getDescription()|e }}"
class="basket_title"
src="/assets/common/images/icons/valid.png" />
</td>
<td>
<a class="contextMenuTrigger icon-display-grid" href="#"></a>