[Rt-commit] rt branch, menuing, updated. rt-3.9.4-372-gdb9b1c5

Jesse Vincent jesse at bestpractical.com
Wed Nov 3 20:52:21 EDT 2010


The branch, menuing has been updated
       via  db9b1c5b9d65077086188e7e8a14a00f77b28e32 (commit)
       via  9cf9b8b3e3ff34390ff69292ba805ee7bd800e0d (commit)
       via  70c9aee72e95a88c7ab3ee2258dd59829f138fa9 (commit)
       via  04bcafe40eace0d0878b7306422abeaed858a0f9 (commit)
       via  c2641586f7e99a8f73a1c19935b4d29c767b2c19 (commit)
       via  85a97066000dc22cc96ccd44e81351fa01957d68 (commit)
       via  bce6a52d5e3c3aaa9ddaf6c1853a2a84a4d79b77 (commit)
      from  32480132c802e03f00a6f35cf07f9913e272cf03 (commit)

Summary of changes:
 share/html/Elements/Menu               |    4 +-
 share/html/Elements/Tabs               |   17 +++---
 share/html/NoAuth/css/aileron/InHeader |    6 +-
 share/html/NoAuth/css/aileron/nav.css  |    7 ++-
 share/html/NoAuth/css/web2/InHeader    |   12 +++-
 share/html/NoAuth/css/web2/layout.css  |   33 +++++++++-
 share/html/NoAuth/css/web2/nav.css     |  108 +++++++++++++++++++++++++++-----
 7 files changed, 153 insertions(+), 34 deletions(-)

- Log -----------------------------------------------------------------
commit bce6a52d5e3c3aaa9ddaf6c1853a2a84a4d79b77
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 17:23:27 2010 -0400

    Move our unique id per list item to the list item

diff --git a/share/html/Elements/Menu b/share/html/Elements/Menu
index ebc749c..265840a 100755
--- a/share/html/Elements/Menu
+++ b/share/html/Elements/Menu
@@ -50,9 +50,9 @@
 % for my $child ($menu->children) {
 %   my $item_id = lc(($parent_id? $parent_id."-" : "") .$child->key);
 %   $item_id =~ s/\s/-/g;
-<%" " x ($depth+1)%><li>\
+<%" " x ($depth+1)%><li id="<%$item_id%>" >\
 % if ($child->link_item) {
-<a id="<%$item_id%>" <% $child->path ? ' href="'.RT->Config->Get('WebPath').$child->path.'"' : '' |n%>>\
+<a <% $child->path ? ' href="'.RT->Config->Get('WebPath').$child->path.'"' : '' |n%>>\
 % }
 % if ($child->escape_title) {
 <%$child->title%>\

commit 85a97066000dc22cc96ccd44e81351fa01957d68
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 17:23:43 2010 -0400

    yank the preferences/logout menu up out to its own dom node for the web2 style

diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index 7196a34..78134f7 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -53,5 +53,12 @@
 <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/msie6.css" type="text/css" media="all" />
 <![endif]-->
 <script type="text/javascript">
-jQuery(document).ready(function(){ jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); });
+jQuery(document).ready(function(){
+    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish();
+    jQuery("#app-nav.toplevel").addClass('sf-menu sf-vertical sf-js-enabled sf-shadow').superfish();
+    jQuery("#quick-personal").append('<ul id="prefs-menu"></ul>');
+    jQuery("#preferences").detach().appendTo(jQuery("#prefs-menu"));
+    jQuery("#prefs-menu").addClass('sf-menu sf-js-enabled sf-shadow').superfish();
+
+});
 </script>

commit c2641586f7e99a8f73a1c19935b4d29c767b2c19
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 17:24:10 2010 -0400

    First pass of web2 styling

diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index 78134f7..082f387 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -53,12 +53,12 @@
 <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/msie6.css" type="text/css" media="all" />
 <![endif]-->
 <script type="text/javascript">
-jQuery(document).ready(function(){
-    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish();
-    jQuery("#app-nav.toplevel").addClass('sf-menu sf-vertical sf-js-enabled sf-shadow').superfish();
+jQuery(document).ready(function(){ 
+    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); 
+    jQuery("#app-nav.toplevel").addClass('sf-menu sf-vertical sf-js-enabled sf-shadow').superfish(); 
     jQuery("#quick-personal").append('<ul id="prefs-menu"></ul>');
     jQuery("#preferences").detach().appendTo(jQuery("#prefs-menu"));
-    jQuery("#prefs-menu").addClass('sf-menu sf-js-enabled sf-shadow').superfish();
+    jQuery("#prefs-menu").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); 
 
 });
 </script>
diff --git a/share/html/NoAuth/css/web2/layout.css b/share/html/NoAuth/css/web2/layout.css
index c589bd9..99c2453 100644
--- a/share/html/NoAuth/css/web2/layout.css
+++ b/share/html/NoAuth/css/web2/layout.css
@@ -64,7 +64,7 @@ div#body {
     -webkit-border-top-left-radius: 0.5em;
     -moz-border-radius-bottomleft: 0.5em;
     -webkit-border-bottom-left-radius: 0.5em;
-    margin-left: 1em;
+    margin-left: 10em;
     margin-top: 3em;
     margin-right: 0;
     margin-bottom: 0em;
@@ -149,11 +149,34 @@ div#quickbar {
  border-bottom: 1px solid #ccc;
 
 }
