From 1bcce7c531fae5b69584be44c9c74967c687b1d1 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 19 Mar 2010 08:26:20 +0000 Subject: [PATCH] skin RT 3.8, RT#6640 --- rt/FREESIDE_MODIFIED | 8 +- rt/share/html/Elements/Header | 92 ++++++++++++----------- rt/share/html/Elements/PageLayout | 10 ++- rt/share/html/NoAuth/css/freeside2.1/freeside.css | 14 ++-- rt/share/html/NoAuth/css/freeside2.1/layout.css | 6 +- rt/share/html/NoAuth/css/freeside2.1/nav.css | 9 ++- 6 files changed, 77 insertions(+), 62 deletions(-) diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index bf599cbe4..676b01205 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -16,9 +16,8 @@ lib/RT/URI/freeside.pm lib/RT/URI/freeside/Internal.pm lib/RT/URI/freeside/XMLRPC.pm share/html/Admin/Users/Modify.html - html/Elements/Header - html/Elements/Menu - html/Elements/PageLayout + share/html/Elements/Header + share/html/Elements/PageLayout html/Elements/QuickCreate html/Elements/SelectDate html/Elements/SimpleSearch @@ -38,6 +37,9 @@ share/html/Ticket/ModifyCustomers.html html/NoAuth/css/3.5-default/misc.css html/NoAuth/css/3.5-default/titlebox.css share/html/NoAuth/css/freeside2.1/freeside.css +share/html/NoAuth/css/freeside2.1/nav.css +share/html/NoAuth/css/freeside2.1/base.css +share/html/NoAuth/css/freeside2.1/layout.css html/Widgets/TitleBoxStart diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index 953efcb22..d970ac52f 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -45,61 +45,67 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - +<% include( '/elements/header.html', { + 'title' => $Title, + 'head' => $head, + 'etc' => $etc, + 'nobr' => 1, + 'nocss' => 1, + }) |n +%> +<%INIT> +$r->headers_out->{'Pragma'} = 'no-cache'; +$r->headers_out->{'Cache-control'} = 'no-cache'; - -<%$Title%> +my $id = $m->request_comp->path; +$id =~ s|^/||g; +$id =~ s|/|-|g; +$id =~ s|\.html$||g; +$id =~ s|index$||g + if $id ne 'index'; +$id =~ s|-$||g; +my $head = ''; -% if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) { - -% } +if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) { + $head .= ''; +} - - - +my $WebPath = RT->Config->Get('WebPath'); +my $WebImagesURL = RT->Config->Get('WebImagesURL'); +my $WebDefaultStylesheet = + RT->Config->Get('WebDefaultStylesheet', $session{'CurrentUser'}); +my $squished = RT->Config->Get('DevelMode') ? '' : '-squished'; -% for (keys %{$LinkRel || {}}) { - -% } +$head .= < + + +END -% if ( $RSSAutoDiscovery ) { - -% } +for (keys %{$LinkRel || {}}) { + $head .= qq('; +} -% if ($JavaScript) { -<& HeaderJavascript, focus => $Focus, onload => $onload &> -% } +if ( $RSSAutoDiscovery ) { + $head .= qq(); +} -% my $stylesheet_plugin = "/NoAuth/css/". RT->Config->Get( 'WebDefaultStylesheet', $session{'CurrentUser'} )."/InHeader"; -% if ($m->comp_exists($stylesheet_plugin) ) { -<& $stylesheet_plugin &> -% } -% $m->callback( %ARGS, CallbackName => 'Head' ); +if ($JavaScript) { + $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload); +} - - > +my $stylesheet_plugin = "/NoAuth/css/$WebDefaultStylesheet/InHeader"; +if ($m->comp_exists($stylesheet_plugin) ) { + $head .= $m->scomp($stylesheet_plugin); +} -% if ($ShowBar) { -<& /Elements/Logo, %ARGS &> +# $m->callback( %ARGS, CallbackName => 'Head' ); +$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS ); -
- <& /Elements/PersonalQuickbar, %ARGS &> -% } +my $etc = ''; +$etc .= qq[ id="comp-$id"] if $id; -<%INIT> -$r->headers_out->{'Pragma'} = 'no-cache'; -$r->headers_out->{'Cache-control'} = 'no-cache'; - -my $id = $m->request_comp->path; -$id =~ s|^/||g; -$id =~ s|/|-|g; -$id =~ s|\.html$||g; -$id =~ s|index$||g - if $id ne 'index'; -$id =~ s|-$||g; <%ARGS> diff --git a/rt/share/html/Elements/PageLayout b/rt/share/html/Elements/PageLayout index 981e58a3c..b5800ce70 100755 --- a/rt/share/html/Elements/PageLayout +++ b/rt/share/html/Elements/PageLayout @@ -45,23 +45,25 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} + +% if (0) { ## new ticket via customer, and we already have a ticket search box
% foreach my $action (reverse sort keys %{$topactions}) { <% $topactions->{"$action"}->{'html'} |n %> % }
+% } -%# End of div#quickbar from /Elements/Header -
- +% if (0) { ##FREESIDE MENUS INSTEAD## if ( $show_menu ) { % if ( $show_menu ) { % } +% }