Revert "RT#34237: installer scheduling [removed edit links, v3 only]"

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

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index c409373..d264484 100755 (executable)
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -45,8 +45,19 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+% if ( $Popup ) {
+<& /elements/header-popup.html, {
+              'title_noescape' => $Title,
+              'head'      => $head,
+              'etc'       => $etc,
+              'nobr'      => 1,
+              #'nocss'     => 1,
+              'no_jquery' => $JavaScript,
+          }
+&>
+% } else {
 <& /elements/header.html, {
-              'title'     => $Title,
+              'title_noescape' => $Title,
               'head'      => $head,
               'etc'       => $etc,
               #make space for RT menu for now# 'nobr'  => 1,
@@ -54,6 +65,7 @@
               'no_jquery' => $JavaScript,
           }
 &>
+% }
 <%INIT>
 #for "Site CSS from theme editor" below
 #use Scalar::Util qw(blessed);
@@ -98,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->{$_} . '" />';
@@ -159,6 +166,5 @@ $LinkRel => undef
 $JavaScript => 1
 $SkipDoctype => 0
 $RichText => 1
-$BodyClass => undef
-$JavaScript => 1
+$Popup => 0
 </%ARGS>