[Rt-commit] rt branch, 3.999-trunk, updated. 6a397920a9b0b8cc6dfdd940883b2f5ec3dfafe9
jesse
jesse at bestpractical.com
Mon Nov 30 13:37:33 EST 2009
The branch, 3.999-trunk has been updated
via 6a397920a9b0b8cc6dfdd940883b2f5ec3dfafe9 (commit)
via 69e5519cc477304454a20ac8ba733e909b19f937 (commit)
via 9f62ff22a23fa8a9d695355d9e9f6c07d9473b9e (commit)
via 74d4c4cfd89f3938bdda4e942d61a2f51cd83563 (commit)
from 1c0f17c7eb27fd39d318e8b6348b4c3632be00e3 (commit)
Summary of changes:
lib/RT.pm | 2 +-
lib/RT/Dispatcher.pm | 66 +++++++++++++++++++++++--------------------
share/html/Elements/Header | 19 ++++++++++++-
3 files changed, 54 insertions(+), 33 deletions(-)
- Log -----------------------------------------------------------------
commit 74d4c4cfd89f3938bdda4e942d61a2f51cd83563
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 25 11:23:11 2009 -0500
Make our toplevel menu have a "stick open" on browsers that support it.
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index b0a2491..cd2cf02 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -107,7 +107,17 @@
% if ( Jifty->web->current_user->user_object) {
<div class="nav">
<div class="main-nav">
-% Jifty->web->navigation->render_as_yui_menubar();
+<%perl>
+
+ my $id = Jifty->web->serial;
+ Jifty->web->navigation->_render_as_yui_menu_item( class => "yuimenubar", id => $id );
+ Jifty->web->out(qq|<script type="text/javascript">\n|
+ . qq|YAHOO.util.Event.onContentReady("|.$id.qq|", function() {\n|
+ . qq|var menu = new YAHOO.widget.MenuBar("|.$id.qq|", { lazyload:true, submenutoggleregion:true });\n|
+ . qq|menu.render();\n|
+ . qq|});</script>|
+ );
+</%perl>
</div>
<div class="page-nav">
% Jifty->web->page_navigation->render_as_yui_menubar();
commit 9f62ff22a23fa8a9d695355d9e9f6c07d9473b9e
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 25 12:15:36 2009 -0500
It appears that class.js from joose is baked into joose.js now.
diff --git a/lib/RT.pm b/lib/RT.pm
index f61f66b..8e0d1fa 100644
--- a/lib/RT.pm
+++ b/lib/RT.pm
@@ -422,7 +422,7 @@ sub start {
RT->init();
Jifty->web->add_javascript(
- qw( joose.js titlebox-state.js util.js ahah.js list.js class.js
+ qw( joose.js titlebox-state.js util.js ahah.js list.js
jquery.createdomnodes.js jquery.menu.js combobox.js cascaded.js rulebuilder.js
)
);
commit 69e5519cc477304454a20ac8ba733e909b19f937
Merge: 9f62ff2 1c0f17c
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Nov 30 13:07:13 2009 -0500
Merge branch '3.999-trunk' of fsck.com:/git/rt into 3.999-trunk
* '3.999-trunk' of fsck.com:/git/rt:
POD tags are case sensitive, at least according to vim's syntax highlighting :)
More doc fixes
Fix for an awesome automatic replacement
Doc fixes
Fix more inconsistent headers
More X-RT-sign avoidance
Make sure we set X-RT-Sign not X-RT-sign
Tidy
Typo fix
Wrap all non-arrayref ref types in [] for ticket->create
Plan fix
Fix plan
Canonicalize the "requestors" parameter into "requestor"
Bump up $Test::Builder::Level so we can see where failures are coming from
Add sign/encrypt headers
obra said filename is a word :)
case fixes
revert b64585d69
commit 6a397920a9b0b8cc6dfdd940883b2f5ec3dfafe9
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Nov 30 13:37:13 2009 -0500
further navbar work.
diff --git a/lib/RT/Dispatcher.pm b/lib/RT/Dispatcher.pm
index c3e6d7f..4c2a32c 100644
--- a/lib/RT/Dispatcher.pm
+++ b/lib/RT/Dispatcher.pm
@@ -206,7 +206,12 @@ before qr{.*} => run {
}
my $tools = main_nav->child( _('Tools'), url => '/Tools/index.html', sort_order => 3 );
- $tools->child( _('Dashboards'), url => '/Dashboards/index.html' );
+ my $dashes =$tools->child( _('Dashboards'), url => '/Dashboards/index.html' );
+ $dashes->child( _('Select'), url => "/Dashboards/index.html" );
+ use RT::Dashboard;
+ if ( RT::Dashboard->new->_privacy_objects( create => 1 ) ) {
+ $dashes->child( _('Create') => url => "/Dashboards/Modify.html?create=1" );
+ }
my $reports = $tools->child( _('Reports'), url => '/Tools/Reports/index.html' );
$reports->child( _('Resolved by owner'), url => '/Tools/Reports/ResolvedByOwner.html', );
@@ -225,11 +230,33 @@ before qr{.*} => run {
if ( Jifty->web->current_user->has_right( right => 'ShowConfigTab', object => RT->system ) )
{
my $admin = $tools->child( Config => label => _('Configuration'), url => '/Admin/' );
- $admin->child( _('Users'), url => '/Admin/Users/', );
- $admin->child( _('Groups'), url => '/Admin/Groups/', );
- $admin->child( _('Queues'), url => '/Admin/Queues/', );
- $admin->child( _('Custom Fields'), url => '/Admin/CustomFields/', );
- $admin->child( _('Rules'), url => '/admin/rules/', );
+ my $users = $admin->child( _('Users'), url => '/Admin/Users/', );
+ if ( Jifty->web->current_user->has_right( object => RT->system, right => 'AdminUsers' ) ) {
+ $users->child( _('Select'), url => "/Admin/Users/" );
+ $users->child( _('Create'), url => "/Admin/Users/Modify.html?create=1", separator => 1 );
+ }
+ my $groups= $admin->child( _('Groups'), url => '/Admin/Groups/', );
+
+ $groups->child( _('Select') => url => "/Admin/Groups/" );
+ $groups->child( _('Create') => url => "/Admin/Groups/Modify.html?create=1", separator => 1 );
+ my $queues= $admin->child( _('Queues'), url => '/Admin/Queues/', );
+
+ if ( Jifty->web->current_user->has_right( object => RT->system, right => 'AdminQueue' ) ) {
+ $queues->child( _('Select'), url => "/Admin/Queues/" );
+ $queues->child( _('Create'), url => "/Admin/Queues/Modify.html?create=1" );
+ }
+
+
+
+ my $cfs= $admin->child( _('Custom Fields'), url => '/Admin/CustomFields/', );
+ if ( Jifty->web->current_user->has_right( object => RT->system, right => 'AdminCustomField' ) ) {
+ $cfs->child( _('Select'), url => "/Admin/CustomFields/" );
+ $cfs->child( _('Create') => url => "/Admin/CustomFields/Modify.html?create=1", );
+
+ }
+ my $rules = $admin->child( _('Rules'), url => '/admin/rules/', );
+ $rules->child( _('Select'), url => "/Admin/Rules/" );
+ $rules->child( _('Create'), url => "/Admin/Rules/Modify.html?create=1" );
my $admin_global = $admin->child( _('Global'), url => '/Admin/Global/', );
@@ -301,10 +328,6 @@ before qr{.*} => run {
before qr'Dashboards/?' => run {
require RT::Dashboard; # not a record class, so not autoloaded :/
- page_nav->child( _('Select'), url => "/Dashboards/index.html" );
- if ( RT::Dashboard->new->_privacy_objects( create => 1 ) ) {
- page_nav->child( _('Create') => url => "/Dashboards/Modify.html?create=1" );
- }
};
before 'Dashboards/Modify.html' => run {
@@ -422,10 +445,8 @@ before '/SelfService' => run {
};
before 'Admin/Queues' => run {
- if ( Jifty->web->current_user->has_right( object => RT->system, right => 'AdminQueue' ) ) {
- page_nav->child( _('Select'), url => "/Admin/Queues/" );
- page_nav->child( _('Create'), url => "/Admin/Queues/Modify.html?create=1" );
- }
+
+
if ( my $id = Jifty->web->request->argument('id') ) {
my $queue_obj = RT::Model::Queue->new();
$queue_obj->load($id);
@@ -447,10 +468,6 @@ before 'Admin/Queues' => run {
};
before '/Admin/Users' => run {
- if ( Jifty->web->current_user->has_right( object => RT->system, right => 'AdminUsers' ) ) {
- page_nav->child( _('Select'), url => "/Admin/Users/" );
- page_nav->child( _('Create'), url => "/Admin/Users/Modify.html?create=1", separator => 1 );
- }
if ( my $id = Jifty->web->request->argument('id') ) {
my $obj = RT::Model::User->new();
$obj->load($id);
@@ -467,9 +484,6 @@ before '/Admin/Users' => run {
};
before 'Admin/Groups' => run {
-
- page_nav->child( _('Select') => url => "/Admin/Groups/" );
- page_nav->child( _('Create') => url => "/Admin/Groups/Modify.html?create=1", separator => 1 );
if ( my $id = Jifty->web->request->argument('id') ) {
my $obj = RT::Model::User->new();
$obj->load($id);
@@ -483,11 +497,6 @@ before 'Admin/Groups' => run {
};
before 'Admin/CustomFields/' => run {
- if ( Jifty->web->current_user->has_right( object => RT->system, right => 'AdminCustomField' ) ) {
- page_nav->child( _('Select'), url => "/Admin/CustomFields/" );
- page_nav->child( _('Create') => url => "/Admin/CustomFields/Modify.html?create=1", );
-
- }
if ( my $id = Jifty->web->request->argument('id') ) {
my $obj = RT::Model::CustomField->new();
$obj->load($id);
@@ -523,11 +532,6 @@ before 'Admin/Global/Workflows' => run {
}
};
-before 'Admin/Rules' => run {
- page_nav->child( _('Select'), url => "/Admin/Rules/" );
- page_nav->child( _('Create'), url => "/Admin/Rules/Modify.html?create=1" );
-};
-
before qr'(?:Ticket|Search)/' => run {
if ( ( Jifty->web->request->argument('id') || '' ) =~ /^(\d+)$/ ) {
my $id = $1;
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index cd2cf02..36e5512 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -113,13 +113,20 @@
Jifty->web->navigation->_render_as_yui_menu_item( class => "yuimenubar", id => $id );
Jifty->web->out(qq|<script type="text/javascript">\n|
. qq|YAHOO.util.Event.onContentReady("|.$id.qq|", function() {\n|
- . qq|var menu = new YAHOO.widget.MenuBar("|.$id.qq|", { lazyload:true, submenutoggleregion:true });\n|
+ . qq|var menu = new YAHOO.widget.MenuBar("|.$id.qq|", { lazyload:true, autosubmenudisplay:true |
+ #. qq|, submenutoggleregion:true |
+ # commented out until we upgrade to a version of yui menu that does chrome
+ . qq| });\n|
. qq|menu.render();\n|
. qq|});</script>|
);
</%perl>
</div>
<div class="page-nav">
+<%perl>
+ my $page_nav = Jifty->web->page_navigation;
+$page_nav->render_children_inline(1);
+</%perl>
% Jifty->web->page_navigation->render_as_yui_menubar();
</div>
</div>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list