X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FElements%2FShowRequestor;h=40833bf4ed11fefe72de272171b4f7f09d2da9d7;hb=7322f2afedcc2f427e997d1535a503613a83f088;hp=8a8eef62cf585ebff960a2cf72e9b31694188edd;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git diff --git a/rt/share/html/Ticket/Elements/ShowRequestor b/rt/share/html/Ticket/Elements/ShowRequestor index 8a8eef62c..40833bf4e 100755 --- a/rt/share/html/Ticket/Elements/ShowRequestor +++ b/rt/share/html/Ticket/Elements/ShowRequestor @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -45,33 +45,28 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} +% if ($ShowTickets) { <script type="text/javascript"> jQuery(function() { - jQuery("#requestor-accordion").accordion({ - active: <% $count == 1 ? 0 : 'false' %>, - collapsible: true, - autoHeight: false - }); - -% if ($ShowTickets) { jQuery(".more-about-requestor-tickets").tabs({ cache: true, collapsible: true, - selected: <% $selected %> + active: <% $selected %> }); -% } }); </script> +% } <&| /Widgets/TitleBox, title_raw => loc("More about the requestors"), class => 'ticket-info-requestor' &> -<div id="requestor-accordion"> +<div id="requestor-accordion" class="user-accordion"> % while ( my $requestor = $people->Next ) { - <h3><a href="#"><& /Elements/ShowUser, User => $requestor &></a></h3> +<h3><a href="#"><& /Elements/ShowUser, User => $requestor, Link => 0 &></a> + <a class="user-summary" href="<%RT->Config->Get('WebPath')%>/User/Summary.html?id=<%$requestor->Id%>">User Summary</a></h3> <div class="details"> %# Additional information about this user. Empty by default. @@ -85,6 +80,8 @@ </div> % } +% $m->callback( requestor => $requestor, %ARGS, CallbackName => 'AfterComments' ); + % if ( $ShowTickets ) { <div class="more-about-requestor-tickets ui-tabs" id="more-about-requestor-tickets-<%$requestor->Id%>"> <ul> @@ -108,7 +105,7 @@ <div id="requestor-<%$requestor->Id%>-ticket-tab-default"> <& $TicketTemplate, Requestor => $requestor &> % } else { - <div id="requestor-<%$requestor->Id%>-ticket-tab-<% $index++ %>" class="ui-tabs-hide"> + <div id="requestor-<%$requestor->Id%>-ticket-tab-<% $index++ %>" class="hidden"> <span class="label"><&|/l&>Loading...</&></span> % } </div> @@ -131,15 +128,13 @@ </div> % } -% if ( $has_right_adminusers ) { - <a class="modify-user" href="<% RT->Config->Get('WebPath')."/Admin/Users/Modify.html?id=".$requestor->id %>">Modify this user</a> -% } - %# end of individual requestor details <div> </div> % } %# end of requestors loop +% $m->callback( %ARGS, CallbackName => 'AfterRequestors' ); + </div> </&> <%INIT> @@ -167,17 +162,22 @@ my $status_link_text = {Active => loc('Active Tickets'), my $status_order = [qw/Active Inactive All/]; $m->callback( CallbackName => 'AddStatus', status_link_text => \$status_link_text, status_order => \$status_order ); -unless ( $DefaultTicketsTab eq 'None' ) { +$ShowTickets = 0 if $DefaultTicketsTab eq 'None'; + +my $TicketTemplate; +if ($ShowTickets) { for (0 .. (@$status_order - 1)) { - $selected = $_ && last - if $status_order->[$_] eq $DefaultTicketsTab; + if ( $status_order->[$_] eq $DefaultTicketsTab ) { + $selected = $_; + last; + } } -} -my $TicketTemplate = "ShowRequestorTickets$DefaultTicketsTab"; -$TicketTemplate = "ShowRequestorTicketsActive" - unless RT::Interface::Web->ComponentPathIsSafe($TicketTemplate) - and $m->comp_exists($TicketTemplate); + $TicketTemplate = "ShowRequestorTickets$DefaultTicketsTab"; + $TicketTemplate = "ShowRequestorTicketsActive" + unless RT::Interface::Web->ComponentPathIsSafe($TicketTemplate) + and $m->comp_exists($TicketTemplate); +} </%INIT> <%ARGS> $Ticket=>undef