import rt 3.2.2

[freeside.git] / rt / html / User / Prefs.html

diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html
index 68f12b8..b5aa13d 100644 (file)
--- a/rt/html/User/Prefs.html
+++ b/rt/html/User/Prefs.html
@@ -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-2004 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,13 +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.
+%# 
+%# 
+%# 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.)
 %# 
-%# END LICENSE BLOCK
+%# 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
 <& /Elements/Header, Title=>loc("Preferences") &>
 <& /User/Elements/Tabs, 
     current_tab => 'User/Prefs.html', 
@@ -34,7 +56,7 @@
 <TABLE WIDTH=100% BORDER=0>
 <TR>
 
-<TD VALIGN=TOP ROWSPAN=2>
+<TD VALIGN=TOP class="boxcontainer">
 <& /Elements/TitleBoxStart, title => loc('Identity') &>
 
 <input type=hidden name="Name" value="<%$UserObj->Name%>">
@@ -78,7 +100,7 @@
 </table>
 <& /Elements/TitleBoxEnd &>
 </TD>
-<TD VALIGN=TOP>
+<TD VALIGN=TOP class="boxcontainer">
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
 <& /Elements/TitleBoxStart, title => loc('Password') &>
 <TABLE>
@@ -100,10 +122,7 @@
 </TABLE>
 <& /Elements/TitleBoxEnd &>
 % }
-</TD>
-<TR>
 
-<TD VALIGN=TOP>
 <& /Elements/TitleBoxStart, title => loc('Location') &>
 <table callspacing=0 cellpadding=0>
   <tr>
@@ -142,7 +161,7 @@
 
 
 
-<TD COLSPAN=2 VALIGN=TOP>
+<TD COLSPAN=2 VALIGN=TOP class="boxcontainer">
 %if ($UserObj->Privileged) {
 <BR>
 <& /Elements/TitleBoxStart, title => loc('Signature') &>