[Rt-commit] rt branch, admin_ui, updated. 6441b1e3ce289e13830fdb2faf9fbaa799bda0ba

[sunnavy at bestpractical.com]

The branch, admin_ui has been updated
       via  6441b1e3ce289e13830fdb2faf9fbaa799bda0ba (commit)
      from  6ed935b5938dc9feed24abe30d3a8a3a9f34305c (commit)

Summary of changes:
 lib/RT/View/Admin/Queues.pm |   20 ++++++++++++++------
 lib/RT/View/Admin/Users.pm  |   21 +++++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit 6441b1e3ce289e13830fdb2faf9fbaa799bda0ba
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jan 20 11:41:25 2010 +0800

    tweak gnupg pages

diff --git a/lib/RT/View/Admin/Queues.pm b/lib/RT/View/Admin/Queues.pm
index a80db41..b2ae2a0 100644
--- a/lib/RT/View/Admin/Queues.pm
+++ b/lib/RT/View/Admin/Queues.pm
@@ -207,14 +207,22 @@ private template 'key_info' => sub {
         outs( _('No keys for this address') );
     }
     else {
-        h3 { _( 'GnuPG public key for %1', $email ) };
+        if ( $type eq 'private' ) {
+            h3 { _( 'GnuPG private key(s) for %1', $email ) };
+        }
+        else {
+            h3 { _( 'GnuPG public key(s) for %1', $email ) };
+        }
+
         table {
-            row {
-                th { _('Trust') . ':' };
-                cell {
-                    _( $res{'info'}{'trust'} );
+            if ( $type eq 'public' ) {
+                row {
+                    th { _('Trust') . ':' };
+                    cell {
+                        _( $res{'info'}{'trust'} );
+                    };
                 };
-            };
+            }
             row {
                 th { _('Created') . ':' };
                 cell {
diff --git a/lib/RT/View/Admin/Users.pm b/lib/RT/View/Admin/Users.pm
index db134ed..3890904 100644
--- a/lib/RT/View/Admin/Users.pm
+++ b/lib/RT/View/Admin/Users.pm
@@ -216,14 +216,23 @@ private template 'key_info' => sub {
         outs( _('No keys for this address') );
     }
     else {
-        h3 { _( 'GnuPG public key for %1', $email ) };
+        if ( $type eq 'private' ) {
+            h3 { _( 'GnuPG private key(s) for %1', $email ) };
+        }
+        else {
+            h3 { _( 'GnuPG public key(s) for %1', $email ) };
+        }
+
         table {
-            row {
-                th { _('Trust') . ':' };
-                cell {
-                    _( $res{'info'}{'trust'} );
+            if ( $type eq 'public' ) {
+                row {
+                    th { _('Trust') . ':' };
+                    cell {
+                        _( $res{'info'}{'trust'} );
+                    };
                 };
-            };
+            }
+
             row {
                 th { _('Created') . ':' };
                 cell {

-----------------------------------------------------------------------