[Rt-commit] [svn] r1854 - in rt/branches/PLATANO-EXPERIMENTAL-CSS: . html/Elements html/Elements/CollectionAsTable html/Elements/RT__Ticket html/NoAuth html/Search lib/RT

jesse at pallas.eruditorum.org jesse at pallas.eruditorum.org
Thu Nov 11 03:44:40 EST 2004


Author: jesse
Date: Thu Nov 11 03:44:40 2004
New Revision: 1854

Modified:
   rt/branches/PLATANO-EXPERIMENTAL-CSS/   (props changed)
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/CollectionAsTable/Header
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/RT__Ticket/ColumnMap
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/TicketList
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/webrt.css
   rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Results.html
   rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Principal_Overlay.pm
Log:
 r9116 at tinbook:  jesse | 2004-11-11T03:02:54.980441Z
  r6198 at tinbook:  jesse | 2004-11-07T04:18:22.934311Z
  Devel: Changed severity of calling Principal->HasRight without a Right
 


Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/CollectionAsTable/Header	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/CollectionAsTable/Header	Thu Nov 11 03:44:40 2004
@@ -32,7 +32,7 @@
 $Page => undef
 $maxitems => undef
 </%ARGS>
-<TR>
+<TR class="collection-as-table">
 <%perl>
 
 my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page );
@@ -43,7 +43,7 @@
     $item++;
     $$maxitems = $item if $item > $$maxitems;
     if ( $col->{title} eq 'NEWLINE' ) {
-        $m->out('</TR>       <TR>');
+        $m->out(qq{</TR>\n<TR class="collection-as-table">});
 	$item = 0;
     }
     else {

Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/RT__Ticket/ColumnMap	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/RT__Ticket/ColumnMap	Thu Nov 11 03:44:40 2004
@@ -27,9 +27,6 @@
 $Attr => undef
 </%ARGS>
 
-<%perl>
-return ColumnMap($Name, $Attr);
-</%perl>
 
 <%INIT>
 our ( $COLUMN_MAP, $CUSTOM_FIELD_MAP );
@@ -153,14 +150,17 @@
     },
     TimeWorked => {
         attribute => 'TimeWorked',
+        title => 'Time Worked',
         value     => sub { return $_[0]->TimeWorked }
     },
     TimeLeft => {
         attribute => 'TimeLeft',
+        title     => 'Time Left',
         value     => sub { return $_[0]->TimeLeft }
     },
     TimeEstimated => {
         attribute => 'TimeEstimated',
+        title => 'Time Estimated',
         value     => sub { return $_[0]->TimeEstimated }
     },
     Requestors => {
@@ -188,7 +188,7 @@
         value     => sub { return $_[0]->CreatedObj->AgeAsString }
     },
     LastUpdatedRelative => {
-        title     => 'LastUpdated',
+        title     => 'Last Updated',
         attribute => 'LastUpdated',
         value     => sub { return $_[0]->LastUpdatedObj->AgeAsString }
     },
