hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix user and tooltips urls

Browse Source
This commit is contained in:
Romain Neutron
2012-02-08 17:45:40 +01:00
parent cae82aca00
commit 40ada806d9
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/web/prod/WorkZone/Browser/Basket.html.twig
View File

@@ -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 }}

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

@@ -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();

11
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -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 %}