projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.2.16
[freeside.git]
/
rt
/
share
/
html
/
Elements
/
Header
diff --git
a/rt/share/html/Elements/Header
b/rt/share/html/Elements/Header
index
717bf07
..
1cc1915
100755
(executable)
--- a/
rt/share/html/Elements/Header
+++ b/
rt/share/html/Elements/Header
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
9
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-45,8
+45,19
@@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
%# 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, {
<& /elements/header.html, {
- 'title
'
=> $Title,
+ 'title
_noescape'
=> $Title,
'head' => $head,
'etc' => $etc,
'nobr' => 1,
'head' => $head,
'etc' => $etc,
'nobr' => 1,
@@
-54,6
+65,7
@@
'no_jquery' => $JavaScript,
}
&>
'no_jquery' => $JavaScript,
}
&>
+% }
<%INIT>
#for "Site CSS from theme editor" below
$r->headers_out->{'Pragma'} = 'no-cache';
<%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 &>;
#XXX $head .= <& /Elements/Framekiller &>;
@@
-159,4
+174,5
@@
$SkipDoctype => 0
$RichText => 1
$BodyClass => undef
$JavaScript => 1
$RichText => 1
$BodyClass => undef
$JavaScript => 1
+$Popup => 0
</%ARGS>
</%ARGS>