From 70569273833d91085c6c562865a78a08ddde49a1 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 8 Jul 2009 11:12:46 +0000 Subject: borg RT menus, RT#1169 --- rt/FREESIDE_MODIFIED | 3 +- rt/html/Elements/Header | 143 +++++++++++++-------------------------- rt/html/Elements/PageLayout | 31 +-------- rt/html/Elements/Tabs | 17 ----- rt/html/Prefs/SearchOptions.html | 2 +- rt/html/User/Prefs.html | 2 +- 6 files changed, 55 insertions(+), 143 deletions(-) (limited to 'rt') diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index 66917795c..948eeab66 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -31,4 +31,5 @@ html/Elements/FreesideNewCust html/Elements/FreesideSearch html/Elements/FreesideSvcSearch - + html/User/Prefs.html + html/Prefs/SearchOptions.html diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index bf6fa46fa..ffe653666 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -45,102 +45,16 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - +<% include( '/elements/header.html', { + 'title' => $Title, + 'head' => $head, + 'nobr' => 1, + }) |n +%> - - -<%$Title%> - -% if ($Refresh && $Refresh > 0) { - -% } - - - - - -% if ( $RSSAutoDiscovery ) { - -% } - - - - - - -<& /Elements/Callback, _CallbackName => 'Head', %ARGS &> - - - - > - -% if ($ShowBar) { - - - - - - - - - - - - - -
freeside<% &RT::URI::freeside::FreesideGetConfig('company_name') || 'ExampleCo' %> - -
-
- <&|/l&>Skip Menu | -% if ($session{'CurrentUser'}->Name) { - <&|/l, "".$session{'CurrentUser'}->Name."" &>Logged in as [_1] -% if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { - | <&|/l&>Preferences -% } -% } else { - <&|/l&>Not logged in. -% } - <& /Elements/Callback, %ARGS &> -% unless (!$session{'CurrentUser'}->Name -% or ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth)) { - | <&|/l&>Logout -% } -
-% } - -
- - - - - - - -
- - Freeside v<% &RT::URI::freeside::FreesideVersion() %>
- ">Documentation
- - 		- - RT v<% $RT::VERSION %>
- Documentation
- -
-
+%# if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { +%# | <&|/l&>Preferences +%# } <%INIT> $r->headers_out->{'Pragma'} = 'no-cache'; @@ -155,6 +69,45 @@ $id =~ s|\.html$||g; $id =~ s|index$||g if $id ne 'index'; $id =~ s|-$||g; + +my $head = ''; + +if ($Refresh && $Refresh > 0) { + $head .= ''; +} + +$head .= < + + +END + +if ( $RSSAutoDiscovery ) { + $head .= qq(); +} + +$head .= < + + +'; + +$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS ); + +my $etc = ''; +$etc .= qq[ id="comp-$id"] if $id; + <%ARGS> diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index b9fd31f71..6a392270c 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -45,44 +45,19 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - - - - - - - -
-% my $notfirst = 0; foreach my $action (sort keys %{$topactions}) { - -
- -% } - - - -
-% $m->out($topactions->{"$action"}->{'html'}); -
- -%# End of div#quickbar from /Elements/Header - - - - -
-% if ( $show_menu ) { +% if (0) { ##FREESIDE MENUS INSTEAD## if ( $show_menu ) { +%# if ( $show_menu ) { % }