diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig index 65ef32fa33..c829da4b1d 100644 --- a/templates/web/prod/WorkZone/Browser/Basket.html.twig +++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig @@ -2,7 +2,7 @@
-
+ {% trans 'Back to basket list' %} @@ -29,10 +29,46 @@
-
-
-
+ {% set top = 0 %} + + {% if Basket.getPusher() %} + {% set top = top + 40 %} +
+
+

+ {% set user_name = '' ~ Basket.getPusher().get_display_name() ~ '' %} + {% trans %} + Received from {{ user_name }} + {% endtrans %} +

+
+
+ {% endif %} + + {% if Basket.getValidation() %} + {% set top = top + 160 %} +
+
+

+ {% set list_participants = '' %} + {% for Participant in Basket.getValidation().getParticipants() %} + {% set list_participants = list_participants ~ ' + {{ Participant.getUser().get_display_name }} + ' %} + {% endfor %} + {% trans %} + Sent for validation to {{ list_participants }} + {% endtrans %} +

+
+
+ {% endif %} + + {% set top = top + 40 %} + +
+
{% set ElementsCount = Basket.getElements().count() %} {% if ElementsCount == 0 %} {% trans 'No records' %} @@ -41,8 +77,33 @@ {% else %} {% trans %}{{ ElementsCount }} records{% endtrans %} {% endif %} +
-
+ + {% set top = top + 40 %} + + + {% import 'common/thumbnail.html' as thumbnail %} + + +
+
+ {% for BasketElement in Basket.getElements() %} + {% set record = BasketElement.getRecord() %} +
+
+ {{record.get_original_name()}} +
+
+ {{thumbnail.format(record.get_thumbnail,120,120, '', session, true)}} +
+
+
+ +
+
+ {% endfor %} +
\ No newline at end of file diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index c97ab68517..1213ef3fad 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -110,7 +110,7 @@ var results = $('.results', $container); results.removeClass('loading').append(data); activateLinks(results); - + active_archiver(results); return; } @@ -147,6 +147,7 @@ return false; }); + active_archiver($('.Basket', $container)); return; } @@ -172,7 +173,13 @@ return false; }); + + } + function active_archiver($scope) + { + $('.userTips', $scope).tooltip(); + $('a.archive_toggler', $scope).bind('click', function(){ var $this = $(this), parent = $this.parent(); diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig index 51eab8e7fc..203e8bf7ba 100644 --- a/templates/web/prod/WorkZone/Browser/Results.html.twig +++ b/templates/web/prod/WorkZone/Browser/Results.html.twig @@ -66,7 +66,7 @@ {% if Basket.getPusher() %}

- {% set user_name = '' ~ Basket.getPusher().get_display_name() ~ '' %} + {% set user_name = '' ~ Basket.getPusher().get_display_name() ~ '' %} {% trans %} Received from {{ user_name }} {% endtrans %} @@ -78,9 +78,9 @@

{% set list_participants = '' %} {% for Participant in Basket.getValidation().getParticipants() %} - {% set list_participants = list_participants ~ ' - {{ Participant.getUser().get_display_name }} - ' %} + {% set list_participants = list_participants ~ '' %} + {% set list_participants = list_participants ~ Participant.getUser().get_display_name %} + {% set list_participants = list_participants ~ '' %} {% endfor %} {% trans %} Sent for validation to {{ list_participants }}