-div#quick-personal {
-    float: left;
-    margin-left: 1em;
+
+#quick-personal {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 9999
+}
+
+#prefs-menu.sf-menu li li {
+    background: #eaeaea;    
+}
+
+#prefs-menu.sf-menu li#preferences {
+    background: none;
 }
 
+#prefs-menu.sf-menu li:hover, #prefs-menu.sf-menu li.sfHover, #prefs-menu.sf-menu a:focus, #prefs-menu.sf-menu a:hover, #prefs-menu.sf-menu a:active {
+    background-color: #CFDEFF; 
+    text-color: #000;
+    color: #000;
+} 
+
+#prefs-menu .sfHover a, 
+#prefs-menu .sfHover a:visited {
+    color: #000;
+}
+
+
 
 div#header h1 {
  position: absolute;
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index cda72fd..551fd72 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -45,28 +45,63 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-.sf-menu {
-    width: 100%;
+#main-navigation .sf-menu {
+    text-color: #fff;
 }
 
-.sf-menu a {
+#main-navigation .sf-menu li {
+    background: none;
+}
+
+#main-navigation .sf-menu li:first-child a {
+    border-top: none;
+}
+
+#main-navigation .sf-menu a,
+#main-navigation .sf-menu a:visited {
     padding-top: 0.5em;
     padding-bottom: 0.5em;
+    color: #fff;
+    border-left: none;
+    border-top-color: #ccc;
+}
+
+
+#main-navigation .sf-menu ul a,
+#main-navigation .sf-menu ul a:visited {
+    color: #000;
 }
-.sf-menu li:hover {
+
+
+#main-navigation .sf-menu li li, .sf-menu li li li {
+    border-left: none;
     background-color: #fff;
+    text-color: #547CCC;
 }
 
-.sf-menu li, .sf-menu li li, .sf-menu li li li {
-    background-color: #eee;
+#main-navigation .sf-menu li:hover, #main-navigation .sf-menu li.sfHover, #main-navigation .sf-menu a:focus, #main-navigation .sf-menu a:hover, #main-navigation .sf-menu a:active {
+    background-color: #CFDEFF; 
+    text-color: #000;
+    color: #000;
+} 
+
+#main-navigation .sfHover a, 
+#main-navigation .sfHover a:visited {
+    color: #000;
 }
 
 #main-navigation {
     position: absolute;
-    top: 0;
-    left: 0;
-    left: auto;
-    z-index: 9999;
+    top: 5.1em;
+    left: 0em;
+    z-index: 9997;
+    background-color: none;
+}
+
+
+#main-navigation #preferences a:visited,
+#main-navigation #preferences a {
+    color: #000; 
 }
 
 #page-navigation {

commit 04bcafe40eace0d0878b7306422abeaed858a0f9
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 20:19:02 2010 -0400

    first pass at web2 compatible main nav

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 36d5e65..2e98419 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -86,7 +86,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
     $tickets->child( new => title => loc('New Search') => path => "/Search/Build.html?NewQuery=1" );
 
     my $tools = Menu->child(  tools => title => loc('Tools'), path => '/Tools/index.html' );
-    my $dashes = $tools->child( dashboards => title => loc('Dashboards'), path => '/Dashboards/index.html' );
+    my $dashes = $tools->child( dashboards => title => loc('Dashboards'), path => '/Dashboards/index.html', sort_order => 2 );
 
     $dashes->child( select => title => loc('Select'), path => "/Dashboards/index.html" );
     my $dashboard = RT::Dashboard->new( $session{CurrentUser} );
@@ -94,24 +94,24 @@ if ( $request_path !~ qr{^/SelfService/} ) {
         $dashes->child( loc('Create') => path => "/Dashboards/Modify.html?Create=1" );
     }
 
-    my $reports = $tools->child( reports => title => loc('Reports'), path => '/Tools/Reports/index.html' );
+    my $reports = $tools->child( reports => title => loc('Reports'), path => '/Tools/Reports/index.html', sort_order => 4 );
     $reports->child( loc('Resolved by owner'), path => '/Tools/Reports/ResolvedByOwner.html', );
     $reports->child( loc('Resolved in date range'), path => '/Tools/Reports/ResolvedByDates.html', );
     $reports->child( loc('Created in a date range'), path => '/Tools/Reports/CreatedByDates.html', );
 
