[Rt-commit] rt branch, 3.999-trunk, updated. 766db0356ef83099f935c1290d18e56a466024b6
jesse
jesse at bestpractical.com
Mon Oct 5 15:01:01 EDT 2009
The branch, 3.999-trunk has been updated
via 766db0356ef83099f935c1290d18e56a466024b6 (commit)
from 16afa3cfe5f90c52697e8e61d7d1d348a02dd520 (commit)
Summary of changes:
share/html/Admin/Elements/QueueTabs | 4 --
share/html/Admin/Elements/SystemTabs | 4 --
share/html/Admin/Global/Scrip.html | 87 -----------------------------
share/html/Admin/Global/Scrips.html | 78 --------------------------
share/html/Admin/Global/index.html | 5 --
share/html/Admin/Queues/Modify.html | 2 +-
share/html/Admin/Queues/Scrip.html | 100 ----------------------------------
share/html/Admin/Queues/Scrips.html | 88 ------------------------------
8 files changed, 1 insertions(+), 367 deletions(-)
delete mode 100755 share/html/Admin/Global/Scrip.html
delete mode 100755 share/html/Admin/Global/Scrips.html
delete mode 100755 share/html/Admin/Queues/Scrip.html
delete mode 100755 share/html/Admin/Queues/Scrips.html
- Log -----------------------------------------------------------------
commit 766db0356ef83099f935c1290d18e56a466024b6
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Oct 5 15:00:37 2009 -0400
Remove the old scrips admin UI, now that scrips are dead
diff --git a/share/html/Admin/Elements/QueueTabs b/share/html/Admin/Elements/QueueTabs
index 60d30c6..5e7e255 100755
--- a/share/html/Admin/Elements/QueueTabs
+++ b/share/html/Admin/Elements/QueueTabs
@@ -65,10 +65,6 @@ if ($id) {
D => { title => _('Watchers'),
path => "Admin/Queues/People.html?id=".$id,
},
-
- E => { title => _('Scrips'),
- path => "Admin/Queues/Scrips.html?id=".$id,
- },
F => { title => _('Templates'),
path => "Admin/Queues/Templates.html?id=".$id,
},
diff --git a/share/html/Admin/Elements/SystemTabs b/share/html/Admin/Elements/SystemTabs
index ec7b804..1363e06 100755
--- a/share/html/Admin/Elements/SystemTabs
+++ b/share/html/Admin/Elements/SystemTabs
@@ -52,10 +52,6 @@
<%INIT>
my $tabs = {
-
- A => { title => _('Scrips'),
- path => 'Admin/Global/Scrips.html',
- },
B => { title => _('Templates'),
path => 'Admin/Global/Templates.html',
},
diff --git a/share/html/Admin/Global/Scrip.html b/share/html/Admin/Global/Scrip.html
deleted file mode 100755
index ca3a0bb..0000000
--- a/share/html/Admin/Global/Scrip.html
+++ /dev/null
@@ -1,87 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (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
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# 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/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# 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.)
-%#
-%# 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 }}}
-<&| /Admin/Elements/Header, title => $title &>
-<& /Admin/Elements/SystemTabs,
- current_tab => 'Admin/Global/Scrips.html',
- current_subtab => $current_subtab,
- subtabs => $subtabs,
- title => $title &>
-
-<& /Elements/ListActions, actions => \@results &>
-<& /Admin/Elements/EditScrip, title => $title, %ARGS, id => $id &>
-
-</&>
-<%init>
-my $subtabs = {
- A => {
- title => _('Select scrip'),
- path => "Admin/Global/Scrips.html",
- },
- B => {
- title => _('New scrip'),
- path => "Admin/Global/Scrip.html?create=1&queue=0",
- separator => 1,
- },
-};
-
-my ($id, @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
-
-my ($title, $current_subtab);
-if ( $id ) {
- $current_subtab = "Admin/Global/Scrip.html?id=$id&queue=0";
- $title = _("Modify a scrip that applies to all queues");
- $subtabs->{"C"} = {
- title => _('Scrip #%1', $id),
- path => "Admin/Global/Scrip.html?id=$id&queue=0",
- };
-}
-else {
- $current_subtab = "Admin/Global/Scrip.html?create=1&queue=0";
- $title = _("Add a scrip which will apply to all queues");
-}
-</%init>
diff --git a/share/html/Admin/Global/Scrips.html b/share/html/Admin/Global/Scrips.html
deleted file mode 100755
index d61ba58..0000000
--- a/share/html/Admin/Global/Scrips.html
+++ /dev/null
@@ -1,78 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (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
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# 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/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# 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.)
-%#
-%# 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 }}}
-<&| /Admin/Elements/Header, title => $title &>
-<& /Admin/Elements/SystemTabs,
- current_tab => 'Admin/Global/Scrips.html',
- current_subtab => 'Admin/Global/Scrips.html',
- subtabs => $subtabs,
- title => $title &>
-<& /Admin/Elements/EditScrips, title => $title, id => $id, %ARGS &>
-</form>
-</&>
-<%init>
-
-my $subtabs = {
- A => { title => _('Select scrip'),
- path => "Admin/Global/Scrips.html",
- },
- B => { title => _('New scrip'),
- path => "Admin/Global/Scrip.html?create=1&queue=0",
- separator => 1,
- }
- };
-my $title = _("Modify scrips which apply to all queues");
-
-my (@actions);
-
-</%init>
-
-
-
-<%ARGS>
-$id => 0
-</%ARGS>
diff --git a/share/html/Admin/Global/index.html b/share/html/Admin/Global/index.html
index 10aeafe..2c10888 100755
--- a/share/html/Admin/Global/index.html
+++ b/share/html/Admin/Global/index.html
@@ -53,11 +53,6 @@
</&>
<%INIT>
my $tabs = {
- A => {
- title => _('Scrips'),
- text => _('Modify scrips which apply to all queues'),
- path => '/Admin/Global/Scrips.html',
- },
B => {
title => _('Templates'),
text => _('Edit system templates'),
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index fe876d1..30d2c47 100755
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -80,7 +80,7 @@
<br /><span><em><&|/l , RT->config->get('correspond_address')&>(If left blank, will default to %1)</&></em></span></td>
<td align="right"><&|/l&>comment Address</&>:</td>
<td><input name="comment_address" value="<% ($create) ? "" : $queue_obj->comment_address %>" />
-<br /><span><em><&|/l , RT->config->get('comment_address')&>(If left blank, will default to %1)</&></em></span></td>
+<br /><span><em><&|/l , (RT->config->get('comment_address')||'')&>(If left blank, will default to %1)</&></em></span></td>
</tr>
<tr><td align="right"><&|/l&>Priority starts at</&>:</td>
diff --git a/share/html/Admin/Queues/Scrip.html b/share/html/Admin/Queues/Scrip.html
deleted file mode 100755
index c957721..0000000
--- a/share/html/Admin/Queues/Scrip.html
+++ /dev/null
@@ -1,100 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (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
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# 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/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# 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.)
-%#
-%# 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 }}}
-<&| /Admin/Elements/Header, title => $title &>
-<& /Admin/Elements/QueueTabs, id => $queue_obj->id,
- queue_obj => $queue_obj,
- current_tab => 'Admin/Queues/Scrips.html?id='.$queue_obj->id,
- current_subtab => $current_subtab,
- subtabs => $subtabs,
- title => $title &>
-
-<& /Elements/ListActions, actions => \@results &>
-<& /Admin/Elements/EditScrip, title => $title, %ARGS, id => $id &>
-
-</&>
-<%init>
-my $queue_obj = RT::Model::Queue->new( current_user => Jifty->web->current_user );
-$queue_obj->load( $queue );
-unless( $queue_obj->id ) {
- abort(_("Queue %1 not found", $id));
-}
-
-my ($title, $current_subtab);
-my $subtabs = {
- A => {
- title => _('Select scrip'),
- path => "Admin/Queues/Scrips.html?id=".$queue_obj->id,
- },
- B => {
- title => _('New scrip'),
- path => "Admin/Queues/Scrip.html?create=1&queue=".$queue_obj->id,
- separator => 1,
- },
-};
-
-($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS );
-
-if ( $id ) {
- $current_subtab = "Admin/Queues/Scrip.html?id=$id&queue=". $queue_obj->id;
- $title = _("Modify a scrip for queue %1", $queue_obj->name);
- $subtabs->{"C"} = {
- title => _("Scrip #%1",$id),
- path => "Admin/Queues/Scrip.html?id=$id&queue=".$queue_obj->id
- };
-} else {
- $current_subtab = "Admin/Queues/Scrip.html?create=1&queue=".$queue_obj->id;
- $title = _("Create a scrip for queue %1", $queue_obj->name);
-}
-
-
-</%init>
-
-<%ARGS>
-$id => undef
-$queue => undef
-</%ARGS>
diff --git a/share/html/Admin/Queues/Scrips.html b/share/html/Admin/Queues/Scrips.html
deleted file mode 100755
index 3332367..0000000
--- a/share/html/Admin/Queues/Scrips.html
+++ /dev/null
@@ -1,88 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
-%# <jesse at bestpractical.com>
-%#
-%# (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
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# 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/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# 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.)
-%#
-%# 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 }}}
-<&| /Admin/Elements/Header, title => $title &>
-<& /Admin/Elements/QueueTabs, id => $queue_obj->id,
- queue_obj => $queue_obj,
- current_tab => 'Admin/Queues/Scrips.html?id='.$id,
- current_subtab => 'Admin/Queues/Scrips.html?id='.$id,
- subtabs => $subtabs,
- title => $title &>
-
-% unless ( $queue_obj->disabled ) { # Global scrips does not apply to disabled queues
-<h2><&|/l&>scrips which apply to all queues</&></h2>
-<& /Admin/Elements/ListGlobalScrips &>
-<br />
-% }
-<& /Admin/Elements/EditScrips, title => $title, %ARGS &>
-</&>
-<%init>
-my $queue_obj = RT::Model::Queue->new( current_user => Jifty->web->current_user );
-$queue_obj->load($id);
-
-my $title;
-
-if ($queue_obj->id) {
- $title = _("Modify scrips for queue %1", $queue_obj->name);
-} else {
- abort(_("Queue %1 not found",$id));
-}
-
-my $subtabs = {
- A => { title => _('Select scrip'),
- path => "Admin/Queues/Scrips.html?id=".$id,
- },
- B => { title => _('New scrip'),
- path => "Admin/Queues/Scrip.html?create=1&queue=".$id,
- separator => 1,
- }
- };
-</%init>
-
-<%ARGS>
-$id => undef #some identifier that a queue could
-</%ARGS>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list