[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-8-g27b7868
Jesse Vincent
jesse at bestpractical.com
Wed Sep 29 10:35:04 EDT 2010
The branch, 3.9-trunk has been updated
via 27b78683cdcbfffa2efa6116251a73c827aab962 (commit)
via f5aa30c9ac7bf6b4b9959ccdd1f8d4f5fd74935c (commit)
via 007b0cade461fb0afb825736bd5ad4b2d3d23101 (commit)
via e7277c76233f57cfa9a012f49f8fa8e49ad0f048 (commit)
from 7cf3658fc5daf5125a9fccbd9807780ceb0674c2 (commit)
Summary of changes:
share/html/Dashboards/Elements/ShowDashboards | 28 ++++++++++++------------
share/html/Elements/CollectionList | 5 +--
share/html/Elements/Dashboards | 12 +++-------
share/html/Elements/ShowUserVerbose | 4 ++-
share/html/NoAuth/css/web2/msie.css | 2 +-
share/html/NoAuth/css/web2/ticket-lists.css | 16 ++++++++------
6 files changed, 33 insertions(+), 34 deletions(-)
- Log -----------------------------------------------------------------
commit e7277c76233f57cfa9a012f49f8fa8e49ad0f048
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Sep 29 00:30:02 2010 -0400
remove a mason subcomonent
diff --git a/share/html/Dashboards/Elements/ShowDashboards b/share/html/Dashboards/Elements/ShowDashboards
index 5422fee..0289493 100644
--- a/share/html/Dashboards/Elements/ShowDashboards
+++ b/share/html/Dashboards/Elements/ShowDashboards
@@ -45,17 +45,14 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| /Widgets/TitleBox, title => $Title &>
-<& SELF:table, %ARGS &>
-</&>
-<%ARGS>
-$Title => undef
-</%ARGS>
-
-<%METHOD table>
<%ARGS>
$Dashboards => undef
$Verbose => 1
+$Title => loc("Dashboards"),
+$title_href => undef
+$bodyclass => undef
+$titleright => undef
+$titleright_href => undef
</%ARGS>
<%INIT>
# map each subscription to a dashboard ID
@@ -65,6 +62,13 @@ for my $attr ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription'
$subscription_for{$attr->SubValue('DashboardId')} = $attr;
}
</%INIT>
+<&| /Widgets/TitleBox, title => $Title,
+ title_href => $title_href,
+ bodyclass => $bodyclass,
+ titleright => $titleright,
+ titleright_href => $titleright_href
+
+ &>
% if (@$Dashboards == 0) {
% if ($Verbose) {
@@ -82,11 +86,7 @@ for my $attr ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription'
% my $i = 0;
% for my $dashboard (@$Dashboards) {
-% my $url = sprintf '%s/Dashboards/%d/%s',
-% RT->Config->Get('WebPath'),
-% $dashboard->Id,
-% $dashboard->Name;
-
+% my $url = sprintf '%s/Dashboards/%d/%s', RT->Config->Get('WebPath'), $dashboard->Id, $dashboard->Name;
<tr class="collection-as-table <% ++$i % 2 ? 'oddline' : 'evenline' %>">
% if ($Verbose) {
<td class="collection-as-table">
@@ -108,5 +108,5 @@ for my $attr ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription'
</table>
% }
-</%METHOD>
+</&>
diff --git a/share/html/Elements/Dashboards b/share/html/Elements/Dashboards
index fea3edc..de653da 100644
--- a/share/html/Elements/Dashboards
+++ b/share/html/Elements/Dashboards
@@ -46,19 +46,15 @@
%#
%# END BPS TAGGED BLOCK }}}
<div class="dashboards">
-<&|/Widgets/TitleBox,
- title => loc("Dashboards"),
+<& /Dashboards/Elements/ShowDashboards,
+ Dashboards => \@dashboards,
+ Verbose => 0,
+ Title => loc("Dashboards"),
title_href => RT->Config->Get('WebPath').'/Dashboards/index.html',
bodyclass => "",
titleright => loc("Edit"),
titleright_href => RT->Config->Get('WebPath').'/Dashboards/',
&>
-
-<& /Dashboards/Elements/ShowDashboards:table,
- Dashboards => \@dashboards,
- Verbose => 0,
-&>
-</&>
</div>
<%INIT>
my @dashboards = $m->comp("/Dashboards/Elements/ListOfDashboards");
commit 007b0cade461fb0afb825736bd5ad4b2d3d23101
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Sep 29 00:30:10 2010 -0400
silence some undef warnings
diff --git a/share/html/Elements/ShowUserVerbose b/share/html/Elements/ShowUserVerbose
index 9eb773d..cc0613c 100644
--- a/share/html/Elements/ShowUserVerbose
+++ b/share/html/Elements/ShowUserVerbose
@@ -48,7 +48,9 @@
%# Released under the terms of version 2 of the GNU Public License
<% $display |n %>\
<%INIT>
-my ($phrase, $address, $comment);
+my $phrase = '';
+my $address = '';
+my $comment = '';
if ($User) {
$address = $User->EmailAddress;
commit f5aa30c9ac7bf6b4b9959ccdd1f8d4f5fd74935c
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Sep 29 00:42:40 2010 -0400
generalize our colleciton-as-table formatting to not just apply to
ticket lists. format the dashboard list as a collection-as-table
diff --git a/share/html/Elements/CollectionList b/share/html/Elements/CollectionList
index cf177c6..8e57d4d 100644
--- a/share/html/Elements/CollectionList
+++ b/share/html/Elements/CollectionList
@@ -109,9 +109,8 @@ $Class ||= ref $Collection;
$Class =~ s/s$//;
$Class =~ s/:/_/g;
-$m->out('<table border="0" cellspacing="0" cellpadding="1"' .
- ' width="100%" class="' .
- ($Collection->isa('RT::Tickets') ? 'ticket-list' : 'collection') . '">');
+$m->out('<table class="' .
+ ($Collection->isa('RT::Tickets') ? 'ticket-list' : 'collection') . ' collection-as-table">');
if ( $ShowHeader ) {
$m->comp('/Elements/CollectionAsTable/Header',
diff --git a/share/html/NoAuth/css/web2/msie.css b/share/html/NoAuth/css/web2/msie.css
index fddd0c8..ca768ad 100644
--- a/share/html/NoAuth/css/web2/msie.css
+++ b/share/html/NoAuth/css/web2/msie.css
@@ -174,7 +174,7 @@ div#nav li.last {
padding-top: 2.2em;
}
-.titlebox table.ticket-list, .titlebox table.queue-summary {
+.titlebox table.collection-as-table, .titlebox table.queue-summary {
width: 95%;
padding: 0.5em;
margin-left: auto;
diff --git a/share/html/NoAuth/css/web2/ticket-lists.css b/share/html/NoAuth/css/web2/ticket-lists.css
index 19747b9..7c2c27c 100644
--- a/share/html/NoAuth/css/web2/ticket-lists.css
+++ b/share/html/NoAuth/css/web2/ticket-lists.css
@@ -45,13 +45,14 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-table.ticket-list, table.queue-summary, table.collection {
+table.queue-summary, table.collection-as-table {
margin-top: 0.75em;
font-size: 0.9em;
border: 1px solid #aaa;
border-bottom: 2px solid #999;
border-right: 2px solid #999;
-
+ border-spacing: 0;
+ width: 100%;
}
@@ -66,12 +67,12 @@ table.queue-summary tr>*:last-child {
}
-table.ticket-list a, table.queue-summary a, table.collection a {
+table.queue-summary a, table.collection-as-table a {
font-weight: bold;
}
-table.ticket-list th.collection-as-table, table.collection th.collection-as-table {
+table.collection-as-table th.collection-as-table {
background: #ddd;
font-size: 0.9em;
margin-bottom: 0.5em;
@@ -130,11 +131,12 @@ tr.evenline+tr.evenline td, tr.oddline+tr.oddline td{
-table.ticket-list td:first-child, table.ticket-list th:first-child {
+table.collection-as-table td:first-child,
+table.collection-as-table th:first-child {
padding-left: 1em;
}
-table.ticket-list td:last-child, table.ticket-list th:last-child {
+table.collection-as-table td:last-child, table.collection-as-table th:last-child {
padding-right: 1em;
}
@@ -164,7 +166,7 @@ padding-bottom: 1em;
/* full-page ticket lists */
-#body>table.ticket-list {
+#body>table.collection-as-table {
margin-bottom: 2em;
}
commit 27b78683cdcbfffa2efa6116251a73c827aab962
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Sep 29 00:47:15 2010 -0400
undef warning avoidance
diff --git a/share/html/Dashboards/Elements/ShowDashboards b/share/html/Dashboards/Elements/ShowDashboards
index 0289493..0194982 100644
--- a/share/html/Dashboards/Elements/ShowDashboards
+++ b/share/html/Dashboards/Elements/ShowDashboards
@@ -49,10 +49,10 @@
$Dashboards => undef
$Verbose => 1
$Title => loc("Dashboards"),
-$title_href => undef
-$bodyclass => undef
-$titleright => undef
-$titleright_href => undef
+$title_href => ""
+$bodyclass => ""
+$titleright => ""
+$titleright_href => ""
</%ARGS>
<%INIT>
# map each subscription to a dashboard ID
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list