[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-761-g8367acb
Thomas Sibley
trs at bestpractical.com
Mon Sep 13 19:30:27 EDT 2010
The branch, 3.9-trunk has been updated
via 8367acb4767d43730c35120b6a9033195a7e39de (commit)
via 3e19cc2def9de71c74c15cc3c588f2b1491ca050 (commit)
via 8a28380182bbd981ec4f5b4c5a530e7e24f5db76 (commit)
from fe1fc0ace0239b5e08aa413347b7d5c09e2162b7 (commit)
Summary of changes:
lib/RT/Config.pm | 2 +-
share/html/NoAuth/css/base/main.css | 1 +
share/html/NoAuth/css/base/ticket.css | 42 +++++++++++
share/html/NoAuth/css/web2/ticket.css | 6 +-
share/html/Ticket/Elements/ShowRequestor | 44 +++++++++---
share/html/Ticket/Elements/ShowRequestorTickets | 36 ++--------
.../Ticket/Elements/ShowRequestorTicketsActive | 6 +--
share/html/Ticket/Elements/ShowRequestorTicketsAll | 6 +--
.../Ticket/Elements/ShowRequestorTicketsInactive | 6 +--
.../html/Ticket/Elements/ShowRequestorTicketsNone | 57 ---------------
.../html/Ticket/Elements/ShowRequestorToggleLinks | 72 --------------------
11 files changed, 92 insertions(+), 186 deletions(-)
create mode 100644 share/html/NoAuth/css/base/ticket.css
delete mode 100644 share/html/Ticket/Elements/ShowRequestorTicketsNone
delete mode 100644 share/html/Ticket/Elements/ShowRequestorToggleLinks
- Log -----------------------------------------------------------------
commit 8a28380182bbd981ec4f5b4c5a530e7e24f5db76
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Sep 13 16:52:31 2010 -0400
Revert 3 commits that add a too hacky AsLink option to ShowRequestor
Revert "Make the requestor box "show tickets" link less ambiguous"
Revert "On second thought, back out the pref I added in 8f397a39"
Revert "Option to show a search link instead of a list for requestors' tickets"
This reverts commit a755157c5a33f23210eb1362bcd831d78147c125.
This reverts commit fc0cfc9c781f9528442810ee5af44a52c15fe624.
This reverts commit 8f397a39ea874de48ac78d1e1cf659342a070070.
Conflicts:
share/html/Ticket/Elements/ShowRequestor (x2)
- conflicts with other changes made between and after the 3
commits I'm reverting
diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 5e56f7d..0c4247a 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -381,7 +381,7 @@ our %META = (
MoreAboutRequestorTicketList => {
Section => 'Ticket display', #loc
Overridable => 1,
- SortOrder => 7,
+ SortOrder => 6,
Widget => '/Widgets/Form/Select',
WidgetArguments => {
Description => q|What tickets to display in the 'More about requestor' box|, #loc
diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index 0f7a3ce..d7fb615 100755
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -56,7 +56,6 @@ while ( my $requestor = $people->Next ) {
<&| /Widgets/TitleBox,
title_href => $has_right_adminusers? RT->Config->Get('WebPath')."/Admin/Users/Modify.html?id=".$requestor->id: undef,
title_raw => loc("More about [_1]", $name),
- titleright_raw => $m->scomp( $TicketsLinkTemplate, AsLink => 1, Requestor => $requestor ),
class => 'ticket-info-requestor'
&>
@@ -89,7 +88,6 @@ while ( my $requestor = $people->Next ) {
<span class="value"><& /Elements/ShowMemberships, UserObj => $requestor, Limit => RT->Config->Get('MoreAboutRequestorGroupsLimit') &></span>
</div>
% }
-
</&>
% }
@@ -105,15 +103,10 @@ my $show_privileged = RT->Config->Get('ShowMoreAboutPrivilegedUsers');
$TicketTemplate ||= "ShowRequestorTickets".(RT->Config->Get('MoreAboutRequestorTicketList', $session{CurrentUser})||'Active');
$TicketTemplate = "ShowRequestorTicketsActive" unless $m->comp_exists($TicketTemplate);
-
-$TicketsLinkTemplate ||= $TicketTemplate;
-$TicketsLinkTemplate = "ShowRequestorTicketsActive"
- if $TicketsLinkTemplate =~ /None$/;
</%INIT>
<%ARGS>
$Ticket=>undef
$TicketTemplate=>undef
-$TicketsLinkTemplate => undef
$ShowComments => 1
$ShowTickets => 1
$ShowGroups => 1
diff --git a/share/html/Ticket/Elements/ShowRequestorTickets b/share/html/Ticket/Elements/ShowRequestorTickets
index f2a399a..3d162da 100644
--- a/share/html/Ticket/Elements/ShowRequestorTickets
+++ b/share/html/Ticket/Elements/ShowRequestorTickets
@@ -45,45 +45,25 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-% if ( $AsLink ) {
-<%perl>
- my $url = RT->Config->Get('WebPath') . '/Search/Results.html?';
- $url .= $m->comp('/Elements/QueryString',
- Query => $sql,
- RowsPerPage => $Rows,
- OrderBy => $OrderBy,
- Order => $Order );
-</%perl>
-<a href="<%$url%>"><&|/l, $Type &>Show [_1] tickets</&></a>
-% } else {
<ul>
-<%perl>
- my $tickets = RT::Tickets->new( $session{'CurrentUser'} );
- $tickets->FromSQL( $sql );
- $tickets->RowsPerPage( $Rows );
- $tickets->OrderBy( FIELD => $OrderBy, ORDER => $Order );
-
- while (my $w=$tickets->Next) {
- my $uri = RT::URI->new( $session{'CurrentUser'} );
- $uri->FromObject($w);
-</%perl>
+%while (my $w=$tickets->Next) {
+%my $uri = RT::URI->new( $session{'CurrentUser'} );
+%$uri->FromObject($w);
<li class="value"><& /Elements/ShowLink, URI => $uri &></li>
-% }
+%}
</ul>
-% }
<%INIT>
-my $OrderBy = 'Priority';
-my $Order = 'DESC';
-
my $sql = "Requestor.id = ". $Requestor->id;
if (@$conditions) {
$sql .= " AND (".join( " OR ", map $_->{cond}, @$conditions).")";
}
+my $tickets = RT::Tickets->new( $session{'CurrentUser'} );
+$tickets->FromSQL( $sql );
+$tickets->RowsPerPage( $Rows );
+$tickets->OrderBy( FIELD => 'Priority', ORDER => 'DESC' );
</%INIT>
<%ARGS>
-$Type => loc('all')
$Requestor => undef
$conditions
$Rows => 10
-$AsLink => undef
</%ARGS>
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsActive b/share/html/Ticket/Elements/ShowRequestorTicketsActive
index 59e47a6..9c397e9 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsActive
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsActive
@@ -45,11 +45,11 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-% unless ( $AsLink ) {
+<span id="more-about-requestor-<%$Requestor->Id%>">
<span class="label"><&|/l, $Rows &>This user's [_1] highest priority active tickets</&>:</span>
<& ShowRequestorToggleLinks, %ARGS, Status => 'Active' &>
-% }
-<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows, Type => loc('open') &>
+<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows &>
+</span>
<%INIT>
unless ( @$conditions ) {
foreach (RT::Queue->ActiveStatusArray()) {
@@ -61,5 +61,4 @@ unless ( @$conditions ) {
$Requestor => undef
$conditions => []
$Rows => 10
-$AsLink => undef
</%ARGS>
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsAll b/share/html/Ticket/Elements/ShowRequestorTicketsAll
index edbc69f..0c93577 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsAll
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsAll
@@ -45,14 +45,13 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-% unless ( $AsLink ) {
+<span id="more-about-requestor-<%$Requestor->Id%>">
<span class="label"><&|/l, $Rows &>This user's [_1] highest priority tickets</&>:</span>
<& ShowRequestorToggleLinks, %ARGS, Status => 'All' &>
-% }
-<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows, Type => loc('all') &>
+<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows &>
+</span>
<%ARGS>
$Requestor => undef
$conditions => []
$Rows => 10
-$AsLink => undef
</%ARGS>
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsInactive b/share/html/Ticket/Elements/ShowRequestorTicketsInactive
index 0324b01..1be0eb3 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsInactive
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsInactive
@@ -45,11 +45,11 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-% unless ( $AsLink ) {
+<span id="more-about-requestor-<%$Requestor->Id%>">
<span class="label"><&|/l, $Rows &>This user's [_1] highest priority inactive tickets</&>:</span>
<& ShowRequestorToggleLinks, %ARGS, Status => 'Inactive' &>
-% }
-<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows, Type => loc('closed') &>
+<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows &>
+</span>
<%INIT>
unless ( @$conditions ) {
foreach (RT::Queue->InactiveStatusArray()) {
@@ -61,5 +61,4 @@ unless ( @$conditions ) {
$Requestor => undef
$conditions => []
$Rows => 10
-$AsLink => undef
</%ARGS>
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsNone b/share/html/Ticket/Elements/ShowRequestorTicketsNone
index 60a3608..e4688d7 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsNone
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsNone
@@ -45,13 +45,12 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+<span id="more-about-requestor-<%$Requestor->Id%>">
%# showing no tickets means doing no work
-% if ( $AsLink ) {
-<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows, Type => loc('all') &>
-% }
+<& ShowRequestorToggleLinks, %ARGS, Status => 'Inactive' &>
+</span>
<%ARGS>
$Requestor => undef
$conditions => []
$Rows => 10
-$AsLink => undef
</%ARGS>
commit 3e19cc2def9de71c74c15cc3c588f2b1491ca050
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Sep 13 19:00:57 2010 -0400
Turn the ShowRequestor ticket lists into a jQuery tabs widget
This lazy loads the lists via ajax and caches the result for each tab.
diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index d7fb615..0bf51d2 100755
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -45,6 +45,18 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+% if ($ShowTickets) {
+<script type="text/javascript">
+ jQuery(function() {
+ jQuery(".more-about-requestor").tabs({
+ cache: true,
+ collapsible: true,
+ selected: <% $selected %>
+ });
+ });
+</script>
+% }
+
<%PERL>
my $people = $Ticket->Requestors->UserMembersObj;
while ( my $requestor = $people->Next ) {
@@ -72,7 +84,13 @@ while ( my $requestor = $people->Next ) {
% if ( $ShowTickets ) {
<div class="more-about-requestor" id="more-about-requestor-<%$requestor->Id%>">
- <& $TicketTemplate, Requestor => $requestor &>
+ <ul>
+% for my $status ( @$status_order ) {
+% my $url = RT->Config->Get('WebPath').'/Helpers/Toggle/ShowRequestor?'.
+% $m->comp('/Elements/QueryString', Requestor => $requestor->Id , Status => $status);
+ <li><a href="<% $url | n %>"><% $status_link_text->{$status} %></a></li>
+% }
+ </ul>
</div>
% }
@@ -101,8 +119,21 @@ $has_right_adminusers &&= $session{'CurrentUser'}->HasRight(
my $show_privileged = RT->Config->Get('ShowMoreAboutPrivilegedUsers');
-$TicketTemplate ||= "ShowRequestorTickets".(RT->Config->Get('MoreAboutRequestorTicketList', $session{CurrentUser})||'Active');
-$TicketTemplate = "ShowRequestorTicketsActive" unless $m->comp_exists($TicketTemplate);
+# Ticket list tabs
+my $selected = -1;
+my $current_status = RT->Config->Get('MoreAboutRequestorTicketList', $session{CurrentUser}) || 'Active';
+my $status_link_text = {Active => loc('Active Tickets'),
+ Inactive => loc('Inactive Tickets'),
+ All => loc('All Tickets')};
+my $status_order = [qw/Active Inactive All/];
+$m->callback( CallbackName => 'AddStatus', status_link_text => \$status_link_text, status_order => \$status_order );
+
+unless ( $current_status eq 'None' ) {
+ for (0 .. (@$status_order - 1)) {
+ $selected = $_ && last
+ if $status_order->[$_] eq $current_status;
+ }
+}
</%INIT>
<%ARGS>
$Ticket=>undef
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsActive b/share/html/Ticket/Elements/ShowRequestorTicketsActive
index 9c397e9..950f237 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsActive
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsActive
@@ -45,11 +45,8 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<span id="more-about-requestor-<%$Requestor->Id%>">
<span class="label"><&|/l, $Rows &>This user's [_1] highest priority active tickets</&>:</span>
-<& ShowRequestorToggleLinks, %ARGS, Status => 'Active' &>
<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows &>
-</span>
<%INIT>
unless ( @$conditions ) {
foreach (RT::Queue->ActiveStatusArray()) {
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsAll b/share/html/Ticket/Elements/ShowRequestorTicketsAll
index 0c93577..5b6922e 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsAll
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsAll
@@ -45,11 +45,8 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<span id="more-about-requestor-<%$Requestor->Id%>">
<span class="label"><&|/l, $Rows &>This user's [_1] highest priority tickets</&>:</span>
-<& ShowRequestorToggleLinks, %ARGS, Status => 'All' &>
<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows &>
-</span>
<%ARGS>
$Requestor => undef
$conditions => []
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsInactive b/share/html/Ticket/Elements/ShowRequestorTicketsInactive
index 1be0eb3..d5a3b57 100644
--- a/share/html/Ticket/Elements/ShowRequestorTicketsInactive
+++ b/share/html/Ticket/Elements/ShowRequestorTicketsInactive
@@ -45,11 +45,8 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<span id="more-about-requestor-<%$Requestor->Id%>">
<span class="label"><&|/l, $Rows &>This user's [_1] highest priority inactive tickets</&>:</span>
-<& ShowRequestorToggleLinks, %ARGS, Status => 'Inactive' &>
<& ShowRequestorTickets, %ARGS, conditions => $conditions, Rows => $Rows &>
-</span>
<%INIT>
unless ( @$conditions ) {
foreach (RT::Queue->InactiveStatusArray()) {
diff --git a/share/html/Ticket/Elements/ShowRequestorTicketsNone b/share/html/Ticket/Elements/ShowRequestorTicketsNone
deleted file mode 100644
index e4688d7..0000000
--- a/share/html/Ticket/Elements/ShowRequestorTicketsNone
+++ /dev/null
@@ -1,56 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<span id="more-about-requestor-<%$Requestor->Id%>">
-%# showing no tickets means doing no work
-<& ShowRequestorToggleLinks, %ARGS, Status => 'Inactive' &>
-</span>
-<%ARGS>
-$Requestor => undef
-$conditions => []
-$Rows => 10
-</%ARGS>
diff --git a/share/html/Ticket/Elements/ShowRequestorToggleLinks b/share/html/Ticket/Elements/ShowRequestorToggleLinks
deleted file mode 100644
index a2fdfe0..0000000
--- a/share/html/Ticket/Elements/ShowRequestorToggleLinks
+++ /dev/null
@@ -1,72 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<div class="requestor-ticket-links">
-% for my $status ( @$status_order ) {
-% my $url = RT->Config->Get('WebPath').'/Helpers/Toggle/ShowRequestor?'.
-% $m->comp('/Elements/QueryString', Requestor => $Requestor->Id , Status => $status);
-[<a href="<% $url | n %>" onclick="jQuery('#more-about-requestor-<% $Requestor->Id %>').load('<% $url |n %>'); return false;" >
-<% $status_link_text->{$status} %>
-</a>]
-% }
-</div>
-<%INIT>
-my $status_link_text = {Active => loc('Active Tickets'),
- Inactive => loc('Inactive Tickets'),
- All => loc('All Tickets')};
-my $status_order = [qw/Active Inactive All/];
-$m->callback( CallbackName => 'AddStatus', status_link_text => \$status_link_text, status_order => \$status_order );
-
-if ($Status) {
- $status_order = [grep { $_ ne $Status } @$status_order];
- delete $status_link_text->{$Status};
-}
-</%INIT>
-<%ARGS>
-$Requestor
-$Status => ''
-</%ARGS>
commit 8367acb4767d43730c35120b6a9033195a7e39de
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Sep 13 19:31:07 2010 -0400
Restyle the new requestor ticket list tabs so they match RT
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index ec61771..2d132d3 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -52,6 +52,7 @@
@import "ticket-form.css";
@import "rights-editor.css";
@import "theme-editor.css";
+ at import "ticket.css";
% $m->callback(CallbackName => 'End');
diff --git a/share/html/NoAuth/css/base/ticket.css b/share/html/NoAuth/css/base/ticket.css
new file mode 100644
index 0000000..1b03d5c
--- /dev/null
+++ b/share/html/NoAuth/css/base/ticket.css
@@ -0,0 +1,42 @@
+.more-about-requestor-tickets {
+ background: none;
+ border: none;
+ font-family: arial,helvetica,sans-serif !important;
+ padding: 0 !important;
+}
+
+.more-about-requestor-tickets .ui-tabs-nav {
+ background: none;
+ border: none;
+ font-size: 80%;
+ padding: 0;
+ margin: 0;
+}
+
+.more-about-requestor-tickets .ui-tabs-nav li {
+ border: none !important;
+ background: none !important;
+ padding-right: 1em;
+}
+
+.more-about-requestor-tickets .ui-tabs-nav a {
+ padding: 0 !important;
+ margin: 0 !important;
+ color: black !important;
+}
+
+.more-about-requestor-tickets .ui-tabs-nav a:hover,
+.more-about-requestor-tickets .ui-tabs-nav .ui-tabs-selected a {
+ text-decoration: underline;
+}
+
+.more-about-requestor-tickets .ui-tabs-panel {
+ border: none;
+ padding: 0;
+ margin: 0;
+ color: black !important;
+}
+
+.more-about-requestor-tickets .ui-tabs-panel a {
+ color: black !important;
+}
diff --git a/share/html/NoAuth/css/web2/ticket.css b/share/html/NoAuth/css/web2/ticket.css
index 8741b3d..07f58e4 100644
--- a/share/html/NoAuth/css/web2/ticket.css
+++ b/share/html/NoAuth/css/web2/ticket.css
@@ -254,7 +254,7 @@ div.requestor-ticket-links {
.ticket-info-requestor .more-about-requestor-extra,
.ticket-info-requestor .comments-about-user,
-.ticket-info-requestor .more-about-requestor,
+.ticket-info-requestor .more-about-requestor-tickets,
.ticket-info-requestor .more-about-user-groups
{
margin: 1em 0;
@@ -262,7 +262,7 @@ div.requestor-ticket-links {
.ticket-info-requestor .comments-about-user .label,
.ticket-info-requestor .more-about-user-groups .label,
-.ticket-info-requestor .more-about-requestor .label
+.ticket-info-requestor .more-about-requestor-tickets .label
{
display: block;
font-weight: bold;
@@ -270,7 +270,7 @@ div.requestor-ticket-links {
}
.ticket-info-requestor .more-about-user-groups .value ul,
-.ticket-info-requestor .more-about-requestor ul
+.ticket-info-requestor .more-about-requestor-tickets ul
{
margin-top: 0;
margin-bottom: 0;
diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index 0bf51d2..961479c 100755
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -48,7 +48,7 @@
% if ($ShowTickets) {
<script type="text/javascript">
jQuery(function() {
- jQuery(".more-about-requestor").tabs({
+ jQuery(".more-about-requestor-tickets").tabs({
cache: true,
collapsible: true,
selected: <% $selected %>
@@ -83,7 +83,7 @@ while ( my $requestor = $people->Next ) {
% }
% if ( $ShowTickets ) {
-<div class="more-about-requestor" id="more-about-requestor-<%$requestor->Id%>">
+<div class="more-about-requestor-tickets" id="more-about-requestor-tickets-<%$requestor->Id%>">
<ul>
% for my $status ( @$status_order ) {
% my $url = RT->Config->Get('WebPath').'/Helpers/Toggle/ShowRequestor?'.
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list