X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fhtml%2FUser%2FPrefs.html;h=54a950d7c1d2520e63b3ea85f7a0401ea192d257;hb=fc6209f398899f0211cfcedeb81a3cd65e04a941;hp=b5aa13db9b28ee6e9e19eb13927495f07a280943;hpb=d39d52aac8f38ea9115628039f0df5aa3ac826de;p=freeside.git

diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html
index b5aa13db9..54a950d7c 100644
--- a/rt/html/User/Prefs.html
+++ b/rt/html/User/Prefs.html
@@ -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-2009 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# 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.
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -42,7 +44,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/Header, Title=>loc("Preferences") &>
 <& /User/Elements/Tabs, 
     current_tab => 'User/Prefs.html', 
@@ -50,131 +52,133 @@
 
 <& /Elements/ListActions, actions => \@results &>
 
-<FORM ACTION="<%$RT::WebPath%>/User/Prefs.html" METHOD=POST>
-<INPUT TYPE=HIDDEN NAME=id VALUE="<%$UserObj->Id%>">
+<form action="<%$RT::WebPath%>/User/Prefs.html" method="post">
+<input type="hidden" class="hidden" name="id" value="<%$UserObj->Id%>" />
 
-<TABLE WIDTH=100% BORDER=0>
-<TR>
+<table width="100%" border="0">
+<tr>
 
-<TD VALIGN=TOP class="boxcontainer">
-<& /Elements/TitleBoxStart, title => loc('Identity') &>
+<td valign="top" class="boxcontainer">
+<&| /Widgets/TitleBox, title => loc('Identity'), id => "user-prefs-identity" &>
 
-<input type=hidden name="Name" value="<%$UserObj->Name%>">
-<table callspacing=0 cellpadding=0>
+<input type="hidden" class="hidden" name="Name" value="<%$UserObj->Name%>" />
+<table cellspacing="0" cellpadding="0">
   <tr>
-    <td class=label><&|/l&>Email</&>: </td>
-    <td class=value><input name="EmailAddress" value="<%$UserObj->EmailAddress%>"></td>
+    <td class="label"><&|/l&>Email</&>: </td>
+    <td class="value"><input name="EmailAddress" value="<%$UserObj->EmailAddress%>" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Real Name</&>:</td>
-    <td class=value><input name="RealName" value="<%$UserObj->RealName%>"></td>  </tr>
+    <td class="label"><&|/l&>Real Name</&>:</td>
+    <td class="value"><input name="RealName" value="<%$UserObj->RealName%>" /></td>  </tr>
   <tr>
-    <td class=label><&|/l&>Nickname</&>:</td>
-    <td class=value><input name="NickName" value="<%$UserObj->NickName%>"></td>
+    <td class="label"><&|/l&>Nickname</&>:</td>
+    <td class="value"><input name="NickName" value="<%$UserObj->NickName%>" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Language</&>:</td>
-    <td class=value><& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &></td>
+    <td class="label"><&|/l&>Language</&>:</td>
+    <td class="value"><& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &></td>
   </tr>
 </table>
-<& /Elements/TitleBoxEnd &>
-<br>
-<& /Elements/TitleBoxStart, title => loc('Phone numbers') &>
-<table callspacing=0 cellpadding=0>
+</&>
+<&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &>
+<table cellspacing="0" cellpadding="0">
   <tr>
-    <td class=label><&|/l&>Residence</&>:</td>
-    <td class=value><input name="HomePhone" value="<%$UserObj->HomePhone%>" size=13></td>
+    <td class="label"><&|/l&>Residence</&>:</td>
+    <td class="value"><input name="HomePhone" value="<%$UserObj->HomePhone%>" size="13" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Work</&>:</td>
-    <td class=value><input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size=13></td>
+    <td class="label"><&|/l&>Work</&>:</td>
+    <td class="value"><input name="WorkPhone" value="<%$UserObj->WorkPhone%>" size="13" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Mobile</&>:</td>
-    <td class=value><input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size=13></td>
+    <td class="label"><&|/l&>Mobile</&>:</td>
+    <td class="value"><input name="MobilePhone" value="<%$UserObj->MobilePhone%>" size="13" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Pager</&>:</td>
-    <td class=value><input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size=13></td>
+    <td class="label"><&|/l&>Pager</&>:</td>
+    <td class="value"><input name="PagerPhone" value="<%$UserObj->PagerPhone%>" size="13" /></td>
   </tr>
 </table>
-<& /Elements/TitleBoxEnd &>
-</TD>
-<TD VALIGN=TOP class="boxcontainer">
+</&>
+<& /Elements/Callback, _CallbackName => 'FormLeftColumn', UserObj => $UserObj, %ARGS &>
+</td>
+<td valign="top" class="boxcontainer">
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
-<& /Elements/TitleBoxStart, title => loc('Password') &>
-<TABLE>
-<TR>
-<TD class=label>
+<&| /Widgets/TitleBox, title => loc('Password'), id => "user-prefs-password" &>
+<table>
+<tr>
+<td class="label">
 <&|/l&>New Password</&>:
