From ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 2 Aug 2007 19:56:20 +0000 Subject: import rt 3.6.4 --- rt/html/User/Delegation.html | 6 +- rt/html/User/Elements/DelegateRights | 18 ++-- rt/html/User/Elements/GroupTabs | 6 +- rt/html/User/Elements/Tabs | 12 ++- rt/html/User/Groups/Members.html | 54 +++++------ rt/html/User/Groups/Modify.html | 38 ++++---- rt/html/User/Groups/index.html | 14 +-- rt/html/User/Prefs.html | 168 +++++++++++++++++++---------------- 8 files changed, 173 insertions(+), 143 deletions(-) (limited to 'rt/html/User') diff --git a/rt/html/User/Delegation.html b/rt/html/User/Delegation.html index 3347fda1f..2587f8cde 100644 --- a/rt/html/User/Delegation.html +++ b/rt/html/User/Delegation.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/User/Elements/DelegateRights b/rt/html/User/Elements/DelegateRights index 79ecb5977..3d42ed54e 100644 --- a/rt/html/User/Elements/DelegateRights +++ b/rt/html/User/Elements/DelegateRights @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -55,7 +57,7 @@ my $object_obj = @{$objects->{$ObjectType}{$object}}[0]->Object; % } - + % while (my $pg = $personalgroups->Next) { % } @@ -76,14 +78,14 @@ while ( my $delegation = $delegations->Next) { % % while (my $pg = $personalgroups->Next) { - % } diff --git a/rt/html/User/Elements/GroupTabs b/rt/html/User/Elements/GroupTabs index 2e79df268..b0eba0f8e 100644 --- a/rt/html/User/Elements/GroupTabs +++ b/rt/html/User/Elements/GroupTabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: diff --git a/rt/html/User/Elements/Tabs b/rt/html/User/Elements/Tabs index 625b30f93..0aca8b5c3 100644 --- a/rt/html/User/Elements/Tabs +++ b/rt/html/User/Elements/Tabs @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -59,6 +61,12 @@ h => { title => loc('Delegation'), path => 'User/Delegation.html', }, + f => { title => loc('Search options'), + path => 'Prefs/SearchOptions.html', + }, + r => { title => loc('RT at a glance'), + path => 'Prefs/MyRT.html', + }, }; # Now let callbacks add their extra tabs diff --git a/rt/html/User/Groups/Members.html b/rt/html/User/Groups/Members.html index 2068e5a5b..e5350c95e 100644 --- a/rt/html/User/Groups/Members.html +++ b/rt/html/User/Groups/Members.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -52,36 +54,36 @@ -
- -
<&|/l&>Personal groups:<&|/l&>Personal groups:<%$pg->Name%>
-<% loc($right->RightName) %>
-
<&|/l, $right->PrincipalObj->Object->SelfDescription &>as granted to [_1]
+<% loc($right->RightName) %>
+
<&|/l, $right->PrincipalObj->Object->SelfDescription &>as granted to [_1]
 - {$pg->PrincipalId} && 'CHECKED' %>> + + {$pg->PrincipalId} && 'CHECKED' %> /> % if ( $del_hash->{$pg->PrincipalId}) { - + % }
- - + +
+ + + + + - + - + + - - + - + - -
<&|/l&>Add members - + <&|/l&>Current members -
+
<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group &> - + % if ($Group->MembersObj->Count == 0 ) { -<&|/l&>(No members) +<&|/l&>(No members) % } else { -<&|/l&>(Check box to delete) -
-
+<&|/l&>(Check box to delete) +
+
<&|/l&>Users % my $UserMembers = $Group->MembersObj; % $UserMembers->LimitToUsers(); -
    +
      % while (my $member = $UserMembers->Next()) { -
    • +
    • <%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>) % }
    @@ -90,14 +92,14 @@ % my $GroupMembers = $Group->MembersObj; % $GroupMembers->LimitToGroups(); % while (my $member = $GroupMembers->Next()) { -
  • +
  • <%$member->MemberObj->Object->Name%> % } % } -
