[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-416-g9290a02

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  9290a0240076bbe58d5555cbc1fc448e489c208e (commit)
       via  5ac8f08c2be9a15a6302ff1964f9ceb5d3a24e3c (commit)
      from  37ded7303b6da06f521d32ae72ea72e7addc4d7c (commit)

Summary of changes:
 share/html/NoAuth/css/aileron/InHeader |    9 +++++++--
 share/html/NoAuth/css/web2/InHeader    |   11 ++++++++---
 t/web/rights1.t                        |    2 +-
 t/web/walk.t                           |    8 ++++----
 4 files changed, 20 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 5ac8f08c2be9a15a6302ff1964f9ceb5d3a24e3c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 8 17:03:36 2010 -0500

    Use supersubs to resize menu widths within a reasonable range

diff --git a/share/html/NoAuth/css/aileron/InHeader b/share/html/NoAuth/css/aileron/InHeader
index 01cbb81..4173266 100644
--- a/share/html/NoAuth/css/aileron/InHeader
+++ b/share/html/NoAuth/css/aileron/InHeader
@@ -50,7 +50,12 @@
 <![endif]-->
 <script type="text/javascript">
 jQuery(document).ready(function(){
-    jQuery("#app-nav.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish();
-    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish( { autoArrows:  false, dropShadows: false } );
+    jQuery.fn.supersubs.defaults = {
+        maxWidth: 30,
+        extraWidth: 2
+    };
+
+    jQuery("#app-nav.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').supersubs().superfish();
+    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').supersubs().superfish({ autoArrows:  false, dropShadows: false });
 });
 </script>
diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index 4b6157a..262f11e 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -60,8 +60,13 @@ jQuery(document).ready(function(){
     jQuery("#li-search-simple").detach().insertBefore("#li-search");
     jQuery("#li-tools-approval").detach().appendTo("#app-nav");
 
-    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled ').superfish();
-    jQuery("#app-nav.toplevel").addClass('sf-menu sf-vertical sf-js-enabled ').superfish();
-    jQuery("#prefs-menu").addClass('sf-menu sf-js-enabled ').superfish();
+    jQuery.fn.supersubs.defaults = {
+        maxWidth: 30,
+        extraWidth: 2
+    };
+
+    jQuery("#page-menu.toplevel").addClass("sf-menu sf-js-enabled").supersubs().superfish();
+    jQuery("#app-nav.toplevel").addClass("sf-menu sf-vertical sf-js-enabled").supersubs().superfish();
+    jQuery("#prefs-menu").addClass("sf-menu sf-js-enabled").supersubs().superfish();
 });
 </script>

commit 9290a0240076bbe58d5555cbc1fc448e489c208e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 8 17:21:06 2010 -0500

    Fix tests to account for my menu changes

diff --git a/t/web/rights1.t b/t/web/rights1.t
index 5b284d0..aaa2820 100644
--- a/t/web/rights1.t
+++ b/t/web/rights1.t
@@ -52,7 +52,7 @@ ok ($grantid,$grantmsg);
 $agent->reload();
 $agent->content_contains('Logout', "Reloaded page successfully");
 ok($agent->find_link( 
-		       id => 'preferences-settings' ), "Found prefs pane" );
+		       id => 'preferences-options' ), "Found prefs pane" );
 ($revokeid,$revokemsg) = $user_obj->PrincipalObj->RevokeRight(Right => 'ModifySelf');
 ok ($revokeid,$revokemsg);
 # Good.  Now load the search page and test Load/Save Search.
diff --git a/t/web/walk.t b/t/web/walk.t
index 58de38e..b5e8c9b 100644
--- a/t/web/walk.t
+++ b/t/web/walk.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 94;
+use RT::Test tests => 93;
 
 my ( $baseurl, $m ) = RT::Test->started_ok;
 
@@ -166,9 +166,9 @@ diag 'walk into /Approvals' if $ENV{TEST_VERBOSE};
 diag 'walk into /Prefs' if $ENV{TEST_VERBOSE};
 {
     for my $id (
-        'settings',    'settings-about_me', 'settings-search_options', 'settings-myrt',
-        'settings-quicksearch', 'settings-saved-searches-search-0', 'settings-saved-searches-search-1',       'settings-saved-searches-search-2',
-        'logout'
+        'about_me', 'search_options', 'myrt', 'quicksearch',
+        'saved-searches-search-0', 'saved-searches-search-1',
+        'saved-searches-search-2', 'logout'
       )
     {
         $m->follow_link_ok( { id => 'preferences-' . $id }, "-> $id" );

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