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-3002-upgrade-php-ffmpeg-lib

Browse Source
This commit is contained in:
Nicolas Maillat
2020-04-01 23:48:33 +02:00
committed by GitHub
parent a39c0b5ff0 32ec5da4a8
commit 3cff44eec2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ class QueryController extends Controller
$infoResult = '<div id="docInfo">' $infoResult = '<div id="docInfo">'
. $this->app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>']) . $this->app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>'])
. '<div class="detailed_info_holder"><img src="/assets/common/images/icons/dots.png" class="image-normal"><img src="/assets/common/images/icons/dots-darkgreen-hover.png" class="image-hover">' . '<div class="detailed_info_holder"><img src="/assets/common/images/icons/dots.png" class="image-normal hidden"><img src="/assets/common/images/icons/dots-darkgreen-hover.png" class="image-hover">'
. '<div class="detailed_info"> . '<div class="detailed_info">
<table> <table>
<thead> <thead>

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

@@ -11,7 +11,7 @@
<span class="expiredDate"> <span class="expiredDate">
{% if basket.getValidation() %} {% if basket.getValidation() %}
{% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %} {% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
{% if date(dateExpired) < date() %} {% if basket.getValidation().getExpires() < date() %}
<span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span> <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>
{% else %} {% else %}
<span>{{ 'workzone:feedback:expiration-open' | trans }} :</span> <span>{{ 'workzone:feedback:expiration-open' | trans }} :</span>

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

@@ -101,7 +101,7 @@
{% set dateExpired = app['date-formatter'].getTranslatedDate(basket.getValidation().getExpires()) %} {% set dateExpired = app['date-formatter'].getTranslatedDate(basket.getValidation().getExpires()) %}
<div class="expiredDate"> <div class="expiredDate">
{% if date(dateExpired) < date() %} {% if basket.getValidation().getExpires() < date() %}
<span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span> <span>{{ 'workzone:feedback:expiration-closed' | trans }} :</span>
{% else %} {% else %}
<span>{{ 'workzone:feedback:expiration-open' | trans }} :</span> <span>{{ 'workzone:feedback:expiration-open' | trans }} :</span>