[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-359-g9d8d154

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  9d8d1546f51307b1f26f334ce4d42eb93b0c3961 (commit)
      from  11ffd66a8cdb89163f45e4e3af43ce1a7724ffb0 (commit)

Summary of changes:
 share/html/Elements/Tabs |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 9d8d1546f51307b1f26f334ce4d42eb93b0c3961
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Dec 6 13:28:31 2010 -0500

    Revert "Kill the superfluous Settings submenu to decrease the menu levels"
    Revert "Simplify the Logged in user menu in the web2 theme"
    
    This reverts commit e5d457cccbb0187623a71cbe17e5e29051ac1ba5.
    This reverts commit c4dba6b4fc9d3a3dd89db93b3642fb8e42174b4c.
    
    Things like "Saved searches" are the settings for those saved searches,
    and are potentially more confusing without the submenu.  The submenu
    does correctly group all of the items underneath it.  I'm still not
    entirely happy with this deeper menu structure, so suggestions for
    improving it are welcome.  Simply moving the Settings menu to the Tools
    menu doesn't seem right either.

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index e289850..87cd11a 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -188,13 +188,14 @@ if ( $request_path !~ qr{^/SelfService/} ) {
 
     if ( $session{'CurrentUser'}->UserObj
          && $session{'CurrentUser'}->HasRight( Right  => 'ModifySelf', Object => $RT::System )) {
-        $about_me->child( options => title => loc('Options'), path     => '/Prefs/Other.html', );
-        $about_me->child( about_me => title => loc('About me'), path     => '/User/Prefs.html', );
-        $about_me->child( search_options => title => loc('Search options'), path => '/Prefs/SearchOptions.html', );
-        $about_me->child( myrt => title => loc('RT at a glance'), path => '/Prefs/MyRT.html', );
-        $about_me->child( quicksearch => title => 'Quick search' => title => loc('Quick search'), path => '/Prefs/Quicksearch.html');
-
-        my $search_menu = $about_me->child( 'saved-searches' => title => 'Saved Searches' );
+        my $settings = $about_me->child( settings => title => loc('Settings'), path => '/Prefs/Other.html', );
+        $settings->child( options => title => loc('Options'), path     => '/Prefs/Other.html', );
+        $settings->child( about_me => title => loc('About me'), path     => '/User/Prefs.html', );
+        $settings->child( search_options => title => loc('Search options'), path => '/Prefs/SearchOptions.html', );
+        $settings->child( myrt => title => loc('RT at a glance'), path => '/Prefs/MyRT.html', );
+        $settings->child( quicksearch => title => 'Quick search' => title => loc('Quick search'), path => '/Prefs/Quicksearch.html');
+
+        my $search_menu = $settings->child( 'saved-searches' => title => 'Saved Searches' );
         my $searches = [ $m->comp( "/Search/Elements/SearchesForObject",
                           Object => RT::System->new( $session{'CurrentUser'} )) ];
         my $i = 0;

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