From 9c68254528b6f2c7d8c1921b452fa56064783782 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:06:06 +0000 Subject: import rt 3.4.6 --- 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, 143 insertions(+), 173 deletions(-) (limited to 'rt/html/User') diff --git a/rt/html/User/Delegation.html b/rt/html/User/Delegation.html index 2587f8cde..3347fda1f 100644 --- a/rt/html/User/Delegation.html +++ b/rt/html/User/Delegation.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 %# %# %# (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/User/Elements/DelegateRights b/rt/html/User/Elements/DelegateRights index 3d42ed54e..79ecb5977 100644 --- a/rt/html/User/Elements/DelegateRights +++ b/rt/html/User/Elements/DelegateRights @@ -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 %# %# %# (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: @@ -57,7 +55,7 @@ my $object_obj = @{$objects->{$ObjectType}{$object}}[0]->Object; % } - + % while (my $pg = $personalgroups->Next) { % } @@ -78,14 +76,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 b0eba0f8e..2e79df268 100644 --- a/rt/html/User/Elements/GroupTabs +++ b/rt/html/User/Elements/GroupTabs @@ -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 %# %# %# (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/User/Elements/Tabs b/rt/html/User/Elements/Tabs index 0aca8b5c3..625b30f93 100644 --- a/rt/html/User/Elements/Tabs +++ b/rt/html/User/Elements/Tabs @@ -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 %# %# %# (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: @@ -61,12 +59,6 @@ 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 e5350c95e..2068e5a5b 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-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (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,36 +52,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%>) % }
    @@ -92,14 +90,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 da42f2c2a..c0e9ce575 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-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (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: @@ -55,27 +53,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 76ffac3af..6d2e15d47 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-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (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: @@ -50,12 +48,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 8c6d5f18e..f1c755826 100644 --- a/rt/html/User/Prefs.html +++ b/rt/html/User/Prefs.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 %# %# %# (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,133 +50,131 @@ <& /Elements/ListActions, actions => \@results &> -
- + + - - +
+ - - + - - +<& /Elements/TitleBoxEnd &> + + + - + - -
-<&| /Widgets/TitleBox, title => loc('Identity'), id => "user-prefs-identity" &> + +<& /Elements/TitleBoxStart, title => loc('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 &>
- -<&| /Widgets/TitleBox, title => loc('Phone numbers'), id => "user-prefs-phone" &> - +<& /Elements/TitleBoxEnd &> +
+<& /Elements/TitleBoxStart, title => loc('Phone numbers') &> +
- - + + - - + + - - + + - - + +
<&|/l&>Residence:<&|/l&>Residence:
<&|/l&>Work:<&|/l&>Work:
<&|/l&>Mobile:<&|/l&>Mobile:
<&|/l&>Pager:<&|/l&>Pager:
- -<& /Elements/Callback, _CallbackName => 'FormLeftColumn', UserObj => $UserObj, %ARGS &> -		 +<& /Elements/TitleBoxEnd &> + % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) { -<&| /Widgets/TitleBox, title => loc('Password'), id => "user-prefs-password" &> - - - + + +
+<& /Elements/TitleBoxStart, title => loc('Password') &> + + + - - - + + + - - -
<&|/l&>New Password: - - -
+ + +
<&|/l&>Retype Password: - - -
- +		 + +
+<& /Elements/TitleBoxEnd &> % } -<&| /Widgets/TitleBox, title => loc('Location'), id => "user-prefs-location" &> - +<& /Elements/TitleBoxStart, title => loc('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/Callback, _CallbackName => 'FormRightColumn', UserObj => $UserObj, %ARGS &> -
+ %if ($UserObj->Privileged) { -
-<&| /Widgets/TitleBox, title => loc('Signature') &> - - +
+<& /Elements/TitleBoxStart, title => loc('Signature') &> + +<& /Elements/TitleBoxEnd &> % } -
+ + -<& /Elements/Callback, _CallbackName => 'FormEnd', UserObj => $UserObj, %ARGS &> <& /Elements/Submit, Label => loc('Save Preferences') &>
@@ -209,12 +205,6 @@ 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