[Rt-commit] rt branch, admin_ui, updated. 732b91dfab0b4f3b66710af82d6f4b0776324de5

[sunnavy at bestpractical.com]

The branch, admin_ui has been updated
       via  732b91dfab0b4f3b66710af82d6f4b0776324de5 (commit)
      from  def1bb5ea6afc8f62aed0d49b0c424d95b9ba455 (commit)

Summary of changes:
 lib/RT/Dispatcher.pm            |   17 +++++++++--------
 share/html/Elements/Header      |    2 +-
 share/html/Elements/Quicksearch |    3 ++-
 share/html/Elements/ShowSearch  |    2 +-
 share/html/_elements/wrapper    |    2 +-
 share/html/index.html           |    2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit 732b91dfab0b4f3b66710af82d6f4b0776324de5
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jan 21 21:51:17 2010 +0800

    /Prefs => /prefs

diff --git a/lib/RT/Dispatcher.pm b/lib/RT/Dispatcher.pm
index a4c93cb..9f2ee82 100644
--- a/lib/RT/Dispatcher.pm
+++ b/lib/RT/Dispatcher.pm
@@ -184,11 +184,12 @@ on qr{^/Ticket/Graphs/(\d+)} => run {
 };
 
 
-my $PREFS_NAV = Jifty::Web::Menu->new( { label => _('Preferences'), url => '/Prefs/Other.html' } );
-$PREFS_NAV->child( _('Settings'),       url => '/Prefs/Other.html', );
-$PREFS_NAV->child( _('About me'),       url => '/User/Prefs.html', );
-$PREFS_NAV->child( _('Search options'), url => '/Prefs/SearchOptions.html', );
-$PREFS_NAV->child( _('RT at a glance'), url => '/Prefs/MyRT.html', );
+my $PREFS_NAV = Jifty::Web::Menu->new( { label => _('Preferences'), url =>
+        '/prefs/other' } );
+$PREFS_NAV->child( _('Settings'),       url => '/prefs/other', );
+$PREFS_NAV->child( _('About me'),       url => '/prefs/me', );
+$PREFS_NAV->child( _('Search options'), url => '/prefs/search_options', );
+$PREFS_NAV->child( _('RT at a glance'), url => '/prefs/my_rt', );
 
 
 before qr{.*} => run {
@@ -789,14 +790,14 @@ before 'User/Group' => run {
 
 };
 
-before 'Prefs' => run {
+before 'prefs' => run {
     my @searches = RT::System->new->saved_searches();
 
-    page_nav->child( 'Quick search' => label => _('Quick search'), url => '/Prefs/Quicksearch.html' );
+    page_nav->child( 'Quick search' => label => _('Quick search'), url => '/prefs/quick_search' );
 
     for my $search (@searches) {
         page_nav->child( $search->[0],
-            url => "/Prefs/Search.html?" . query_string( name => ref( $search->[1] ) . '-' . $search->[1]->id ) );
+            url => "/prefs/search?" . query_string( name => ref( $search->[1] ) . '-' . $search->[1]->id ) );
     }
 };
 
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index f791c67..608079b 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -136,7 +136,7 @@ $id =~ s|-$||g;
 </%INIT>
 
 <%ARGS>
-$prefs => '/Prefs/Other.html'
+$prefs => '/prefs/other'
 #$focus => 'focus'
 $focus => ''
 $title =>  'RT'
diff --git a/share/html/Elements/Quicksearch b/share/html/Elements/Quicksearch
index 3da613c..04c1159 100755
--- a/share/html/Elements/Quicksearch
+++ b/share/html/Elements/Quicksearch
@@ -47,7 +47,8 @@
 %# END BPS TAGGED BLOCK }}}
 <div class="ticket-overview">
 <&|/Widgets/TitleBox, title => _("Quick search"), bodyclass => "",
-   titleright => _("Edit"), titleright_href => RT->config->get('web_path').'/Prefs/Quicksearch.html' &>
+   titleright => _("Edit"), titleright_href =>
+   RT->config->get('web_path').'/prefs/quick_search' &>
 <& /Elements/QueueSummary,
    cache => 'quick_search_queues',
    queue_filter => sub  { $_->current_user_has_right('ShowTicket') && !exists $unwanted->{$_->name} },
diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index a946cc6..ca3b6b4 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -100,7 +100,7 @@ if ($saved_search) {
     }
 
     $SearchArg = $user->preferences( $search, $search->content );
-    $customize = RT->config->get('web_path') . '/Prefs/Search.html?'
+    $customize = RT->config->get('web_path') . '/prefs/search?'
         . $m->comp( '/Elements/QueryString',
             name => ref($search) . '-' . $search->id );
 }
diff --git a/share/html/_elements/wrapper b/share/html/_elements/wrapper
index c19440e..3a2fb86 100644
--- a/share/html/_elements/wrapper
+++ b/share/html/_elements/wrapper
@@ -52,7 +52,7 @@
 
 <& /Elements/Footer, %{Jifty->web->request->arguments}, %ARGS &>
 <%args>
-$prefs => '/Prefs/Other.html'
+$prefs => '/prefs/other'
 $focus => ''
 $title => 'RT'
 $code => undef
diff --git a/share/html/index.html b/share/html/index.html
index 843cd0e..f0b2bc1 100755
--- a/share/html/index.html
+++ b/share/html/index.html
@@ -133,7 +133,7 @@ my $actions;
 if (Jifty->web->current_user->has_right(right => 'ModifySelf', object => RT->system)) {
     $actions = {
         A => { title => _('Edit'),
-               path  => 'Prefs/MyRT.html',
+               path  => 'prefs/my_rt',
              },
     };
 }

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