[Rt-commit] r10091 - in rt/branches/3.7-EXPERIMENTAL: . html/Admin/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon Dec 24 18:50:15 2007
New Revision: 10091

Added:
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/GnuPG.html
Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs
   rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html

Log:
 r9900 at cubic-pc (orig r9899):  ruz | 2007-12-12 03:22:19 +0300
 * move User's gnupg things into its own page


Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Elements/UserTabs	Mon Dec 24 18:50:15 2007
@@ -69,13 +69,16 @@
 	       'MyRT' => { title => loc('RT at a glance'),
 			   path => "Admin/Users/MyRT.html?id=".$id
 			 },
-#	       Scrips => { title => loc('Rights'),
-#			   path => "Admin/Users/Rights.html?id=".$id
-#			 }
-	       
 	}
+};
+    if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+        $tabs->{'this'}{'subtabs'}{'GnuPG'} = {
+            title => loc('GnuPG'),
+            path  => "Admin/Users/GnuPG.html?id=".$id,
+        };
+    }
 }
-}
+
 if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
   $tabs->{"A"} = { title => loc('Select user'),
   		     	path => "Admin/Users/",

Added: rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/GnuPG.html
==============================================================================
--- (empty file)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/GnuPG.html	Mon Dec 24 18:50:15 2007
@@ -0,0 +1,28 @@
+<& /Admin/Elements/Header, Title => $title  &>
+<& /Admin/Elements/UserTabs, 
+    id          => $id, 
+    UserObj     => $UserObj,
+    current_tab => 'Admin/Users/GnuPG.html?id='. $id,
+    Title       => $title,
+&>
+
+<& /Elements/ListActions, actions => \@results &>
+
+% if ( my $email = $UserObj->EmailAddress ) {
+<& /Admin/Elements/ShowKeyInfo, EmailAddress => $email &>
+% }
+
+<%ARGS>
+$id => undef
+</%ARGS>
+<%INIT>
+return unless RT->Config->Get('GnuPG')->{'Enable'};
+
+my @results;
+
+my $UserObj = RT::User->new( $session{'CurrentUser'} );
+$UserObj->Load( $id );
+
+my $title = loc("User's GnuPG keys");
+
+</%INIT>

Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Users/Modify.html	Mon Dec 24 18:50:15 2007
@@ -234,10 +234,6 @@
 </&>
 % }
 
-% if ( RT->Config->Get('GnuPG')->{'Enable'} && (my $email = $UserObj->EmailAddress )) {
-<& /Admin/Elements/ShowKeyInfo, EmailAddress => $email &>
-% }
-
 </td>
 </tr>
 </table>