-    $tools->child( my_day => title => loc('My Day'), path   => '/Tools/MyDay.html' );
+    $tools->child( my_day => title => loc('My Day'), path   => '/Tools/MyDay.html', sort_order => 5 );
 
-    $tools->child( offline => title => loc('Offline'), path    => '/Tools/Offline.html' );
-    $tools->child( watching => title => loc('Watching Queues'), path => '/Tools/Watching.html' );
+    $tools->child( offline => title => loc('Offline'), path    => '/Tools/Offline.html', sort_order => 10 );
+    $tools->child( watching => title => loc('Watching Queues'), path => '/Tools/Watching.html', sort_order => 15 );
 
     if ( $session{'CurrentUser'}->HasRight( Right => 'ShowApprovalsTab', Object => $RT::System ) )
     {
-        $tools->child( approval => title => loc('Approval'), path     => '/Approvals/' );
+        $tools->child( approval => title => loc('Approval'), path     => '/Approvals/', sort_order=>3 );
     }
 
     if ( $session{'CurrentUser'}->HasRight( Right => 'ShowConfigTab', Object => $RT::System ) )
     {
-        my $admin = $tools->child( config => title => loc('Configuration'), path   => '/Admin/' );
+        my $admin = $tools->child( config => title => loc('Configuration'), path   => '/Admin/', sort_order => 1 );
         if ( $session{'CurrentUser'}->HasRight( Object => $RT::System, Right => 'AdminUsers' ) ) {
             my $users = $admin->child( users => title => loc('Users'), path => '/Admin/Users/', );
             $users->child( select => title => loc('Select'), path   => "/Admin/Users/" );
@@ -189,6 +189,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
     if ( $session{'CurrentUser'}->UserObj
          && $session{'CurrentUser'}->HasRight( Right  => 'ModifySelf', Object => $RT::System )) {
         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', );
diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index 082f387..1660a4c 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -54,11 +54,14 @@
 <![endif]-->
 <script type="text/javascript">
 jQuery(document).ready(function(){ 
-    jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); 
-    jQuery("#app-nav.toplevel").addClass('sf-menu sf-vertical sf-js-enabled sf-shadow').superfish(); 
+    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("#quick-personal").append('<ul id="prefs-menu"></ul>');
     jQuery("#preferences").detach().appendTo(jQuery("#prefs-menu"));
-    jQuery("#prefs-menu").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); 
+    jQuery("#tools-config").detach().appendTo(jQuery("#app-nav"));
+    jQuery("#search-simple").detach().insertBefore(jQuery("#search"));
+    jQuery("#tools-approval").detach().appendTo(jQuery("#app-nav"));
+    jQuery("#prefs-menu").addClass('sf-menu sf-js-enabled ').superfish(); 
 
 });
 </script>
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index 551fd72..b3d215b 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -45,25 +45,52 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+
+#main-navigation {
+    background-color: #fff;
+    -moz-border-radius-bottomright: 0.5em;
+    -webkit-border-bottom-right-radius: 0.5em;
+    -moz-border-radius-topright: 0.5em;
+    -webkit-border-top-right-radius: 0.5em;
+    width: 10em;
+    font-size: 0.85em;
+    position: absolute;
+    top: 6.2em;
+    left: 0em;
+    z-index: 9997;
+    background-color: none;
+    padding-top: 1em;
+    padding-right: 0.5em;
+    padding-left: 0.5em;
+}
+
+#main-navigation ul li {
+}
+
+
 #main-navigation .sf-menu {
-    text-color: #fff;
+    text-color: #000;
 }
 
 #main-navigation .sf-menu li {
     background: none;
 }
 
-#main-navigation .sf-menu li:first-child a {
-    border-top: none;
+#main-navigation .sf-menu li:first-child {
+    border-top: 1px solid #ccc;
 }
 
 #main-navigation .sf-menu a,
 #main-navigation .sf-menu a:visited {
     padding-top: 0.5em;
     padding-bottom: 0.5em;
-    color: #fff;
-    border-left: none;
-    border-top-color: #ccc;
+    color: #000;
+    border: none;
+}
+
+#main-navigation .sf-menu li {
+    border-bottom: 1px solid #ccc;
+    
 }
 
 
@@ -73,7 +100,7 @@
 }
 
 
-#main-navigation .sf-menu li li, .sf-menu li li li {
+#main-navigation .sf-menu li li, #main-navigation .sf-menu li li li {
     border-left: none;
     background-color: #fff;
     text-color: #547CCC;
@@ -90,19 +117,6 @@
     color: #000;
 }
 
