import rt 3.4.6

11 files changed, 168 insertions, 199 deletions

diff --git a/rt/html/Admin/Queues/CustomField.html b/rt/html/Admin/Queues/CustomField.html
index 52829277e..5beba58c8 100644
--- a/rt/html/Admin/Queues/CustomField.html
+++ b/rt/html/Admin/Queues/CustomField.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/html/Admin/Queues/CustomFields.html b/rt/html/Admin/Queues/CustomFields.html
index 8ce4f525d..4d7e08875 100644
--- a/rt/html/Admin/Queues/CustomFields.html
+++ b/rt/html/Admin/Queues/CustomFields.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/html/Admin/Queues/GroupRights.html b/rt/html/Admin/Queues/GroupRights.html
index 85075bdea..c5a12bfa3 100644
--- a/rt/html/Admin/Queues/GroupRights.html
+++ b/rt/html/Admin/Queues/GroupRights.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -52,63 +50,63 @@
     Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
 <& /Elements/ListActions, actions => \@results &>
 
-  <form method="post" action="GroupRights.html">
-    <input type="hidden" class="hidden" name="id" value="<% $QueueObj->id %>" />
+  <FORM METHOD=POST ACTION="GroupRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
       
       
 <h1><&|/l&>System groups</&></h1>
-<table>
+<TABLE>
 <& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
 % $Groups = RT::Groups->new($session{'CurrentUser'});
 % $Groups->LimitToSystemInternalGroups();
 %	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
 	    <% loc($Group->Type) %>
-		  </td>
-	  <td>
+		  </TD>
+	  <TD>
 	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
         Object => $QueueObj  &>
-	  </td>
-	</tr>
+	  </TD>
+	</TR>
 % }
-</table>
+</TABLE>
 <h1><&|/l&>Roles</&></h1>
-<table>
+<TABLE>
 % $Groups = RT::Groups->new($session{'CurrentUser'});
 % $Groups->LimitToRolesForQueue($QueueObj->Id);
 %	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
 	    <% loc($Group->Type) %>
-		  </td>
-	  <td>
+		  </TD>
+	  <TD>
 	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
         Object => $QueueObj  &>
-	  </td>
-	</tr>
+	  </TD>
+	</TR>
 % }
-</table>
+</TABLE>
 <h1><&|/l&>User defined groups</&></h1>
-<table>
+<TABLE>
 % $Groups = RT::Groups->new($session{'CurrentUser'});
 % $Groups->LimitToUserDefinedGroups();    
 %	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
 	    <% $Group->Name %>
-		  </td>
-	  <td>
+		  </TD>
+	  <TD>
 	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
         Object => $QueueObj  &>
-	  </td>
-	</tr>
+	  </TD>
+	</TR>
 % }
-</table>
+</TABLE>
             
       <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
       
-  </form>
+  </FORM>
   
 <%INIT>
  
diff --git a/rt/html/Admin/Queues/Modify.html b/rt/html/Admin/Queues/Modify.html
index e84d14fa4..5517a80c0 100644
--- a/rt/html/Admin/Queues/Modify.html
+++ b/rt/html/Admin/Queues/Modify.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -54,62 +52,62 @@
 
 
 
-<form action="<%$RT::WebPath%>/Admin/Queues/Modify.html" method="post">
+<FORM ACTION="<%$RT::WebPath%>/Admin/Queues/Modify.html" METHOD=POST>
 %if ($Create ) { 
-<input type="hidden" class="hidden" name="id" value="new" />
+<INPUT TYPE=HIDDEN NAME=id VALUE="new">
 % } else {
-<input type="hidden" class="hidden" name="id" value="<%$QueueObj->Id%>" />
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
 % }
 
-<table>
-<tr><td align="right">
+<TABLE>
+<TR><TD ALIGN=RIGHT>
 <&|/l&>Queue Name</&>: 