@@ -228,14 +228,17 @@
     },
     CreatedBy => {
         attribute => 'CreatedBy',
+        title => 'Created By',
         value     => sub { return $_[0]->CreatorObj->Name }
     },
     LastUpdated => {
         attribute => 'LastUpdated',
+        title     => 'Last Updated',
         value     => sub { return $_[0]->LastUpdatedObj->AsString }
     },
     LastUpdatedBy => {
         attribute => 'LastUpdatedBy',
+        title     => 'Last Updated By',
         value     => sub { return $_[0]->LastUpdatedByObj->Name }
     },
     Told => {
@@ -252,6 +255,7 @@
     },
 
     DependedOnBy => {
+        title => 'Depended On By',
         value => sub {
             my $links = $_[0]->DependedOnBy;
             return (
@@ -300,6 +304,7 @@
           }
     },
     ReferredToBy => {
+        title => 'Referred to By',
         value => sub {
             my $links = $_[0]->ReferredToBy;
             return (
@@ -317,6 +322,7 @@
     },
 
     DependsOn => {
+        title => 'Depends On',
         value => sub {
             my $links = $_[0]->DependsOn;
             return (
@@ -333,6 +339,7 @@
           }
     },
     MemberOf => {
+        title => 'Member Of',
         value => sub {
             my $links = $_[0]->MemberOf;
             return (
@@ -365,6 +372,7 @@
           }
     },
     RefersTo => {
+        title => 'Refers To',
         value => sub {
             my $links = $_[0]->RefersTo;
             return (
@@ -391,4 +399,5 @@
 
 # }}}
 $m->comp( '/Elements/Callback', COLUMN_MAP    => $COLUMN_MAP, _CallbackName => 'ColumnMap');
+return ColumnMap($Name, $Attr);
 </%INIT>

Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/TicketList
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/TicketList	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Elements/TicketList	Thu Nov 11 03:44:40 2004
@@ -22,17 +22,7 @@
 %# 
 %# END LICENSE BLOCK
 
-% if ($ShowNavigation) {
-%     my $FirstItem = $maxitems*($Page-1)+1;
-%     my $LastItem = $FirstItem + $Rows - 1;
-<&|/l, $FirstItem, $LastItem&>Results [_1] to [_2]</&>
-% }
-
-%# If you're having TicketList display a single record, you need
-%# to wrap the calls in your own table(s).
-% unless (defined $SingleRecord) {
 <TABLE BORDER=0 cellspacing=0 cellpadding=1 WIDTH=100%>
-% }
 
 % if ($ShowHeader) {
 <& /Elements/CollectionAsTable/Header, 
@@ -47,39 +37,37 @@
     maxitems => \$maxitems &> 
 % }
 
-% if (defined $SingleRecord) {
-<&   /Elements/CollectionAsTable/Row, Format => \@Format, i => 0, record => $SingleRecord, maxitems => $maxitems &>
-% } else {
 %   my $i;
 %   while (my $record = $Collection->Next) {
 %   $i++;
 <&   /Elements/CollectionAsTable/Row, Format => \@Format, i => $i, record => $record, maxitems => $maxitems &>
 %   }
-% }
 
-% unless (defined $SingleRecord) {
 </TABLE>
-% }
 
 % if ($Rows && $ShowNavigation) {
 <hr>
 <&|/l, $Page, int($TotalFound/$Rows)+1&>Page [_1] of [_2]</&>
 
 <%perl>
-my $prev =  $m->comp('/Elements/QueryString',
-                     Query => $Query,
-                     Format => $Format,
-                     Rows => $Rows,
-                     OrderBy => $OrderBy,
-                     Order => $Order,
-                     Page => ($Page-1));
-my $next =  $m->comp('/Elements/QueryString',
-                     Query => $Query,
-                     Format => $Format,
-                     Rows => $Rows,
-                     OrderBy => $OrderBy,
-                     Order => $Order,
-                     Page => ($Page+1));
+my $prev = $m->comp(
+    '/Elements/QueryString',
+    Query   => $Query,
+    Format  => $Format,
+    Rows    => $Rows,
+    OrderBy => $OrderBy,
+    Order   => $Order,
+    Page    => ( $Page - 1 )
+);
+my $next = $m->comp(
+    '/Elements/QueryString',
+    Query   => $Query,
+    Format  => $Format,
+    Rows    => $Rows,
+    OrderBy => $OrderBy,
+    Order   => $Order,
+    Page    => ( $Page + 1 )
+);
 </%perl>
 % if ($Page > 1) {
 <A href="<%$BaseURL%><%$prev%>"><&|/l&>Previous Page</&></a>
@@ -115,7 +103,6 @@
 $Page => 1
 $Title => 'Ticket Search'
 $Collection => undef
-$SingleRecord => undef
 $AllowSorting => undef
 $Order => undef
 $OrderBy => undef

Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/webrt.css
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/webrt.css	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/NoAuth/webrt.css	Thu Nov 11 03:44:40 2004
@@ -624,15 +624,6 @@
 BLOCKQUOTE {
   font-style: italic;
 }
-
-ADDRESS { 
-  text-align: right;
-  font-weight: bold;
-  font-style: italic 
-}
-
-
-
 div.menu {
         float: top;
         top: 51px;
@@ -653,7 +644,6 @@
 
 body>div.menu {position: fixed;}
 
-
 table.ticket-overview {
     width: 15%;
 }
@@ -711,9 +701,21 @@
 
 
 
-TH.collection-as-table {  text-align: center;}
-
-TD.collection-as-table {  text-align: left;}
+TH.collection-as-table {  text-align: center;
+                          font-size: 0.8em; 
+                          padding-left: .5em;
+                          padding-right: .5em;
+                          color: #333333;
+                          background-color: #999999;
+                          white-space: nowrap;
+                          border-collapse: collapse;
+                          border-bottom: solid #999999 1px; 
+                  }
+
+TD.collection-as-table {  text-align: left;
+                          padding-left: .5em;
+                          padding-right: .5em;
+                        }
 
 %# Provide a callback for adding/modifying the style sheet.
 %# http://www.w3.org/TR/REC-CSS1 - section 3.2, says:

Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Results.html
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Results.html	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/html/Search/Results.html	Thu Nov 11 03:44:40 2004
@@ -52,7 +52,6 @@
     Rows => $Rows,
     OrderBy => $OrderBy,
     Order => $Order &>
-<hr>
 <& /Elements/TicketList, 
     Query => $Query,
     AllowSorting => 1,

Modified: rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Principal_Overlay.pm
==============================================================================
--- rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Principal_Overlay.pm	(original)
+++ rt/branches/PLATANO-EXPERIMENTAL-CSS/lib/RT/Principal_Overlay.pm	Thu Nov 11 03:44:40 2004
@@ -43,7 +43,9 @@
 # those contributions and any derivatives thereof.
 # 
 # }}} END BPS TAGGED BLOCK
+#
 use strict;
+use warnings;
 
 no warnings qw(redefine);
 use vars qw(%_ACL_KEY_CACHE);
@@ -252,8 +254,7 @@
     }
 
     if ( !defined $args{'Right'} ) {
-        require Carp;
-        $RT::Logger->debug( Carp::cluck("HasRight called without a right") );
+        $RT::Logger->crit("HasRight called without a right" );
         return (undef);
     }
 


More information about the Rt-commit mailing list