landing rt 3.4.4 on HEAD

17 files changed, 383 insertions, 264 deletions

diff --git a/rt/html/Admin/Global/CustomField.html b/rt/html/Admin/Global/CustomField.html
deleted file mode 100644
index 3871d8998..000000000
--- a/rt/html/Admin/Global/CustomField.html
+++ /dev/null
@@ -1,86 +0,0 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse@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., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# 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
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/SystemTabs, 
-    current_tab => 'Admin/Global/CustomFields.html',
-    current_subtab => $current_subtab, 
-    subtabs => $subtabs, 
-    Title => $title &>
-
-<& /Admin/Elements/EditCustomField, title => $title, %ARGS &>
-
-<%INIT>
-my ($title, $current_subtab);
-
-my $subtabs = {
-		 A => { title => loc('Select custom field'),
-  		     	path => "Admin/Global/CustomFields.html"
-			   },
-		 B => { title => loc('New custom field'),
-  		     	path => "Admin/Global/CustomField.html?create=1&Queue=0",
-			separator => 1,
-			   }
-	      };
-if ( $ARGS{'create'} ) {
-    $current_subtab = "Admin/Global/CustomField.html?create=1&Queue=0";
-    $title          = loc('Create a CustomField which applies to all queues');
-}
-else {
-    $current_subtab =
-      "Admin/Global/CustomField.html?CustomField=" . $CustomField . "&Queue=0";
-    $title = loc('Modify a CustomField which applies to all queues');
-    $subtabs->{"C"} = {
-        title => loc( 'Custom Field #[_1]', $CustomField ),
-        path => "Admin/Global/CustomField.html?CustomField=" . $CustomField . "&Queue=0"
-    };
-}
-</%INIT>
-<%ARGS>
-$CustomField => undef
-</%ARGS>
-<%ATTR>
-AutoFlush => 0
-</%ATTR>
diff --git a/rt/html/Admin/Global/CustomFields.html b/rt/html/Admin/Global/CustomFields.html
deleted file mode 100644
index 593040218..000000000
--- a/rt/html/Admin/Global/CustomFields.html
+++ /dev/null
@@ -1,69 +0,0 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
-%# 
-%# COPYRIGHT:
-%#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
-%#                                          <jesse@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., 675 Mass Ave, Cambridge, MA 02139, USA.
-%# 
-%# 
-%# 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
-<& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/SystemTabs, 
-    current_tab => 'Admin/Global/CustomFields.html',
-    current_subtab => 'Admin/Global/CustomFields.html', 
-    subtabs => $subtabs, 
-    Title => $title &>
-
-<& /Admin/Elements/EditCustomFields, title => $title, %ARGS &>
-
-<%INIT>
-my $subtabs = {
-		 A => { title => loc('Select custom field'),
-  		     	path => "Admin/Global/CustomFields.html"
-			   },
-		 B => { title => loc('New custom field'),
-  		     	path => "Admin/Global/CustomField.html?create=1&Queue=0",
-			separator => 1,
-			   }
-	      };
-my $title = loc("Modify Custom Fields which apply to all queues");
-</%INIT>
-<%ARGS>
-$id => undef
-</%ARGS>
diff --git a/rt/html/Elements/CollectionAsTable/Row b/rt/html/Elements/CollectionAsTable/Row
index 701966fcc..3316bc027 100644
--- a/rt/html/Elements/CollectionAsTable/Row
+++ b/rt/html/Elements/CollectionAsTable/Row
@@ -1,8 +1,14 @@
-%# BEGIN LICENSE BLOCK;
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
-%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explictly superceded by other copyright notices)
+%# (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
@@ -14,14 +20,29 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# Unless otherwise specified, all modifications, corrections or
-%# extensions to this work which alter its source code become the
-%# property of Best Practical Solutions, LLC when submitted for
-%# inclusion in the work.
+%# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
-%# END LICENSE BLOCK
-
+%# 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 }}}
 <%ARGS>
 $i => undef
 @Format => undef
@@ -32,42 +53,56 @@ $Warning => undef
 </%ARGS>
 
 <%PERL>
