From 8103c1fc1b2c27a6855feadf26f91b980a54bc52 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:11:51 +0000 Subject: import rt 3.6.6 --- rt/html/Admin/Queues/CustomField.html | 6 ++- rt/html/Admin/Queues/CustomFields.html | 6 ++- rt/html/Admin/Queues/GroupRights.html | 60 +++++++++++---------- rt/html/Admin/Queues/Modify.html | 96 +++++++++++++++++----------------- rt/html/Admin/Queues/People.html | 50 +++++++++--------- rt/html/Admin/Queues/Scrip.html | 67 ++++++++++++++---------- rt/html/Admin/Queues/Scrips.html | 8 +-- rt/html/Admin/Queues/Template.html | 16 +++--- rt/html/Admin/Queues/Templates.html | 6 ++- rt/html/Admin/Queues/UserRights.html | 28 +++++----- rt/html/Admin/Queues/index.html | 24 +++++---- 11 files changed, 199 insertions(+), 168 deletions(-) (limited to 'rt/html/Admin/Queues') diff --git a/rt/html/Admin/Queues/CustomField.html b/rt/html/Admin/Queues/CustomField.html index 5beba58c8..52829277e 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-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/Admin/Queues/CustomFields.html b/rt/html/Admin/Queues/CustomFields.html index 4d7e08875..8ce4f525d 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-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/Admin/Queues/GroupRights.html b/rt/html/Admin/Queues/GroupRights.html index c5a12bfa3..85075bdea 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-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,63 +52,63 @@ Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &> <& /Elements/ListActions, actions => \@results &> -
- + +

<&|/l&>System groups

- +
<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &> % $Groups = RT::Groups->new($session{'CurrentUser'}); % $Groups->LimitToSystemInternalGroups(); % while (my $Group = $Groups->Next()) { - - + - + - + + % } -
+
<% loc($Group->Type) %> - + <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId, Object => $QueueObj &> -
+

<&|/l&>Roles

- +
% $Groups = RT::Groups->new($session{'CurrentUser'}); % $Groups->LimitToRolesForQueue($QueueObj->Id); % while (my $Group = $Groups->Next()) { - - + - + - + + % } -
+
<% loc($Group->Type) %> - + <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId, Object => $QueueObj &> -
+

<&|/l&>User defined groups

- +
% $Groups = RT::Groups->new($session{'CurrentUser'}); % $Groups->LimitToUserDefinedGroups(); % while (my $Group = $Groups->Next()) { - - + - + - + + % } -
+
<% $Group->Name %> - + <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId, Object => $QueueObj &> -
+ <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &> -
+ <%INIT> diff --git a/rt/html/Admin/Queues/Modify.html b/rt/html/Admin/Queues/Modify.html index 5517a80c0..e84d14fa4 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-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,62 +54,62 @@ -
+ %if ($Create ) { - + % } else { - + % } - -
+ + - - - - - + + + + + - - - - + + + + - + - - - + + + - - - - + + + + - + + -
<&|/l&>Queue Name: -Name %>">
-<&|/l&>Description:Description %>" size=60>
+Name %>" />
+<&|/l&>Description:Description %>" size="60" />
<&|/l&>Reply Address: - -CorrespondAddress %>"> -
<&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1]) -		 - -<&|/l&>Comment Address: -CommentAddress %>"> -
<&|/l , $RT::CommentAddress&>(If left blank, will default to [_1]) -
+ +CorrespondAddress %>" /> +
<&|/l , $RT::CorrespondAddress&>(If left blank, will default to [_1]) +		 + +<&|/l&>Comment Address: +CommentAddress %>" /> +
<&|/l , $RT::CommentAddress&>(If left blank, will default to [_1]) +
<&|/l&>Priority starts at: -InitialPriority %>"> - +InitialPriority %>" /> + <&|/l&>Over time, priority moves toward: -FinalPriority %>"> -
+FinalPriority %>" /> +
<&|/l&>Requests should be due in: - -DefaultDueIn%>"> <&|/l&>days. -
- -> <&|/l&>Enabled (Unchecking this box disables this queue)
+		 +DefaultDueIn%>" /> <&|/l&>days. +
+ + /> <&|/l&>Enabled (Unchecking this box disables this queue)
<& /Elements/Callback, QueueObj => $QueueObj, results => \@results, %ARGS &> -
+
<& /Elements/Submit, Label => loc('Save Changes') &>
diff --git a/rt/html/Admin/Queues/People.html b/rt/html/Admin/Queues/People.html index e29b9d34f..4eeda3c4f 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-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,12 +54,12 @@ <& /Elements/ListActions, actions => \@results &> -
- + + - - - + +
+ + + - + - -

<&|/l&>Current watchers

