[Rt-commit] rt branch, menu-redo, updated. cb1d7b3d79eabf839fc08f932d47870256a18105

[jesse]

The branch, menu-redo has been updated
       via  cb1d7b3d79eabf839fc08f932d47870256a18105 (commit)
       via  26721b5eb7d87a1ae44221898e11d388eeb05198 (commit)
       via  c390e4d9766f4f1118ca52176614e1f4463bad9b (commit)
      from  2ee07eff5235e8032dba0546549e362646a50985 (commit)

Summary of changes:
 lib/RT/Dispatcher.pm       |   20 +++++++++-----------
 share/html/Elements/Header |    7 ++++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit c390e4d9766f4f1118ca52176614e1f4463bad9b
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 11 11:46:51 2009 -0500

    some more divs to style the page nav

diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index d89bf3a..f363918 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -109,9 +109,14 @@
 <& /Elements/CreateTicket &>
 <& /Elements/SimpleSearch &>
 %} 
-
+<div class="nav">
+<div class="main-nav">
 % Jifty->web->navigation->render_as_yui_menubar();
+</div>
+<div class="page-nav">
+</div>
 % Jifty->web->page_navigation->render_as_yui_menubar();
+</div>
 %# template login already has div with id "body"
 % unless ( Jifty->web->request->path =~ m{^/login} ) {
 <div id="body">

commit 26721b5eb7d87a1ae44221898e11d388eeb05198
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 11 11:47:34 2009 -0500

    nav fixes

diff --git a/lib/RT/Dispatcher.pm b/lib/RT/Dispatcher.pm
index 70a3885..2837619 100644
--- a/lib/RT/Dispatcher.pm
+++ b/lib/RT/Dispatcher.pm
@@ -100,7 +100,8 @@ before qr'^/(?!login)' => run {
         || Jifty->web->request->path =~ m{^/Elements/Footer$}
         || Jifty->web->request->path =~ m{^/Elements/Logo$}
         || Jifty->web->request->path =~ m{^/__jifty/test_warnings$}
-        || Jifty->web->request->path =~ m{^/__jifty/(css|js)} );
+        || Jifty->web->request->path =~ m{^/__jifty/(css|js)} 
+		);
 };
 
 before qr/(.*)/ => run {
@@ -222,22 +223,22 @@ before qr{.*} => run {
         {
             $cfadmin->child(
                 _('Users') => text => _('Select custom fields for all users'),
-                url        => 'Admin/Global/CustomFields/Users.html'
+                url        => '/Admin/Global/CustomFields/Users.html'
             );
 
             $cfadmin->child(
                 _('Groups') => text => _('Select custom fields for all user groups'),
-                url         => 'Admin/Global/CustomFields/Groups.html'
+                url         => '/Admin/Global/CustomFields/Groups.html'
             );
 
             $cfadmin->child(
                 _('Queues') => text => _('Select custom fields for all queues'),
-                url         => 'Admin/Global/CustomFields/Queues.html'
+                url         => '/Admin/Global/CustomFields/Queues.html'
             );
 
             $cfadmin->child(
                 _('Tickets') => text => _('Select custom fields for tickets in all queues'),
-                url => 'Admin/Global/CustomFields/Queue-Tickets.html'
+                url => '/Admin/Global/CustomFields/Queue-Tickets.html'
             );
 
             $cfadmin->child(
@@ -543,15 +544,13 @@ before qr'(?:Ticket|Search)/' => run {
                 my $action = $schema->transition_action( $current => $next );
                 next if $action eq 'hide';
 
-                my $url = 'Ticket/';
+                my $url = '/Ticket/';
                 if ($action) {
 
-                #XXX TODO
-                #$url .= "Update.html?" . query_string( action => $action, default_status => $next, id => $id );
+                $url .= "Update.html?" . query_string( action => $action, default_status => $next, id => $id );
                 } else {
 
-                    #XXX TODO
-                    # $url .= "Display.html?" .query_string(Status => $next, id => $id );
+                    #$url .= "Display.html?" .query_string(Status => $next, id => $id );
                 }
                 $tabs->child( _( $schema->transition_label( $current => $next ) ) => url => $url );
             }

commit cb1d7b3d79eabf839fc08f932d47870256a18105
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Nov 11 11:47:52 2009 -0500

    flip the page nav back to a menu. not sure I like the lack of discoverability

diff --git a/lib/RT/Dispatcher.pm b/lib/RT/Dispatcher.pm
index 2837619..575f8bd 100644
--- a/lib/RT/Dispatcher.pm
+++ b/lib/RT/Dispatcher.pm
@@ -185,7 +185,6 @@ on qr{^/Ticket/Graphs/(\d+)} => run {
 };
 
 before qr{.*} => run {
-	page_nav->render_children_inline(1);
     main_nav->child( _('Homepage'),      url => '/' );
     main_nav->child( _('Simple Search'), url => '/Search/Simple.html' );
     main_nav->child( _('Tickets'),       url => '/Search/Build.html' );

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