-
+ +
<& /Elements/Submit, Label => loc('Modify Members') &> diff --git a/rt/html/User/Groups/Modify.html b/rt/html/User/Groups/Modify.html index c0e9ce575..da42f2c2a 100644 --- a/rt/html/User/Groups/Modify.html +++ b/rt/html/User/Groups/Modify.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -53,27 +55,27 @@ <& /Elements/ListActions, actions => \@results &> -
+ %unless ($Group->Id) { - + % } else { - + % } - - + + + + + +
+ + - - - - - -
<&|/l&>Name: -
-<&|/l&>Description:
- -> <&|/l&>Enabled (Unchecking this box disables this group)
-
+
+<&|/l&>Description:
+ + /> <&|/l&>Enabled (Unchecking this box disables this group)
+
<& /Elements/Submit, Label => loc('Save Changes'), Reset => 1 &>
<%INIT> diff --git a/rt/html/User/Groups/index.html b/rt/html/User/Groups/index.html index 6d2e15d47..76ffac3af 100644 --- a/rt/html/User/Groups/index.html +++ b/rt/html/User/Groups/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -48,12 +50,12 @@ current_subtab => 'User/Groups/index.html', Title => $title &> -<&|/l&>Personal groups:
- <%INIT> my $Groups = RT::Groups->new($session{'CurrentUser'}); diff --git a/rt/html/User/Prefs.html b/rt/html/User/Prefs.html index f1c755826..8c6d5f18e 100644 --- a/rt/html/User/Prefs.html +++ b/rt/html/User/Prefs.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC %# %# %# (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/copyleft/gpl.html. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -50,131 +52,133 @@ <& /Elements/ListActions, actions => \@results &> -
- + + - - +
+ - - + - - + +<& /Elements/Callback, _CallbackName => 'FormRightColumn', UserObj => $UserObj, %ARGS &> + + + - + - -
-<& /Elements/TitleBoxStart, title => loc('Identity') &> + +<&| /Widgets/TitleBox, title => loc('Identity'), id => "user-prefs-identity" &> - - + +
- - + + - - + + - - + + - - + +
<&|/l&>Email: <&|/l&>Email:
<&|/l&>Real Name:
<&|/l&>Real Name:
<&|/l&>Nickname:<&|/l&>Nickname:
<&|/l&>Language:<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &><&|/l&>Language:<& /Elements/SelectLang, Name => 'Lang', Default => $UserObj->Lang &>
-<& /Elements/TitleBoxEnd &> -
-<& /Elements/TitleBoxStart, title => loc('Phone numbers') &> - + +<&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &> +
- - + + - - + + - - + + - - + +
<&|/l&>Residence:<&|/l&>Residence:
<&|/l&>Work:<&|/l&>Work:
<&|/l&>Mobile:<&|/l&>Mobile:
<&|/l&>Pager:<&|/l&>Pager:
-<& /Elements/TitleBoxEnd &> -		 + +<& /Elements/Callback, _CallbackName => 'FormLeftColumn', UserObj => $UserObj, %ARGS &> + % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) { -<& /Elements/TitleBoxStart, title => loc('Password') &> - - - + + +
+<&| /Widgets/TitleBox, title => loc('Password'), id => "user-prefs-password" &> + + + - - - + + + - - -
<&|/l&>New Password: - - -
+ + +
<&|/l&>Retype Password: - - -
-<& /Elements/TitleBoxEnd &> +		 + +
+ % } -<& /Elements/TitleBoxStart, title => loc('Location') &> - +<&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &> +
- - + + - - + + - - + + - - + + - - + + - - + + - - + +
<&|/l&>Organization:<&|/l&>Organization:
<&|/l&>Address1:<&|/l&>Address1:
<&|/l&>Address2:<&|/l&>Address2:
<&|/l&>City:<&|/l&>City:
<&|/l&>State:<&|/l&>State:
<&|/l&>Zip:<&|/l&>Zip:
<&|/l&>Country:<&|/l&>Country:
-<& /Elements/TitleBoxEnd &> -
+ %if ($UserObj->Privileged) { -
-<& /Elements/TitleBoxStart, title => loc('Signature') &> - -<& /Elements/TitleBoxEnd &> +
+<&| /Widgets/TitleBox, title => loc('Signature') &> + + % } -
+ + +<& /Elements/Callback, _CallbackName => 'FormEnd', UserObj => $UserObj, %ARGS &> <& /Elements/Submit, Label => loc('Save Preferences') &>
@@ -205,6 +209,12 @@ 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, -- cgit v1.2.1