X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fhtml%2FAdmin%2FElements%2FUserTabs;h=c6050c14751595cee791f9c9ad8b744dc4c5a661;hb=24548f7cf666bac02335d0bc74f81251c7b4ab50;hp=764fdfcb5a08ca38ad6f4ef819f0be95f7809a0a;hpb=945721f48f74d5cfffef7c7cf3a3d6bc2521f5dd;p=freeside.git

diff --git a/rt/html/Admin/Elements/UserTabs b/rt/html/Admin/Elements/UserTabs
index 764fdfcb5..c6050c147 100644
--- a/rt/html/Admin/Elements/UserTabs
+++ b/rt/html/Admin/Elements/UserTabs
@@ -1,8 +1,14 @@
-%# BEGIN LICENSE BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
-%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explictly superceded by other copyright notices)
+%# (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
@@ -14,34 +20,60 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# Unless otherwise specified, all modifications, corrections or
-%# extensions to this work which alter its source code become the
-%# property of Best Practical Solutions, LLC when submitted for
-%# inclusion in the work.
+%# 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.)
 %# 
-%# END LICENSE BLOCK
+%# 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/Tabs, 
     subtabs => $tabs,
     current_tab => 'Admin/Users/', 
-    current_subtab => $current_subtab, 
+    current_subtab => $current_tab, 
     Title => $Title &>
 <%INIT>
 my $tabs;
-my $subtabs;
 if ($id) {
 $tabs->{'this'} = { title => eval { $UserObj->Name },
 
-			   path => "Admin/Users/Modify.html?id=".$id,
+		path => "Admin/Users/Modify.html?id=".$id,
 subtabs => {
-	       Queues => { title => loc('Basics'),
-			   path => "Admin/Users/Modify.html?id=".$id
+	       Basics => { title => loc('Basics'),
+				path => "Admin/Users/Modify.html?id=".$id
+			},
+	       Memberships => { title => loc('Memberships'),
+			   path => "Admin/Users/Memberships.html?id=".$id
+			 },
+	       History => { title => loc('History'),
+			   path => "Admin/Users/History.html?id=".$id
+			 },
+	       '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 ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers')) {
@@ -50,25 +82,32 @@ if ($session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUse
 			   };
   $tabs->{"B"} = { title => loc('New user'),
   		     	path => "Admin/Users/Modify.html?Create=1",
-			separator => 1,
-			   };
+		separator => 1,
+	};
 }
 
   # Now let callbacks add their extra tabs
   $m->comp('/Elements/Callback', tabs => $tabs, %ARGS);
                                                                                 
-foreach my $tab ( sort keys %{$tabs} ) {                                        
-    if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {                         
-        $tabs->{$tab}->{"current_subtab"} = $current_subtab;                    
+#foreach my $tab ( sort keys %{$tabs} ) {                                        
+#    if ( $tabs->{$tab}->{'path'} eq $current_subtab ) {                         
+#        $tabs->{$tab}->{"current_subtab"} = $current_subtab;                    
+#    }                                                                           
+#}                                                                               
+foreach my $tab ( sort keys %{$tabs->{'this'}->{'subtabs'}} ) {  
+    if ( $tabs->{'this'}->{'subtabs'}->{$tab}->{'path'} eq $current_tab ) {
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"subtabs"}        = $subtabs; 
+        $tabs->{'this'}->{'subtabs'}->{$tab}->{"current_subtab"} = $current_subtab; 
     }                                                                           
-}                                                                               
+}   
+$tabs->{'this'}->{"current_subtab"} = $current_tab; 
+$current_tab = "Admin/Users/Modify.html?id=".$id if $id;
 </%INIT>
-  
-  
 <%ARGS>
 $UserObj => undef
 $id => undef
 $current_tab => undef
+$subtabs => undef
 $current_subtab => undef
 $Title => undef
 </%ARGS>