-</td>
-<td><input name="Name" value="<% ($Create) ? "" : $QueueObj->Name %>" /></td>
-</tr><tr>
-<td align="right">
-<&|/l&>Description</&>:</td><td colspan="3"><input name="Description" value="<% ($Create) ? "" : $QueueObj->Description %>" size="60" /></td></tr>
-<tr>
-<td align="right">
+</TD>
+<TD><INPUT name="Name" value="<% ($Create) ? "" : $QueueObj->Name %>"></TD>
+</TR><TR>
+<TD ALIGN=RIGHT>
+<&|/l&>Description</&>:</TD><TD COLSPAN=3><INPUT name="Description" value="<% ($Create) ? "" : $QueueObj->Description %>" size=60></TD></TR>
+<TR>
+<TD ALIGN=RIGHT>
 <&|/l&>Reply Address</&>:
-</td><td>
-<input name="CorrespondAddress" value="<% ($Create) ? "" : $QueueObj->CorrespondAddress %>" />
-<br /><span><em><&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1])</&></em></span>
-</td>
-<td align="right">
-
-<&|/l&>Comment Address</&>: </td><td>
-<input name="CommentAddress" value="<% ($Create) ? "" : $QueueObj->CommentAddress %>" />
-<br /><span><em><&|/l , $RT::CommentAddress&>(If left blank, will default to [_1])</&></em></span>
-</td>
-</tr><tr>
-
-<td align="right">
+</TD><TD>
+<INPUT name="CorrespondAddress" value="<% ($Create) ? "" : $QueueObj->CorrespondAddress %>">
+<BR><font size="-1"><i><&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1])</&></i></font>
+</TD>
+<TD ALIGN=RIGHT>
+
+<&|/l&>Comment Address</&>: </TD><TD>
+<INPUT NAME="CommentAddress" value="<% ($Create) ? "" : $QueueObj->CommentAddress %>">
+<BR><font size="-1"><i><&|/l , $RT::CommentAddress&>(If left blank, will default to [_1])</&></i></font>
+</TD>
+</TR><TR>
+
+<TD ALIGN=RIGHT>
 <&|/l&>Priority starts at</&>: 
-</td><td><input name="InitialPriority" value="<% ($Create) ? "" : $QueueObj->InitialPriority %>" />
-</td>
-<td align="right">
+</TD><TD><INPUT NAME="InitialPriority" value="<% ($Create) ? "" : $QueueObj->InitialPriority %>">
+</TD>
+<TD ALIGN=RIGHT>
 <&|/l&>Over time, priority moves toward</&>:
-</td><td><input name="FinalPriority" value="<% ($Create) ? "" : $QueueObj->FinalPriority %>" />
-</td>
-</tr>
-<tr>
-<td align="right">
+</TD><TD><INPUT NAME="FinalPriority" value="<% ($Create) ? "" : $QueueObj->FinalPriority %>">
+</TD>
+</TR>
+<TR>
+<TD ALIGN=RIGHT>
 <&|/l&>Requests should be due in</&>:
-</td><td>
-<input name="DefaultDueIn" value="<% ($Create) ? "" : $QueueObj->DefaultDueIn%>" /> <&|/l&>days</&>.
-</td>
-</tr>
-<tr>
-<td>
-</td>
-<td colspan="4"><input type="hidden" class="hidden" name="SetEnabled" value="1" />
-<input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /> <&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
+</TD><TD>
+<INPUT NAME="DefaultDueIn" VALUE="<% ($Create) ? "" : $QueueObj->DefaultDueIn%>"> <&|/l&>days</&>.
+</TD>
+</TR>
+<TR>
+<TD>
+</TD>
+<TD COLSPAN=4><INPUT TYPE=HIDDEN NAME="SetEnabled" VALUE="1">
+<INPUT TYPE=CHECKBOX NAME="Enabled" VALUE="1" <%$EnabledChecked%>> <&|/l&>Enabled (Unchecking this box disables this queue)</&><BR>
 <& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
