X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FHeader;h=1cc1915d77bf6473fa113de7e1907b56ab1f078a;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hp=2503455fc0216c43369df8ee2fd61c6ff73ac58c;hpb=0ed195595b5c7ea404c8848d9d1881ada4214489;p=freeside.git

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index 2503455fc..1cc1915d7 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,6 +45,17 @@
 %# 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_noescape' => $Title,
               'head'      => $head,
@@ -54,6 +65,7 @@
               'no_jquery' => $JavaScript,
           }
 &>
+% }
 <%INIT>
 #for "Site CSS from theme editor" below
 $r->headers_out->{'Pragma'} = 'no-cache';
@@ -136,8 +148,11 @@ jQuery(document).ready(function(){
 
 }
 
-# $m->callback( %ARGS, CallbackName => 'Head' );
-$head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );
+$head .= $m->callback(
+  %ARGS,
+  CallbackName => 'Head',
+  ReturnComponentOutput => 1,
+);
 
 #XXX $head .= <& /Elements/Framekiller &>;
 
@@ -159,4 +174,5 @@ $SkipDoctype => 0
 $RichText => 1
 $BodyClass => undef
 $JavaScript => 1
+$Popup => 0
 </%ARGS>