-</TD>
-<TD class=value>
-<input type=password name="Pass1">
-</TD>
-</TR>
-<TR><TD class=label>
+</td>
+<td class="value">
+<input type="password" name="Pass1" />
+</td>
+</tr>
+<tr><td class="label">
 <&|/l&>Retype Password</&>:
-</TD>
-<TD class=value>
-<input type=password name="Pass2">
-</TD>
-</TR>
-</TABLE>
-<& /Elements/TitleBoxEnd &>
+</td>
+<td class="value">
+<input type="password" name="Pass2" />
+</td>
+</tr>
+</table>
+</&>
 % }
 
-<& /Elements/TitleBoxStart, title => loc('Location') &>
-<table callspacing=0 cellpadding=0>
+<&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &>
+<table cellspacing="0" cellpadding="0">
   <tr>
-    <td class=label><&|/l&>Organization</&>:</td>
-    <td class=value><input name="Organization" value="<%$UserObj->Organization%>"></td>
+    <td class="label"><&|/l&>Organization</&>:</td>
+    <td class="value"><input name="Organization" value="<%$UserObj->Organization%>" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Address1</&>:</td>
-    <td class=value><input name="Address1" value="<%$UserObj->Address1%>"></td>
+    <td class="label"><&|/l&>Address1</&>:</td>
+    <td class="value"><input name="Address1" value="<%$UserObj->Address1%>" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Address2</&>:</td>
-    <td class=value><input name="Address2" value="<%$UserObj->Address2%>"></td>
+    <td class="label"><&|/l&>Address2</&>:</td>
+    <td class="value"><input name="Address2" value="<%$UserObj->Address2%>" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>City</&>:</td>
-    <td><input name="City" value="<%$UserObj->City%>" size=14></td>
+    <td class="label"><&|/l&>City</&>:</td>
+    <td><input name="City" value="<%$UserObj->City%>" size="14" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>State</&>:</td>
-    <td class=value><input name="State" value="<%$UserObj->State%>" size=3></td>
+    <td class="label"><&|/l&>State</&>:</td>
+    <td class="value"><input name="State" value="<%$UserObj->State%>" size="3" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Zip</&>:</td>
-    <td class=value><input name="Zip" value="<%$UserObj->Zip%>" size=9></td>
+    <td class="label"><&|/l&>Zip</&>:</td>
+    <td class="value"><input name="Zip" value="<%$UserObj->Zip%>" size="9" /></td>
   </tr>
   <tr>
-    <td class=label><&|/l&>Country</&>:</td>
-    <td class=value><input name="Country" value="<%$UserObj->Country%>"></td>
+    <td class="label"><&|/l&>Country</&>:</td>
+    <td class="value"><input name="Country" value="<%$UserObj->Country%>" /></td>
   </tr>
 </table>
-<& /Elements/TitleBoxEnd &>
-</TD>
-</TR>
-<TR>
+</&>
+<& /Elements/Callback, _CallbackName => 'FormRightColumn', UserObj => $UserObj, %ARGS &>
+</td>
+</tr>
+<tr>
 
 
 
-<TD COLSPAN=2 VALIGN=TOP class="boxcontainer">
+<td colspan="2" valign="top" class="boxcontainer">
 %if ($UserObj->Privileged) {
-<BR>
-<& /Elements/TitleBoxStart, title => loc('Signature') &>
-<TEXTAREA COLS=80 ROWS=5 name="Signature" WRAP=HARD>
-<%$UserObj->Signature%></TEXTAREA>
-<& /Elements/TitleBoxEnd &>
+<br />
+<&| /Widgets/TitleBox, title => loc('Signature') &>
+<textarea cols="80" rows="5" name="Signature" class="signature" wrap="hard">
+<%$UserObj->Signature%></textarea>
+</&>
 % }
 
-</TD>
+</td>
 
-</TR>
-</TABLE>
+</tr>
+</table>
 
+<& /Elements/Callback, _CallbackName => 'FormEnd', UserObj => $UserObj, %ARGS &>
 
 <& /Elements/Submit, Label => loc('Save Preferences') &>
 </form>
@@ -205,14 +209,21 @@ if ($UserObj->Id) {
 		    AuthSystem HomePhone WorkPhone MobilePhone PagerPhone Address1
 		Address2 City State Zip Country Lang
 		   );
+
+    $m->comp('/Elements/Callback', _CallbackName => 'UpdateLogic',
+                                    fields        => \@fields,
+                                    results       => \@results,
+                                    UserObj       => $UserObj,
+                                    ARGSRef       => \%ARGS);
     
     my @fieldresults = UpdateRecordObject ( AttributesRef => \@fields,
 					    Object => $UserObj,
 					    ARGSRef => \%ARGS );
     if ($Lang) {
-        $session{'CurrentUser'}->LanguageHandle($Lang);
-        $session{'CurrentUser'}= $session{'CurrentUser'}; # Force writeback
+	$session{'CurrentUser'}->LanguageHandle($Lang);
+	$session{'CurrentUser'} = $session{'CurrentUser'}; # force writeback
     }
+
     push (@results,@fieldresults);