X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FHeader;h=5e08fe384ae8b643f144cd6213481b46379ddf89;hb=b8988e1d3ac75af63c85e8563e57701030315a9e;hp=f9bd27fbf1e29cbd142cc7fa3cb944978b86435c;hpb=75162bb14b3e38d66617077843f4dfdcaf09d5c4;p=freeside.git diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index f9bd27fbf..5e08fe384 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -45,62 +45,95 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - +<& /elements/header.html, { + 'title' => $Title, + 'head' => $head, + 'etc' => $etc, + #make space for RT menu for now# 'nobr' => 1, + 'nocss' => 1, + } +&> +<%INIT> +#for "Site CSS from theme editor" below +#use Scalar::Util qw(blessed); - -<%$Title%> +$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; -% if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) { -% my $URL = $m->notes->{LogoutURL}; $URL = $URL ? ";URL=$URL" : ""; - " /> -% } +my $style = $session{'CurrentUser'} + ? $session{'CurrentUser'}->Stylesheet + : RT->Config->Get('WebDefaultStylesheet'); - - - +my @css_files; +if ( RT->Config->Get('DevelMode') ) { + @css_files = ( "$style/main.css", RT->Config->Get('CSSFiles' ) ); +} +else { + my $key = + RT::Interface::Web::SquishedCSS( $style )->Key; + @css_files = "$style-squished-$key.css"; +} -% for (keys %{$LinkRel || {}}) { - -% } +my $head = ''; -% if ( $RSSAutoDiscovery ) { - -% } +#XXX $head .= <& /Elements/Framekiller &>; -% if ($JavaScript) { -<& HeaderJavascript, focus => $Focus, onload => $onload &> -% } +if ($Refresh && $Refresh =~ /^(\d+)/ && $1 > 0) { + my $URL = $m->notes->{RefreshURL}; $URL = $URL ? ";URL=$URL" : ""; + $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' ); +my $WebPath = RT->Config->Get('WebPath'); +my $WebImagesURL = RT->Config->Get('WebImagesURL'); +my $squished = RT->Config->Get('DevelMode') ? '' : '-squished'; - - > +$head .= qq(\n); +for my $cssfile ( @css_files ) { + $head .= qq(\n); +} +$head .= qq(\n); -% if ($ShowBar) { -<& /Elements/Logo, %ARGS &> +for (keys %{$LinkRel || {}}) { + $head .= qq('; +} -
- <& /Elements/PersonalQuickbar, %ARGS &> -% } +if ( $RSSAutoDiscovery ) { + $head .= qq(); +} -<%INIT> -$r->headers_out->{'Pragma'} = 'no-cache'; -$r->headers_out->{'Cache-control'} = 'no-cache'; +if ($JavaScript) { + $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText ); +} + +my $stylesheet_plugin = "/NoAuth/css/$style/InHeader"; +if ($m->comp_exists($stylesheet_plugin) ) { + $head .= $m->scomp($stylesheet_plugin); +} + +# +# + +# $m->callback( %ARGS, CallbackName => 'Head' ); +$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS ); + +my $sbs = RT->Config->Get("UseSideBySideLayout", $session{'CurrentUser'}) ? ' sidebyside' : ''; +my $etc = qq[ class="\L$style$sbs" ]; +$etc .= qq[ id="comp-$id"] if $id; -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> @@ -116,4 +149,6 @@ $RSSAutoDiscovery => undef $onload => undef $LinkRel => undef $JavaScript => 1 +$SkipDoctype => 0 +$RichText => 1