-#main-navigation {
-    position: absolute;
-    top: 5.1em;
-    left: 0em;
-    z-index: 9997;
-    background-color: none;
-}
-
-
-#main-navigation #preferences a:visited,
-#main-navigation #preferences a {
-    color: #000; 
-}
 
 #page-navigation {
     position: absolute;

commit 70c9aee72e95a88c7ab3ee2258dd59829f138fa9
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 20:51:40 2010 -0400

    move the star to after the actions menu

diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 2e98419..ade5a61 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -314,7 +314,7 @@ if ( $request_path !~ qr{^/SelfService/} ) {
             my $obj = RT::Ticket->new( $session{'CurrentUser'} );
             $obj->Load($id);
 
-            my $actions = PageMenu()->child( transitions => title => loc('Actions'), sort_order  => 99 );
+            my $actions = PageMenu()->child( transitions => title => loc('Actions'), sort_order  => 95 );
             my $tabs = PageMenu();
             $tabs->child( bookmark => title => $m->scomp( '/Ticket/Elements/Bookmark', id => $id ),
                       escape_title => 0,

commit 9cf9b8b3e3ff34390ff69292ba805ee7bd800e0d
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 20:52:01 2010 -0400

    web2 pagenav style

diff --git a/share/html/NoAuth/css/web2/layout.css b/share/html/NoAuth/css/web2/layout.css
index 99c2453..11bf78e 100644
--- a/share/html/NoAuth/css/web2/layout.css
+++ b/share/html/NoAuth/css/web2/layout.css
@@ -169,11 +169,13 @@ div#quickbar {
     background-color: #CFDEFF; 
     text-color: #000;
     color: #000;
+    border: none;
 } 
 
 #prefs-menu .sfHover a, 
 #prefs-menu .sfHover a:visited {
     color: #000;
+    border: none;
 }
 
 
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index b3d215b..8177651 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -120,19 +120,46 @@
 
 #page-navigation {
     position: absolute;
-    top: 6.8em;
+    top: 6em;
     right: 0em;
     left: auto;
     z-index: 9995;
-    font-size: 0.8em;
+    font-size: 0.9em;
+    background-color: #eee;
+    border: 1px solid #ccc;
+    -moz-border-radius-bottomleft: 0.5em;
+    -webkit-border-bottom-left-radius: 0.5em;
+}
+
+#page-navigation .sf-menu {
+    margin: 0;
 }
 
 #page-navigation .sf-menu li, #page-navigation .sf-menu li li, #page-navigation .sf-menu li li li {
-    background-color: #fff;
+    background: none;
+    height: 2em;
+    padding-top: 0.25em;
+    padding-bottom: 0;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+    display: inline-block;
+}
+
+
+#page-navigation .sf-menu ul { 
+    background: #eee;
+}
+
+
+#page-navigation .sf-menu li:hover, #page-navigation .sf-menu li.sfHover, #page-navigation .sf-menu a:focus, #page-navigation .sf-menu a:hover, #page-navigation .sf-menu a:active {
+    background: none;
+    
 }
 
 #page-navigation .sf-menu a:visited, #page-navigation .sf-menu a {
     border: none;
+    padding: 0.25em;
+    color: #000;
 }
 
 

commit db9b1c5b9d65077086188e7e8a14a00f77b28e32
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 3 20:52:16 2010 -0400

    styling of aileron page menus

diff --git a/share/html/NoAuth/css/aileron/InHeader b/share/html/NoAuth/css/aileron/InHeader
index f9ed0ee..645d576 100644
--- a/share/html/NoAuth/css/aileron/InHeader
+++ b/share/html/NoAuth/css/aileron/InHeader
@@ -49,6 +49,8 @@
 <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/aileron/msie.css" type="text/css" media="all" />
 <![endif]-->
 <script type="text/javascript">
-jQuery(document).ready(function(){ jQuery("#app-nav.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); });
-jQuery(document).ready(function(){ jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').superfish(); });
+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 } ); 
+});
 </script>
diff --git a/share/html/NoAuth/css/aileron/nav.css b/share/html/NoAuth/css/aileron/nav.css
index cda72fd..58c00ca 100644
--- a/share/html/NoAuth/css/aileron/nav.css
+++ b/share/html/NoAuth/css/aileron/nav.css
@@ -49,10 +49,14 @@
     width: 100%;
 }
 
-.sf-menu a {
+.sf-menu a, .sf-menu a:hover {
     padding-top: 0.5em;
     padding-bottom: 0.5em;
+    border-color: #fff;
+    color: #000;
 }
+
+
 .sf-menu li:hover {
     background-color: #fff;
 }
@@ -67,6 +71,7 @@
     left: 0;
     left: auto;
     z-index: 9999;
+    text-color: #000;
 }
 
 #page-navigation {

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


More information about the Rt-commit mailing list