-$m->out( '<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+$m->out('<TR class="' . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
 my $item;
 foreach my $column (@Format) {
     if ( $column->{title} eq 'NEWLINE' ) {
-	while ($item < $maxitems) {
-	    $m->out("<td>&nbsp;</td>\n");
-	    $item++;
-	}
-	$item = 0;
+        while ( $item < $maxitems ) {
+            $m->out(qq{<td class="collection-as-table">&nbsp;</td>\n});
+            $item++;
+        }
+        $item = 0;
         $m->out('</TR>');
-        $m->out( '<TR class="' . 
-               ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' ) . '" >' );
+        $m->out('<TR class="'
+              . ( $Warning ? 'warnline' : $i % 2 ? 'oddline' : 'evenline' )
+              . '" >' );
         next;
     }
     $item++;
-    $m->out('<td align="left">');
+    $m->out('<td class="collection-as-table" ');
+    $m->out( 'align="' . $column->{align} . '"' ) if ( $column->{align} );
+    $m->out('>');
     foreach my $subcol ( @{ $column->{output} } ) {
         if ( $subcol =~ /^__(.*?)__$/o ) {
-            my $col = $1;
-            my $value = $m->comp('/Elements/RT__Ticket/ColumnMap', Name => $col, Attr => 'value');
+            my $col   = $1;
+            my $value = $m->comp(
+                '/Elements/RT__Ticket/ColumnMap',
+                Name => $col,
+                Attr => 'value'
+            );
+            my @out;
+
+            if ( $value && ref($value) ) {
+
+                # All HTML snippets are returned by the callback function
+                # as scalar references.  Data fetched from the objects are
+                # plain scalars, and needs to be escaped properly.
+                @out =
+                    map {
+                        ref($_) ? $$_ : $m->interp->apply_escapes( $_ => 'h' )
+                      } &{$value}( $record, $i )
+                ;
+            }
+            else {
 
-            if ( $value && ref($value)) {
-            	# All HTML snippets are returned by the callback function
-		# as scalar references.  Data fetched from the objects are
-		# plain scalars, and needs to be escaped properly.
-		$m->out( 
-		    map { ref($_) ? $$_ : $m->interp->apply_escapes( $_ => 'h' ) }
-		    &{ $value } ( $record, $i )
-	        );
-            } else {
-		# Simple value; just escape it.
-                $m->out( $m->interp->apply_escapes( $value => 'h' ) );
+                # Simple value; just escape it.
+                @out = $m->interp->apply_escapes( $value => 'h' );
             }
+            s/\n/<br>/gs for @out;
+            $m->out( @out );
         }
         else {
-            $m->out( Encode::decode_utf8($subcol) );
+            $m->out($subcol);
         }
     }
     $m->out('</td>');
diff --git a/rt/html/Elements/Footer b/rt/html/Elements/Footer
index 12432caaa..78a116f38 100644
--- a/rt/html/Elements/Footer
+++ b/rt/html/Elements/Footer
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 % if ($Menu) {
 </td>
 </tr>
@@ -52,21 +52,13 @@
 <& /Elements/Callback, %ARGS &>
 <!--
 <div class="bpscredits">
-<&|/l,     '&#187;&#124;&#171;', 
-     $RT::VERSION, 
-     '2004', 
-    '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>',
-&>[_1] RT [_2] Copyright 1996-[_3] [_4].</&><br>
+<&|/l,     '&#187;&#124;&#171;', $RT::VERSION, '2005', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&><br>
 % if (!$Menu) {
 <&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br>
 <&|/l, '<a href="mailto:sales@bestpractical.com">sales@bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br>
 % }
 </div>
 -->
-% if ($Debug) {
-<HR>
-<b><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></b>
-% }
 % if ($Debug >= 2 ) {
 % require Data::Dumper;
 % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]);
@@ -74,6 +66,7 @@
 <%$d->Dump() %>
 </pre>
 % }
+<div class="page-stats"><&|/l&>Time to display</&>: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%></div>
 % if ($Menu) {
 </TD>
 </TR>
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header
index 4a16d5667..b9518dcb7 100644
--- a/rt/html/Elements/Header
+++ b/rt/html/Elements/Header
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 %#<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <HTML>
 <HEAD>
@@ -77,15 +77,18 @@ ONLOAD="
 >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
   <tr> 
-    <td rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
+<<<<<<< Header
+    <td colspan=2 rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td>
     <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing</font></td>
     <td align="right" valign="top">
 % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) {
 <SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A> |</SPAN>
+%if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) {
 <A  HREF="<%$RT::WebPath%><% $Prefs %>" ><&|/l&>Preferences</&></A>
+% }
 <& /Elements/Callback, %ARGS &>
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
-| <A  HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL && "?URL=".$URL%>"><&|/l&>Logout</&></a>
+| <A  HREF="<%$RT::WebPath%>/NoAuth/Logout.html<%$URL ? "?URL=".$URL : ''%>"><&|/l&>Logout</&></a>
 % }
 <BR>
 <&|/l, "<b>".$session{'CurrentUser'}->Name."</b>" &>Logged in as [_1]</&>
@@ -130,7 +133,7 @@ require RT::URI::freeside;
 <%ARGS>
 $Prefs => '/User/Prefs.html'
 $Focus => 'focus'
-$Title => undef
+$Title =>  'RT'
 $Code => undef
 $Refresh => 0
 $Why => undef
diff --git a/rt/html/Elements/Menu b/rt/html/Elements/Menu
index e933fb4f0..398e3ab07 100644
--- a/rt/html/Elements/Menu
+++ b/rt/html/Elements/Menu
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 %# font size depends on level
 % if ($level ge 3) {
 %   $size = $basesize-(6);
@@ -69,16 +69,17 @@
 % } 
 % my $style="";
 % if ($sep) {
-% $style="border-top: solid #999 1px; padding-top: .1em; margin-top: .5em;";
+% $style="minor";
 % } elsif ($level == 0 ) {
-% $style="border-bottom: solid white 1px; padding-top: .25em; padding-bottom: .5em;" ;
+% $style="major";
 % }
 % if ($toptabs->{$tab}->{'separator'}) {
 % $sep=1;
 % } else {
 % $sep=0;
 % }
-<li style="<%$style%>"><A HREF="<% ($toptabs->{$tab}->{'path'} =~ /^http/) ? '' : "${RT::WebPath}/" %><%$toptabs->{$tab}->{'path'}%>" style="font-size: <%$size%>;" class="<%$class%>" 
+% my $url = $toptabs->{$tab}->{'path'} =~ /^https?:/i ? $toptabs->{$tab}->{'path'} : $RT::WebPath . "/" . $toptabs->{$tab}->{'path'};
+<li class="<%$class%>-<%$level%>-<%$style%>"><A HREF="<% $url %>" class="<%$class%>-<%$level%>" 
 <%($class eq 'currenttopnav') ? "name='focus'" : ""|n %> 
 <% !$level && "accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></A>
 %# Second-level items
diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout
index 41eae785f..94bdbe194 100644
--- a/rt/html/Elements/PageLayout
+++ b/rt/html/Elements/PageLayout
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <table class="lightgray" border=0 cellspacing=0 cellpadding=0 width="100%">
   <th class="lightgray" align="left" width=42%><span class="rtname"><%$AppName%></span>
   </th>
@@ -76,7 +76,7 @@
 % if ($actions->{"$action"}->{'html'}) {
 % push @actions, $actions->{"$action"}->{'html'}; 
 % } else {
-% push @actions,  "<A class='nav' HREF=\"".$RT::WebPath."/".$actions->{$action}->{'path'}."\">".$actions->{$action}->{'title'}."</A>";
+% push @actions,  qq|<a class="nav" href="|.$RT::WebPath."/".$actions->{$action}->{'path'}.qq|">|.$actions->{$action}->{'title'}."</a>";
 % }
 %  }
 %#<% join(" | ", @actions) | n %>
@@ -94,11 +94,12 @@
 </tr>
 <TR valign="top">
 <TD valign="top" width="100%" height="100%" class="mainbody" >
-
+<& /Elements/Callback, _CallbackName => 'BeforeBody',  %ARGS &>
+%$m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
 <%INIT>
 
   foreach my $tab (sort keys %{$toptabs}) {
-    if ($toptabs->{$tab}->{'path'} eq $current_toptab) {
+    if ($current_toptab && $toptabs->{$tab}->{'path'} eq $current_toptab) {
       $toptabs->{$tab}->{"subtabs"} = $tabs;
       $toptabs->{$tab}->{"current_subtab"} = $current_tab;
     }
diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch
index 213aa7eac..e76f801df 100644
--- a/rt/html/Elements/SimpleSearch
+++ b/rt/html/Elements/SimpleSearch
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <form action="<% $RT::WebPath %>/index.html">
 <input size="12" name="q" autocomplete="off" accesskey="0">
 <input type="submit" value="<&|/l&>Search tickets</&>">&nbsp;
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs
index 4a018bfad..f5839a9e5 100644
--- a/rt/html/Elements/Tabs
+++ b/rt/html/Elements/Tabs
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <& /Elements/PageLayout,
     current_toptab => $current_toptab,
     current_tab => $current_tab,
@@ -76,17 +76,25 @@ my $basetabs = {
                     C => { title => loc('Tools'),
                            path => 'Tools/Offline.html'
                          },
-                    E => { title => loc('Configuration'),
-                           path => 'Admin/'
-                         },
-                    K => { title => loc('Preferences'),
-                        path => 'User/Prefs.html'
-                      },
                     P => { title => loc('Approval'),
                            path => 'Approvals/'
                          },
                  };
 
+if ($session{'CurrentUser'}->HasRight( Right => 'ShowConfigTab', 
+				       Object => $RT::System )) {
+    $basetabs->{E} = { title => loc('Configuration'),
+                       path => 'Admin/',
+		     };
+}
+
+if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', 
+				       Object => $RT::System )) {
+    $basetabs->{K} = { title => loc('Preferences'),
+                       path => 'User/Prefs.html'
+		     };
+}
+
 if (!defined $toptabs) {
    $toptabs = $basetabs;
 }
diff --git a/rt/html/NoAuth/images/back_home.gif b/rt/html/NoAuth/images/back_home.gif
deleted file mode 100644
index 40b19c153..000000000
--- a/rt/html/NoAuth/images/back_home.gif
+++ /dev/null
diff --git a/rt/html/NoAuth/images/head_requestracker.gif b/rt/html/NoAuth/images/head_requestracker.gif
deleted file mode 100644
index 73315e918..000000000
--- a/rt/html/NoAuth/images/head_requestracker.gif
+++ /dev/null
diff --git a/rt/html/NoAuth/images/rt.jpg b/rt/html/NoAuth/images/rt.jpg
deleted file mode 100644
index a137a932b..000000000
--- a/rt/html/NoAuth/images/rt.jpg
+++ /dev/null
diff --git a/rt/html/NoAuth/images/spacer.gif b/rt/html/NoAuth/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d..000000000
--- a/rt/html/NoAuth/images/spacer.gif
+++ /dev/null
diff --git a/rt/html/NoAuth/images/squares_blue.gif b/rt/html/NoAuth/images/squares_blue.gif
deleted file mode 100644
index a28da5ce1..000000000
--- a/rt/html/NoAuth/images/squares_blue.gif
+++ /dev/null
diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css
index 4f8d8ed5d..845968b38 100644
--- a/rt/html/NoAuth/webrt.css
+++ b/rt/html/NoAuth/webrt.css
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 12px;
 %#	 color: #FFFFFF;
@@ -72,6 +72,109 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 color: #000000;
 	 text-decoration: none;
 	 white-space: nowrap}
