RT#39694 Checkpoint for v3 backport

[freeside.git] / rt / share / html / Elements / Header

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index d0662a5..ddf35b0 100755 (executable)
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -62,7 +62,7 @@
               'etc'       => $etc,
               #make space for RT menu for now# 'nobr'  => 1,
               'nocss'     => 1,
-              'no_jquery' => $JavaScript,
+              'jquery' => ($JavaScript ? 0 : 1),
           }
 &>
 % }
@@ -110,14 +110,9 @@ my $squished = RT->Config->Get('DevelMode') ? '' : '-squished';
 
 $head .= qq(<link rel="shortcut icon" href="${WebImagesURL}favicon.png" type="image/png" />\n);
 for my $cssfile ( @css_files ) {
-<<<<<<< HEAD
   $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/$cssfile" type="text/css" media="all" />\n);
 }
 $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/print.css" type="text/css" media="print" />\n);
-=======
-  $head .= qq(<link rel="stylesheet" href="$WebPath$cssfile" type="text/css" media="all" />\n);
-}
->>>>>>> 9c67763... merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
 
 for (keys %{$LinkRel || {}}) {
   $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />';
@@ -171,7 +166,5 @@ $LinkRel => undef
 $JavaScript => 1
 $SkipDoctype => 0
 $RichText => 1
-$BodyClass => undef
-$JavaScript => 1
 $Popup => 0
 </%ARGS>