X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FHeader;h=2503455fc0216c43369df8ee2fd61c6ff73ac58c;hb=6832c30b3be7fe87d1daafa52f54c203c4f44dab;hp=fb6cbdaa6e069cbc3a369aad6d7c88da9ea02eb1;hpb=e09a570e1a1b53a29124e22494ce024840b18052;p=freeside.git diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index fb6cbdaa6..2503455fc 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -46,10 +46,10 @@ %# %# END BPS TAGGED BLOCK }}} <& /elements/header.html, { - 'title' => $Title, + 'title_noescape' => $Title, 'head' => $head, 'etc' => $etc, - #make space for RT menu for now# 'nobr' => 1, + 'nobr' => 1, 'nocss' => 1, 'no_jquery' => $JavaScript, } @@ -101,11 +101,12 @@ my $WebImagesURL = RT->Config->Get('WebImagesURL'); my $squished = RT->Config->Get('DevelMode') ? '' : '-squished'; if ( $JavaScript ) { - $head .= $m->scomp('JavascriptConfig'); + $head .= $m->scomp('/Elements/JavascriptConfig'); } for my $cssfile ( @css_files ) { $head .= qq(\n); +} for (keys %{$LinkRel || {}}) { $head .= qq('; @@ -117,26 +118,33 @@ if ( $RSSAutoDiscovery ) { } if ($JavaScript) { - my $stylesheet_plugin = "/NoAuth/css/$style/InHeader"; - if ($m->comp_exists($stylesheet_plugin) ) { - $head .= $m->scomp($stylesheet_plugin); - } + $head .= $m->scomp('/Elements/HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText ); + +$head .= q[ + +]; + } # $m->callback( %ARGS, CallbackName => 'Head' ); $head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS ); -if ($JavaScript) { - $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText ); -} - #XXX $head .= <& /Elements/Framekiller &>; my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" '; $etc .= qq[ id="comp-$id"] if $id; - <%ARGS> #$Focus => 'focus' $Focus => '' @@ -150,4 +158,5 @@ $LinkRel => undef $SkipDoctype => 0 $RichText => 1 $BodyClass => undef +$JavaScript => 1