From fc6209f398899f0211cfcedeb81a3cd65e04a941 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 17 Feb 2011 00:25:23 +0000
Subject: import rt 3.8.9

---
 rt/share/html/Admin/Queues/Modify.html | 50 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

(limited to 'rt/share/html/Admin/Queues/Modify.html')

diff --git a/rt/share/html/Admin/Queues/Modify.html b/rt/share/html/Admin/Queues/Modify.html
index c6ffe179f..5dd7bf00c 100755
--- a/rt/share/html/Admin/Queues/Modify.html
+++ b/rt/share/html/Admin/Queues/Modify.html
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%#                                          <sales@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
@@ -43,7 +43,7 @@
 %# 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 => $QueueObj->id, 
@@ -121,12 +121,26 @@
 </td></tr>
 
 % if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+<tr><td colspan="4">
 % if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) {
-<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &></td></tr>
+<& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
+% } else {
+<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &>
+<i><&|/l&>You have enabled GnuPG support but have not set a correspondence address for this queue.</&>
+<&|/l&>You must set a correspondence address for this queue in order to configure a GnuPG private key.</&></i>
+</&>
 % }
+</td></tr>
+<tr><td colspan="4">
 % if ( my $email = $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') ) {
-<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &></td></tr>
-% }
+<& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &>
+% } else {
+<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &>
+<i><&|/l&>You have enabled GnuPG support but have not set a comment address for this queue.</&>
+<&|/l&>You must set a comment address for this queue in order to configure a GnuPG private key.</&></i>
+</&>
+%}
+</td></tr>
 % }
 
 </table>
-- 
cgit v1.2.1