@@ -71,25 +73,25 @@ <& /Admin/Elements/EditQueueWatchers, QueueObj => $QueueObj, Watchers => $QueueObj->AdminCc &> -		 +

<&|/l&>New watchers

-<&|/l&>Find people whose
+<&|/l&>Find people whose
<& /Elements/SelectUsers &> - -
-<&|/l&>Find groups whose
+ +
+<&|/l&>Find groups whose
<& /Elements/SelectGroups &> - +

-<&|/l&>Add new watchers:
+<&|/l&>Add new watchers:

-<&|/l&>Users +<&|/l&>Users % if ($user_msg) { -
-<%$user_msg%> +
+<%$user_msg%> % } elsif ($Users) {

    % while (my $u = $Users->Next ) { @@ -101,11 +103,11 @@ % }

    -<&|/l&>Groups +<&|/l&>Groups % if ($group_msg) { -
    -<%$group_msg%> +
    +<%$group_msg%> % } elsif ($Groups) {

      % while (my $g = $Groups->Next ) { @@ -116,9 +118,9 @@
    % } -
+
diff --git a/rt/html/Admin/Queues/Scrip.html b/rt/html/Admin/Queues/Scrip.html index 1223fbfed..190be8b48 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-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: @@ -44,46 +46,55 @@ %# %# 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 &> -<& /Admin/Elements/EditScrip, title => $title, %ARGS &> +<& /Elements/ListActions, actions => \@results &> +<& /Admin/Elements/EditScrip, title => $title, %ARGS, id => $id &> + <%init> -my $QueueObj = new RT::Queue($session{'CurrentUser'}); -$QueueObj->Load($Queue); +my $QueueObj = RT::Queue->new( $session{'CurrentUser'} ); +$QueueObj->Load( $Queue ); +unless( $QueueObj->id ) { + Abort(loc("Queue [_1] not found", $id)); +} 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 $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, + }, +}; -unless($QueueObj->id) { - Abort(loc("Queue [_1] not found",$id)); -} -if ($id) { - $current_subtab = "Admin/Queues/Scrip.html?id=".$id."&Queue=".$QueueObj->id; +my $scrip = RT::Scrip->new( $session{'CurrentUser'} ); +($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS ); + +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); } - + <%ARGS> -$id => undef +$id => undef $Queue => undef diff --git a/rt/html/Admin/Queues/Scrips.html b/rt/html/Admin/Queues/Scrips.html index e7092fb22..8fb0db400 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-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: @@ -54,7 +56,7 @@ % if (!$QueueObj->Disabled) { # Global scrips does not apply to disabled queues

<&|/l&>Scrips which apply to all queues

<& /Admin/Elements/ListGlobalScrips &> -
+
% } <& /Admin/Elements/EditScrips, title => $title, %ARGS &> <%init> diff --git a/rt/html/Admin/Queues/Template.html b/rt/html/Admin/Queues/Template.html index c60a90900..2d6343f99 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-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,19 +54,19 @@ Title => $title &> <& /Elements/ListActions, actions => \@results &> - + %if ($Create ) { - + % } else { - + % } %# hang onto the queue id - + <& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description => $TemplateObj->Description, Content => $TemplateObj->Content &> <& /Elements/Submit, Label => loc('Create'), Reset => 1 &> - + <%INIT> diff --git a/rt/html/Admin/Queues/Templates.html b/rt/html/Admin/Queues/Templates.html index 888fdbc8a..d62b4971c 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-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/Admin/Queues/UserRights.html b/rt/html/Admin/Queues/UserRights.html index 399992ae2..c277f1797 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-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,31 +52,31 @@ Title => loc('Modify user rights for queue [_1]', $QueueObj->Name) &> <& /Elements/ListActions, actions => \@results &> -
- + + - +
<& /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); - - + - + - + + % } -
+
<% $UserObj->Name %> - + <& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId, Object => $QueueObj &> -
+ <& /Elements/Submit, Label => loc('Modify User Rights'), Reset => 1 &> -
+ <%INIT> diff --git a/rt/html/Admin/Queues/index.html b/rt/html/Admin/Queues/index.html index 28adf531c..bfa760409 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-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,19 +54,19 @@

<%$caption%>

<&|/l&>Select a queue:

-
    +
      %if ($queues->Count == 0) { -
    • <&|/l&>No queues matching search criteria found.
      • +
    • <&|/l&>No queues matching search criteria found.
      • % } %while ( $queue = $queues->Next) { -
    • <%$queue->Name%>
      • +
    • <%$queue->Name%>
      • %} -
    -
    -
    - <&|/l&>Include disabled queues in listing. -
    -
    +
+
+
+ <&|/l&>Include disabled queues in listing. +
+
<%INIT> my ($queue, $caption); -- cgit v1.2.1