[Rt-commit] r12992 - in rt/branches/3.8-TESTING: . share/html/Elements share/html/Prefs share/html/User/Elements t/web

[jesse at bestpractical.com]

Author: jesse
Date: Fri Jun  6 16:32:06 2008
New Revision: 12992

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/share/html/Elements/Header
   rt/branches/3.8-TESTING/share/html/Elements/Tabs
   rt/branches/3.8-TESTING/share/html/Prefs/Elements/Tabs
   rt/branches/3.8-TESTING/share/html/Prefs/Other.html
   rt/branches/3.8-TESTING/share/html/User/Elements/Tabs
   rt/branches/3.8-TESTING/t/web/rights1.t

Log:
 r32404 at 31b:  jesse | 2008-06-06 16:31:39 -0400
 * Make the 'settings' tab of preferences the default
 * Fix tests to deal.


Modified: rt/branches/3.8-TESTING/share/html/Elements/Header
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Elements/Header	(original)
+++ rt/branches/3.8-TESTING/share/html/Elements/Header	Fri Jun  6 16:32:06 2008
@@ -115,7 +115,7 @@
 </%INIT>
 
 <%ARGS>
-$Prefs => '/User/Prefs.html'
+$Prefs => '/Prefs/Other.html'
 #$Focus => 'focus'
 $Focus => ''
 $Title =>  'RT'

Modified: rt/branches/3.8-TESTING/share/html/Elements/Tabs
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Elements/Tabs	(original)
+++ rt/branches/3.8-TESTING/share/html/Elements/Tabs	Fri Jun  6 16:32:06 2008
@@ -92,7 +92,7 @@
 if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', 
 				       Object => $RT::System )) {
     $basetabs->{K} = { title => loc('Preferences'),
-                       path => 'User/Prefs.html'
+                       path => 'Prefs/Other.html'
 		     };
 }
 

Modified: rt/branches/3.8-TESTING/share/html/Prefs/Elements/Tabs
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Prefs/Elements/Tabs	(original)
+++ rt/branches/3.8-TESTING/share/html/Prefs/Elements/Tabs	Fri Jun  6 16:32:06 2008
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <& /User/Elements/Tabs,
     subtabs => $tabs,
-    current_tab => 'Prefs/MyRT.html',
+    current_tab => 'Prefs/Other.html',
     current_subtab => $current_subtab,
     Title => $Title &>
 

Modified: rt/branches/3.8-TESTING/share/html/Prefs/Other.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Prefs/Other.html	(original)
+++ rt/branches/3.8-TESTING/share/html/Prefs/Other.html	Fri Jun  6 16:32:06 2008
@@ -78,7 +78,7 @@
 </form>
 <%INIT>
 my @results;
-my $title = loc("Other preferences");
+my $title = loc("Settings");
 
 my $UserObj = $session{'CurrentUser'}->UserObj;
 my $preferences = $UserObj->Preferences( $RT::System );

Modified: rt/branches/3.8-TESTING/share/html/User/Elements/Tabs
==============================================================================
--- rt/branches/3.8-TESTING/share/html/User/Elements/Tabs	(original)
+++ rt/branches/3.8-TESTING/share/html/User/Elements/Tabs	Fri Jun  6 16:32:06 2008
@@ -47,12 +47,18 @@
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/Tabs, 
     tabs => $tabs, 
-    current_toptab => 'User/Prefs.html', 
+    current_toptab => 'Prefs/Other.html', 
     current_tab => $current_tab, 
     Title => $Title &>
 
 <%INIT>
-  my $tabs = { a => { title => loc('About me'),
+  my $tabs = {
+  
+	       a => { title => loc('Settings'),
+			   path => 'Prefs/Other.html',
+			 },
+  
+             b => { title => loc('About me'),
 			  path => 'User/Prefs.html',
 			},
 	       g => { title => loc('Personal Groups'),
@@ -70,9 +76,6 @@
 	       s => { title => loc('Dashboards'),
 			   path => 'Dashboards/index.html',
 			 },
-	       t => { title => loc('Settings'),
-			   path => 'Prefs/Other.html',
-			 },
 	     };
 
   # Now let callbacks add their extra tabs

Modified: rt/branches/3.8-TESTING/t/web/rights1.t
==============================================================================
--- rt/branches/3.8-TESTING/t/web/rights1.t	(original)
+++ rt/branches/3.8-TESTING/t/web/rights1.t	Fri Jun  6 16:32:06 2008
@@ -52,7 +52,7 @@
 ok ($grantid,$grantmsg);
 $agent->reload();
 like($agent->{'content'} , qr/Logout/i, "Reloaded page successfully");
-ok($agent->find_link( url => "$RT::WebPath/User/Prefs.html",
+ok($agent->find_link( 
 		       text => 'Preferences'), "Found prefs pane" );
 ($revokeid,$revokemsg) = $user_obj->PrincipalObj->RevokeRight(Right => 'ModifySelf');
 ok ($revokeid,$revokemsg);