-</td>
-</tr>
+</TD>
+</TR>
 
-</table>
+</TABLE>
 <& /Elements/Submit, Label => loc('Save Changes') &>
 </form>
 
diff --git a/rt/html/Admin/Queues/People.html b/rt/html/Admin/Queues/People.html
index 4eeda3c4f..e29b9d34f 100644
--- a/rt/html/Admin/Queues/People.html
+++ b/rt/html/Admin/Queues/People.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -54,12 +52,12 @@
 <& /Elements/ListActions, actions => \@results &>
 
  
-<form method="post" action="People.html">
-<input type="hidden" class="hidden" name="id" value="<%$QueueObj->Id%>" />
+<FORM METHOD=POST ACTION="People.html">
+<INPUT TYPE=HIDDEN NAME=id VALUE="<%$QueueObj->Id%>">
 
-<table width="100%">
-<tr>
-<td valign="top" >
+<TABLE WIDTH=100%>
+<TR>
+<TD VALIGN=TOP >
 
 <h3><&|/l&>Current watchers</&></h3>
 
@@ -73,25 +71,25 @@
 <& /Admin/Elements/EditQueueWatchers, QueueObj => $QueueObj, Watchers => $QueueObj->AdminCc &>
 
 
-</td>
-<td valign="top">
+</TD>
+<TD VALIGN=TOP>
 <h3><&|/l&>New watchers</&></h3>
 
-<&|/l&>Find people whose</&><br />
+<&|/l&>Find people whose</&><BR>
 <& /Elements/SelectUsers &>
-<input type="submit" class="button" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
-<br />
-<&|/l&>Find groups whose</&><br />
+<input type=submit name="OnlySearchForPeople" value="<&|/l&>Go!</&>">
+<BR>
+<&|/l&>Find groups whose</&><BR>
 <& /Elements/SelectGroups &>
-<input type="submit" class="button" name="OnlySearchForGroup" value="<&|/l&>Go!</&>" />
+<input type=submit name="OnlySearchForGroup" value="<&|/l&>Go!</&>">
 
 <p>
-<&|/l&>Add new watchers</&>:<br />
+<&|/l&>Add new watchers</&>:<br>
 <p>