+
+%# .topnav is the original RT class for the sidebar navigation tabs.
+%# Font-sizing by level depth was originally hard-coded into Elements/Menu.
+%# This modification sets a different class name for each level, allowing
+%# style sheet control over the formats.
+
+a.topnav-0 {  font-family: Verdana, sans-serif;
+	 font-size: 16px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.topnav-1 {  font-family: Verdana, sans-serif;
+	 font-size: 14px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.topnav-2 {  font-family: Verdana, sans-serif;
+	 font-size: 12px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.topnav-3 {  font-family: Verdana, sans-serif;
+	 font-size: 11px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.topnav-4 {  font-family: Verdana, sans-serif;
+	 font-size: 11px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.topnav-5 {  font-family: Verdana, sans-serif;
+	 font-size: 11px;
+	 font-weight: normal;
+	 color: #FFFFFF;
+	 text-decoration: none;
+	 white-space: nowrap}
+li.topnav-0-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.topnav-1-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.topnav-2-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.topnav-3-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.topnav-4-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.topnav-5-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.topnav-0-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.topnav-1-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.topnav-2-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.topnav-3-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.topnav-4-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.topnav-5-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+
 .currenttopnav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 16px;
          font-weight: bold;
@@ -79,6 +182,109 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 color: #000000; background-color: #cccccc;
 	 text-decoration: none;
 	 white-space: nowrap}
+
+%# .currenttopnav is the original RT class for the sidebar navigation tabs.
+%# Font-sizing by level depth was originally hard-coded into Elements/Menu.
+%# This modification sets a different class name for each level, allowing
+%# style sheet control over the formats
+
+a.currenttopnav-0 {  font-family: Verdana, sans-serif;
+	 font-size: 16px;
+         font-weight: bold;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.currenttopnav-1 {  font-family: Verdana, sans-serif;
+	 font-size: 14px;
+         font-weight: bold;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.currenttopnav-2 {  font-family: Verdana, sans-serif;
+	 font-size: 12px;
+         font-weight: normal;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.currenttopnav-3 {  font-family: Verdana, sans-serif;
+	 font-size: 11px;
+         font-weight: normal;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.currenttopnav-4 {  font-family: Verdana, sans-serif;
+	 font-size: 11px;
+         font-weight: normal;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+a.currenttopnav-5 {  font-family: Verdana, sans-serif;
+	 font-size: 11px;
+         font-weight: normal;
+	 color: #FFFF66;
+	 text-decoration: none;
+	 white-space: nowrap}
+li.currenttopnav-0-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.currenttopnav-1-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.currenttopnav-2-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.currenttopnav-3-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.currenttopnav-4-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.currenttopnav-5-minor {
+	 border-top: solid #999999 1px;
+	 padding-top: .1em;
+	 margin-top: .5em;
+}
+li.currenttopnav-0-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.currenttopnav-1-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.currenttopnav-2-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.currenttopnav-3-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.currenttopnav-4-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+li.currenttopnav-5-major {
+	 border-bottom: solid white 1px;
+	 padding-top: .25em;
+	 padding-bottom: .5em;
+}
+
 .topactions {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 font-size: 10px;
 	 color: #FFFFFF;
@@ -113,12 +319,12 @@ SPAN.nav {  font-family: Verdana, Arial, Helvetica, sans-serif;
 	 vertical-align: top;
 	 text-align: left;
          }
-.blueright {
-	 background-color: #4682B4;
-%#	 background-color: #eeeeee;
+%# Actually the "topactions" section
+.blueright {  background-color: #4682B4;
 	 background-position: left top;
 	 vertical-align: top;
 	 text-align: right;
+         padding-right: 1em;
          }
 .olddarkblue {  background-color: #003399;
 	 background-position: left top;
@@ -184,7 +390,7 @@ div.messagebody {
 
 
 div.downloadattachment {
-    font size: 10px;
+    font-size: 10px;
     text-align: right;
 
 }
@@ -389,32 +595,21 @@ SPAN.attribution {
 SPAN.label { font-size: 0.8em; 
 }
 
-BLOCKQUOTE {
-  font-style: italic;
-  /* color: #990; */
-}
+DIV.page-stats { font-size: 0.8em;
+                  color: #cccccc;
+                  text-align: right;
+              }
 
-ADDRESS { 
-  text-align: right;
-  font-weight: bold;
-  font-style: italic 
-}
 
-BLOCKQUOTE P {			/* Try to avoid space above the attribution */
-  margin-bottom: 0;
-}
-BLOCKQUOTE ADDRESS {
-  margin: 0;
+BLOCKQUOTE {
+  font-style: italic;
 }
 
-
 .emphasized {
   font-weight: bold
 }
 
 
-P.map-also { font-style: italic; margin-left: 15%; text-align: right }
-
 .oddline { 
         background-color : #ccccee;
 }
@@ -430,6 +625,43 @@ ul.topnav {
 	margin-bottom:0;
 }
 
+.menu-major-separator {
+	border-bottom: solid white 1px;
+	padding-top: .25em;
+	padding-bottom: .5em;
+}
+
+.menu-minor-separator {
+        border-top: solid #999999 1px;
+	padding-top: .1em;
+	margin-top: .5em;
+}
+
+TH.collection-as-table {  text-align: center;
+                          font-size: 0.8em; 
+                          padding-left: .5em;
+                          padding-right: .5em;
+                          color: #333333;
+                          background-color: #cccccc;
+                          white-space: nowrap;
+                  }
+
+TD.collection-as-table {  text-align: left;
+                          padding-left: .5em;
+                          padding-right: .5em;
+                        }
+
+textarea.signature {
+    width: 100%;
+}
+textarea.comments {
+    width: 100%;
+}
+
+textarea.messagebox {
+    width: 100%;
+}
+
 %# Provide a callback for adding/modifying the style sheet.
 %# http://www.w3.org/TR/REC-CSS1 - section 3.2, says:
 %#   "latter specified rule wins"
@@ -439,5 +671,5 @@ inherit => undef
 </%flags>
 <%init>
 $r->content_type('text/css');
-$r->headers_out->{'Expires'} = '+30m';
+#$r->headers_out->{'Expires'} = '+30m';
 </%init>
diff --git a/rt/html/Ticket/Elements/ShowSummary b/rt/html/Ticket/Elements/ShowSummary
index f3775eacf..5a6e7e099 100644
--- a/rt/html/Ticket/Elements/ShowSummary
+++ b/rt/html/Ticket/Elements/ShowSummary
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
       <TABLE WIDTH="100%" class="ticketsummary" >
       <TR>
 	<TD VALIGN=TOP WIDTH="50%" class="boxcontainer">
@@ -53,7 +53,7 @@
 	        <& /Ticket/Elements/ShowBasics, Ticket => $Ticket &>
 	  <& /Elements/TitleBoxEnd &>
           <br>
-% if ($Ticket->QueueObj->CustomFields()->First) {
+% if ($Ticket->QueueObj->TicketCustomFields->First) {
 	  <& /Elements/TitleBoxStart, title => loc('Custom Fields'), 
 		title_href =>"$RT::WebPath/Ticket/Modify.html?id=".$Ticket->Id, 
 		title_class=> 'inverse',  
diff --git a/rt/html/Ticket/Elements/Tabs b/rt/html/Ticket/Elements/Tabs
index 64fa13165..46e1d4a27 100644
--- a/rt/html/Ticket/Elements/Tabs
+++ b/rt/html/Ticket/Elements/Tabs
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,7 +42,7 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <& /Elements/Callback, Ticket => $Ticket, actions=> $actions, tabs => $tabs, %ARGS &>
 <& /Elements/Tabs, 
     tabs => $tabs, 
@@ -123,7 +123,7 @@ my $ticket_page_tabs = {
             path  => "Ticket/ModifyCustomers.html?id=" . $id, },
     _F => { title => loc('Jumbo'),
             path  => "Ticket/ModifyAll.html?id=" . $id,
-            seperator => 1
+            separator => 1
  },
 
 };
@@ -189,6 +189,7 @@ my $args = "?" . $m->comp(
     Order   => $ARGS{'Order'}   || $session{'CurrentSearchHash'}->{'Order'},
     Rows    => $ARGS{'Rows'},
   ) if ($ARGS{'Query'} or $session{'CurrentSearchHash'}->{'Query'});
+$args ||= '';
 
 $tabs->{"f"} = { path      => "Search/Build.html?NewQuery=1",
                  title     => loc('New Query')};
@@ -213,7 +214,7 @@ if (defined $session{'tickets'} and $session{'tickets'}->Count) {
 <%ARGS>
 $Ticket => undef
 $subtabs => undef
-$current_tab => undef
-$current_subtab => undef
+$current_tab => ''
+$current_subtab => ''
 $Title => undef
 </%ARGS>