diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig index f06284f577..d066d8b69b 100644 --- a/templates/web/prod/WorkZone/Browser/Basket.html.twig +++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig @@ -37,7 +37,7 @@

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

{% set list_participants = '' %} {% for Participant in Basket.getValidation().getParticipants() %} - {% set list_participants = list_participants ~ ' - {{ Participant.getUser().get_display_name }} - ' %} + + {% if list_participants != '' %} + {% set list_participants = list_participants ~ ', ' %} + {% endif %} + + {% set list_participants = list_participants ~ '' + ~ Participant.getUser().get_display_name + ~ '' %} {% endfor %} {% trans %} Sent for validation to {{ list_participants }} diff --git a/templates/web/prod/WorkZone/Browser/Browser.html.twig b/templates/web/prod/WorkZone/Browser/Browser.html.twig index 31bb1f2b98..43a2bc32c5 100644 --- a/templates/web/prod/WorkZone/Browser/Browser.html.twig +++ b/templates/web/prod/WorkZone/Browser/Browser.html.twig @@ -180,7 +180,10 @@ function active_archiver($scope) { - $('.userTips', $scope).tooltip(); + $('a.UserTips', $scope).bind('click', function(){ + + return false; + }).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 fc0b813e8e..abad5ec4da 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,7 +78,14 @@

{% set list_participants = '' %} {% for Participant in Basket.getValidation().getParticipants() %} - {% set list_participants = list_participants ~ '' %} + + {% if list_participants != '' %} + {% set list_participants = list_participants ~ ', ' %} + {% endif %} + + {% set list_participants = list_participants ~ '' %} {% set list_participants = list_participants ~ Participant.getUser().get_display_name %} {% set list_participants = list_participants ~ '' %} {% endfor %}