[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-463-g371c589
Thomas Sibley
trs at bestpractical.com
Tue Aug 17 23:01:05 EDT 2010
The branch, 3.9-trunk has been updated
via 371c58905d83be52c62cb20ad16f5a32196ef74c (commit)
via 7c8f3aa40016e1fec3fd204dff7f5e62a5899eee (commit)
from 5dc4c6de913391cc841e29b0f4e14001a65b982b (commit)
Summary of changes:
share/html/NoAuth/css/web2/base.css | 3 +-
share/html/NoAuth/css/web2/boxes.css | 3 +-
share/html/NoAuth/css/web2/ticket.css | 36 ++++++++++++++++++---
share/html/Ticket/Elements/ShowDates | 4 +-
share/html/Ticket/Elements/ShowRequestor | 17 +++++-----
share/html/Ticket/Elements/ShowRequestorExtraInfo | 8 ++--
6 files changed, 49 insertions(+), 22 deletions(-)
- Log -----------------------------------------------------------------
commit 7c8f3aa40016e1fec3fd204dff7f5e62a5899eee
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Aug 17 22:40:46 2010 -0400
Repair the links I accidentally broke in c030f1c46
An over zealous regex killed the opening <a> tags, but left the closing
tags. Thankfully Chrome warned about those and I just noticed.
diff --git a/share/html/Ticket/Elements/ShowDates b/share/html/Ticket/Elements/ShowDates
index 3a69620..9c27919 100755
--- a/share/html/Ticket/Elements/ShowDates
+++ b/share/html/Ticket/Elements/ShowDates
@@ -59,7 +59,7 @@
<td class="value"><% $Ticket->StartedObj->AsString %></td>
</tr>
<tr class="date told">
- <td class="label"><&|/l&>Last Contact</&></a>:</td>
+ <td class="label"><a href="<% RT->Config->Get('WebPath') %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:</td>
<td class="value"><% $Ticket->ToldObj->AsString %></td>
</tr>
<tr class="date due">
@@ -79,7 +79,7 @@
<td class="label"><&|/l&>Updated</&>:</td>
% my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name) : loc("Never");
% if ($UpdatedLink) {
- <td class="value"><% $UpdatedString | h %></a></td>
+ <td class="value"><a href="#lasttrans"><% $UpdatedString | h %></a></td>
% } else {
<td class="value"><% $UpdatedString | h %></td>
% }
commit 371c58905d83be52c62cb20ad16f5a32196ef74c
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Aug 17 23:02:36 2010 -0400
Style the new requestor box consistently and nicely
I also made the CSS classes consistent for this box.
diff --git a/share/html/NoAuth/css/web2/base.css b/share/html/NoAuth/css/web2/base.css
index f0bb5ef..213d9e3 100644
--- a/share/html/NoAuth/css/web2/base.css
+++ b/share/html/NoAuth/css/web2/base.css
@@ -51,9 +51,8 @@ a {
}
-div#body a:visited {
+a:visited {
color: #666;
-
}
a:hover {
diff --git a/share/html/NoAuth/css/web2/boxes.css b/share/html/NoAuth/css/web2/boxes.css
index 531543c..d096b40 100644
--- a/share/html/NoAuth/css/web2/boxes.css
+++ b/share/html/NoAuth/css/web2/boxes.css
@@ -149,7 +149,8 @@
}
-.titlebox .titlebox-title .right a {
+.titlebox .titlebox-title .right a,
+.titlebox .titlebox-title .right a:visited {
color: #000;
}
diff --git a/share/html/NoAuth/css/web2/ticket.css b/share/html/NoAuth/css/web2/ticket.css
index 49a828f..8741b3d 100644
--- a/share/html/NoAuth/css/web2/ticket.css
+++ b/share/html/NoAuth/css/web2/ticket.css
@@ -202,7 +202,7 @@ div#ticket-history .messagebody .messagebody{
.ticket-info-attachments .titlebox-title .left { background-color: #993366; color: #fff;}
-.ticket-summary .titlebox-title a, div#body .ticket-summary .titlebox-title a:visited { color: #fff;}
+.ticket-summary .titlebox-title .left a, .ticket-summary .titlebox-title .left a:visited { color: #fff;}
.unread-messages .titlebox , .unread-messages .titlebox-title .left {
border: 1px solid #99a;
@@ -241,11 +241,37 @@ div.requestor-ticket-links {
padding-top: 0.25em;
}
-div.more-about-requestor-extra-info .label {
+.more-about-requestor-extra-field .label {
+ display: inline-block;
+ width: 8em;
font-weight: bold;
- padding-left: 0.5em;
+ text-align: right;
}
-div.more-about-requestor-extra-info .value {
- padding-left: 0em;
+.more-about-requestor-extra-field .value {
+ display: inline-block;
+}
+
+.ticket-info-requestor .more-about-requestor-extra,
+.ticket-info-requestor .comments-about-user,
+.ticket-info-requestor .more-about-requestor,
+.ticket-info-requestor .more-about-user-groups
+{
+ margin: 1em 0;
+}
+
+.ticket-info-requestor .comments-about-user .label,
+.ticket-info-requestor .more-about-user-groups .label,
+.ticket-info-requestor .more-about-requestor .label
+{
+ display: block;
+ font-weight: bold;
+ text-align: left;
+}
+
+.ticket-info-requestor .more-about-user-groups .value ul,
+.ticket-info-requestor .more-about-requestor ul
+{
+ margin-top: 0;
+ margin-bottom: 0;
}
diff --git a/share/html/Ticket/Elements/ShowRequestor b/share/html/Ticket/Elements/ShowRequestor
index 31c099a..75acf22 100755
--- a/share/html/Ticket/Elements/ShowRequestor
+++ b/share/html/Ticket/Elements/ShowRequestor
@@ -64,17 +64,18 @@ while ( my $requestor = $people->Next ) {
% $m->callback( requestor => $requestor, %ARGS, CallbackName => 'AboutThisUser' );
<& ShowRequestorExtraInfo, Requestor => $requestor &>
-<span class="label commentsaboutuser"><&|/l&>Comments about this user</&>:</span><br />
-<b class="value commentsaboutuser"><% ($requestor->Comments || loc("No comment entered about this user")) %></b><br />
+<div class="comments-about-user">
+ <span class="label"><&|/l&>Comments about this user</&>:</span>
+ <span class="value"><% ($requestor->Comments || loc("No comment entered about this user")) %></span>
+</div>
-<span id="more-about-requestor-<%$requestor->Id%>">
+<div class="more-about-requestor" id="more-about-requestor-<%$requestor->Id%>">
<& $TicketTemplate, Requestor => $requestor &>
-</span>
-
-<div class="moreaboutusergroups">
-<&|/l&>Groups this user belongs to</&>:<br />
+</div>
-<& /Elements/ShowMemberships, UserObj => $requestor &>
+<div class="more-about-user-groups">
+ <span class="label"><&|/l&>Groups this user belongs to</&>:</span>
+ <span class="value"><& /Elements/ShowMemberships, UserObj => $requestor &></span>
</div>
</&>
diff --git a/share/html/Ticket/Elements/ShowRequestorExtraInfo b/share/html/Ticket/Elements/ShowRequestorExtraInfo
index a2b7f88..fb8d841 100644
--- a/share/html/Ticket/Elements/ShowRequestorExtraInfo
+++ b/share/html/Ticket/Elements/ShowRequestorExtraInfo
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<div class="more-about-requestor-extra-info">
+<div class="more-about-requestor-extra">
% for my $column (@formats) {
% my $title = $column->{title} || '';
% my $attr = $column->{'attribute'} || $column->{'last_attribute'};
@@ -53,7 +53,7 @@
% $title = $fetch_columnmap->($attr,'title',[$attr]);
% }
% $title = $m->comp('/Elements/ScrubHTML', Content => $title);
-<span class="more-about-requestor-extra-field <% $fetch_columnmap->($attr,'attribute',[$attr]) %>" >
+<div class="more-about-requestor-extra-field <% $fetch_columnmap->($attr,'attribute',[$attr]) %>" >
<span class="label"> <% $title %></span>
% my @out;
% foreach my $subcol ( @{ $column->{output} } ) {
@@ -64,9 +64,9 @@
% }
% push @out, $fetch_columnmap->($col, 'value', [$Requestor]);
% }
-% @out = grep { defined $_ } @out;
+% @out = grep { defined $_ and length $_ } @out;
<span class="value"><% join(' ', at out) %></span>
-</span>
+</div>
% }
</div>
<%INIT>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list