From 40ada806d936f46b57ae76d00a792eb9992e3ebe Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 8 Feb 2012 17:45:40 +0100
Subject: [PATCH] Fix user and tooltips urls

---
 .../web/prod/WorkZone/Browser/Basket.html.twig   | 16 ++++++++++++----
 .../web/prod/WorkZone/Browser/Browser.html.twig  |  5 ++++-
 .../web/prod/WorkZone/Browser/Results.html.twig  | 11 +++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

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 @@
     <div class="PNB" style="top:40px;bottom:auto;height:40px;background-color:#404040;">
       <div class="PNB10">
         <p>
-          {% set user_name = '<a href="/prod/tooltip/user/' ~ Basket.getPusher().get_id() ~ '/" class="userTips">' ~ Basket.getPusher().get_display_name() ~ '</a>' %}
+          {% set user_name = '<a tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher().get_id() ~ '/" href="/user/' ~ Basket.getPusher().get_id() ~ '/" class="UserTips">' ~ Basket.getPusher().get_display_name() ~ '</a>' %}
           {% trans %}
             Received from {{ user_name }}
           {% endtrans %}
@@ -53,9 +53,17 @@
         <p>
           {% set list_participants = '' %}
           {% for Participant in Basket.getValidation().getParticipants() %}
-            {% set list_participants = list_participants ~ '<a href="/user/{{ Participant.getUser().get_id() }}/">
-              {{ Participant.getUser().get_display_name }}
-            </a>' %}
+
+            {% if list_participants != '' %}
+              {% set list_participants = list_participants ~ ', ' %}
+            {% endif %}
+
+            {% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="/prod/tooltip/user/'
+                                        ~ Participant.getUser().get_id()
+                                        ~ '/" href="/user/'
+                                        ~ Participant.getUser().get_id() ~ '/">'
+                                        ~ Participant.getUser().get_display_name
+                                        ~ '</a>' %}
           {% 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() %}
               <p>
-                {% set user_name = '<a href="#" tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher().get_id() ~ '/" class="userTips">' ~ Basket.getPusher().get_display_name() ~ '</a>' %}
+                {% set user_name = '<a href="/user/' ~ Basket.getPusher().get_id() ~ '/" tooltipsrc="/prod/tooltip/user/' ~ Basket.getPusher().get_id() ~ '/" class="UserTips">' ~ Basket.getPusher().get_display_name() ~ '</a>' %}
                 {% trans %}
                   Received from {{ user_name }}
                 {% endtrans %}
@@ -78,7 +78,14 @@
               <p>
                 {% set list_participants = '' %}
                 {% for Participant in Basket.getValidation().getParticipants() %}
-                  {% set list_participants = list_participants ~ '<a href="/user/' ~ Participant.getUser().get_id() ~ '/">' %}
+
+                  {% if list_participants != '' %}
+                    {% set list_participants = list_participants ~ ', ' %}
+                  {% endif %}
+
+                  {% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="/prod/tooltip/user/'
+                                        ~ Participant.getUser().get_id()
+                                        ~ '/"  href="/user/' ~ Participant.getUser().get_id() ~ '/">' %}
                   {% set list_participants = list_participants ~ Participant.getUser().get_display_name %}
                   {% set list_participants = list_participants ~ '</a>' %}
                 {% endfor %}