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

PHRAS-2961 #comment Add: Prod workzone feedback : ending date #time 3h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-03-04 17:04:01 +04:00
parent f67e4c4b15
commit 2d3147b47b
11 changed files with 793 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/web/prod/Tooltip/Basket.html.twig
View File

@@ -11,11 +11,19 @@
<div style="margin:5px 0;max-height:160px;overflow:hidden;text-overflow:ellipsis;">
{{ basket.getDescription()|nl2br }}
</div>
<div style="margin:5px 0;text-align:right;font-style:italic;position:relative;">
<div style="margin:5px 0;font-style:italic;position:relative;width: 100%">
{% set nb_records = basket.getElements()|length %}
{% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
{% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}
- {{ date }}
<span class="expiredDate" style="width: 40%; display: inline-block">
{% if basket.getValidation() %}
{% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
{{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}
{% endif %}
</span>
<div style="text-align:right;width: 50%;display: inline-block">
{% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}
- {{ date }}
</div>
<hr/>
<div style="position:relative;float:left;width:470px;">
{% for element in basket.getElements() %}

7
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -88,8 +88,12 @@
{% endfor %}
{% endif %}
</div>
{% if basket.getValidation() %}
{% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
<span class="expiredDate" style="float: right; padding: 8px;margin-top: -39px;">
{{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}</span>
{% endif %}
</div>
<div class="basket-content">
{% set basket_length = basket.getElements()|length %}
<div class="alert_datas_changed ui-corner-all">{{ 'Certaines donnees du panier ont change' | trans }} <a class="basket_refresher" href="#">{{ 'rafraichir' | trans }}</a></div>
{% if basket_length == 0 %}
@@ -102,6 +106,7 @@
{% if basket.getValidation() %}
{{ Macros.display_validation(app, basket, ordre) }}
{% else %}
{{ Macros.display_basket(app, basket) }}
{% endif %}

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

@@ -37,10 +37,11 @@
{% set content = WorkZone.getContent(srt) %}
<div id="validations-block" class="validations-block">
{% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::VALIDATIONS')) %}
<div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
id="SSTT_{{basket.getId()}}"
class="basketTips ui-accordion-header ui-state-default
ui-corner-all header SSTT basket {% if not basket.isRead() %}unread{% endif %}
ui-corner-all header SSTT basket {% if not basket.getId() %}unread{% endif %}
{% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
<a class="workzone-menu-title" href="{{ path('prod_baskets_basket', { 'basket' : basket.getId() }) }}">
<span>
@@ -52,6 +53,7 @@
{{basket.getName()|e}}
</span>
</a>
<div class="menu">
<table>
<tr>
@@ -113,6 +115,7 @@
</div>
<div id="all_baskets-block" class="all_baskets-block">
{% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %}
<div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
id="SSTT_{{basket.getId()}}"
class="basketTips ui-accordion-header ui-state-default