-<strong><&|/l&>Users</&></strong>
+<b><&|/l&>Users</&></b>
 % if ($user_msg) {
-<br />
-<em><%$user_msg%></em>
+<br>
+<i><%$user_msg%></i>
 % } elsif ($Users) {
 <ul>
 % while (my $u = $Users->Next ) {
@@ -103,11 +101,11 @@
 % }
 
 <p>
-<strong><&|/l&>Groups</&></strong>
+<b><&|/l&>Groups</&></b>
 
 % if ($group_msg) {
-<br />
-<em><%$group_msg%></em>
+<br>
+<i><%$group_msg%></i>
 % } elsif ($Groups) {
 <ul>
 % while (my $g = $Groups->Next ) {
@@ -118,9 +116,9 @@
 </ul>
 % }
 
-</td>
-</tr>
-</table>
+</TD>
+</TR>
+</TABLE>
 
 
 
diff --git a/rt/html/Admin/Queues/Scrip.html b/rt/html/Admin/Queues/Scrip.html
index 190be8b48..1223fbfed 100644
--- a/rt/html/Admin/Queues/Scrip.html
+++ b/rt/html/Admin/Queues/Scrip.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -46,55 +44,46 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/QueueTabs, id => $QueueObj->Id,
-    QueueObj => $QueueObj,
-    current_tab => 'Admin/Queues/Scrips.html?id='.$QueueObj->id,
-    current_subtab => $current_subtab,
-    subtabs => $subtabs,
+<& /Admin/Elements/QueueTabs, id => $QueueObj->Id, 
+    QueueObj => $QueueObj,                                                      
+    current_tab => 'Admin/Queues/Scrips.html?id='.$QueueObj->id, 
+    current_subtab => $current_subtab, 
+    subtabs => $subtabs, 
     Title => $title &>
 
-<& /Elements/ListActions, actions => \@results &>
-<& /Admin/Elements/EditScrip, title => $title,  %ARGS, id => $id &>
-
+<& /Admin/Elements/EditScrip, title => $title,  %ARGS &>
 <%init>
-my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
-$QueueObj->Load( $Queue );
-unless( $QueueObj->id ) {
-    Abort(loc("Queue [_1] not found", $id));
-}
+my $QueueObj = new RT::Queue($session{'CurrentUser'});
+$QueueObj->Load($Queue);
 
 my ($title, $current_subtab);
-my $subtabs = {
-    A => {
-        title => loc('Select scrip'),
-        path  => "Admin/Queues/Scrips.html?id=".$QueueObj->id,
-    },
-    B => {
-        title => loc('New scrip'),
-        path => "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id,
-        separator => 1,
-    },
-};
-
-my $scrip = RT::Scrip->new( $session{'CurrentUser'} );
-($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
+my $subtabs = {                                                                               
+     A => { title => loc('Select scrip'),                                                     
+            path => "Admin/Queues/Scrips.html?id=".$QueueObj->id,
+               },                                                                             
+     B => { title => loc('New scrip'),                                                        
+            path => "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id,
+            separator => 1,                                                                   
+               }, 
+          };   
 
-if ( $id ) {
-    $current_subtab = "Admin/Queues/Scrip.html?id=$id&Queue=". $QueueObj->id;
+unless($QueueObj->id) {
+    Abort(loc("Queue [_1] not found",$id));
+}
+if ($id) {
+    $current_subtab = "Admin/Queues/Scrip.html?id=".$id."&Queue=".$QueueObj->id;
     $title = loc("Modify a scrip for queue [_1]", $QueueObj->Name);
-    $subtabs->{"C"} = {
-        title => loc("Scrip #[_1]",$id),
-        path  => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id
-    };
+    $subtabs->{"C"} = { title => loc("Scrip #[_1]",$id),
+			path => "Admin/Queues/Scrip.html?id=$id&Queue=".$QueueObj->id };
 } else {
     $current_subtab = "Admin/Queues/Scrip.html?create=1&Queue=".$QueueObj->id;
     $title = loc("Create a scrip for queue [_1]", $QueueObj->Name);
 }
-
+                                                                                             
 
 </%init>
 
 <%ARGS>
-$id => undef
+$id => undef  
 $Queue => undef
 </%ARGS>
diff --git a/rt/html/Admin/Queues/Scrips.html b/rt/html/Admin/Queues/Scrips.html
index 8fb0db400..e7092fb22 100644
--- a/rt/html/Admin/Queues/Scrips.html
+++ b/rt/html/Admin/Queues/Scrips.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -56,7 +54,7 @@
 % if (!$QueueObj->Disabled) { # Global scrips does not apply to disabled queues
 <h2><&|/l&>Scrips which apply to all queues</&></h2>
 <& /Admin/Elements/ListGlobalScrips &>
-<br /> 
+<BR> 
 % }
 <& /Admin/Elements/EditScrips, title => $title, %ARGS &>
 <%init>
diff --git a/rt/html/Admin/Queues/Template.html b/rt/html/Admin/Queues/Template.html
index 2d6343f99..c60a90900 100644
--- a/rt/html/Admin/Queues/Template.html
+++ b/rt/html/Admin/Queues/Template.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -54,19 +52,19 @@
      Title => $title &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Template.html">
+<FORM METHOD=POST ACTION="Template.html">
 %if ($Create ) {
-<input type="hidden" class="hidden" name="Template" value="new" />
+<INPUT TYPE=HIDDEN NAME="Template" VALUE="new">
 % } else {
-<input type="hidden" class="hidden" name="Template" value="<%$TemplateObj->Id%>" />
+<INPUT TYPE=HIDDEN NAME="Template" VALUE="<%$TemplateObj->Id%>">
 % }
 
 %# hang onto the queue id
-<input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" />
+<INPUT TYPE=HIDDEN name="Queue" value="<%$Queue%>">
 <& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description =>
 $TemplateObj->Description, Content => $TemplateObj->Content &> 
 <& /Elements/Submit, Label => loc('Create'), Reset => 1 &>
-</form>
+</FORM>
 
 
 <%INIT>
diff --git a/rt/html/Admin/Queues/Templates.html b/rt/html/Admin/Queues/Templates.html
index d62b4971c..888fdbc8a 100644
--- a/rt/html/Admin/Queues/Templates.html
+++ b/rt/html/Admin/Queues/Templates.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
diff --git a/rt/html/Admin/Queues/UserRights.html b/rt/html/Admin/Queues/UserRights.html
index c277f1797..399992ae2 100644
--- a/rt/html/Admin/Queues/UserRights.html
+++ b/rt/html/Admin/Queues/UserRights.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -52,31 +50,31 @@
     Title => loc('Modify user rights for queue [_1]', $QueueObj->Name) &>
 <& /Elements/ListActions, actions => \@results &>
 
-  <form method="post" action="UserRights.html">
-    <input type="hidden" class="hidden" name="id" value="<% $QueueObj->id %>" />
+  <FORM METHOD=POST ACTION="UserRights.html">
+    <INPUT TYPE=HIDDEN NAME=id VALUE="<% $QueueObj->id %>">
       
       
-<table>
+<TABLE>
 <& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &>
 %	while (my $Member = $Users->Next()) {
 % my $UserObj = $Member->MemberObj->Object();
 % my $group = RT::Group->new($session{'CurrentUser'});
 % $group->LoadACLEquivalenceGroup($Member->MemberObj);
-  <tr align="right"> 
-	<td valign="top">
+  <TR ALIGN=RIGHT> 
+	<TD VALIGN=TOP>
 	    <% $UserObj->Name %>
-		  </td>
-	  <td>
+		  </TD>
+	  <TD>
 	    <& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId,
         Object => $QueueObj  &>
-	  </td>
-	</tr>
+	  </TD>
+	</TR>
 % }
-      </table>
+      </TABLE>
             
       <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &>
       
-  </form>
+  </FORM>
   
 <%INIT>
  
diff --git a/rt/html/Admin/Queues/index.html b/rt/html/Admin/Queues/index.html
index bfa760409..28adf531c 100644
--- a/rt/html/Admin/Queues/index.html
+++ b/rt/html/Admin/Queues/index.html
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2007 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)
@@ -22,9 +22,7 @@
 %# 
 %# 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/copyleft/gpl.html.
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -54,19 +52,19 @@
 
 <h1><%$caption%></h1>
 <p><&|/l&>Select a queue</&>:</p>
-<ul>
+<UL>
 %if ($queues->Count == 0) {
-<li><em><&|/l&>No queues matching search criteria found.</&></em></li>
+<li><i><&|/l&>No queues matching search criteria found.</&></i></li>
 % }
 %while ( $queue = $queues->Next) {
-<li><a href="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></li>
+<li><A HREF="Modify.html?id=<%$queue->id%>"><%$queue->Name%></a></li>
 %}
-</ul>
-<br />
-<form method="post" action="<% $RT::WebPath %>/Admin/Queues/index.html">
-<input type="checkbox" class="checkbox" name="FindDisabledQueues" value="1" /> <&|/l&>Include disabled queues in listing.</&>
-<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
-</form>
+</UL>
+<BR>
+<FORM METHOD=POST ACTION="<% $RT::WebPath %>/Admin/Queues/index.html">
+<input type="checkbox" name="FindDisabledQueues" value="1"> <&|/l&>Include disabled queues in listing.</&>
+<div align=right><input type=submit value="<&|/l&>Go!</&>"></div> 
+</FORM>
 
 <%INIT>
 my ($queue, $caption);