diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-12-07 15:40:05 -0800 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-03 17:52:49 -0600 |
| commit | cb83fc394cf618e22a23f3282199a0cedb2e8339 (patch) | |
| tree | 79a7596bc28ff467f826276fc03949620a891565 /httemplate/elements | |
| parent | 9c11fac3f8d3f31306de62185f623b7afb6e94ee (diff) | |
RT#34237 v3 reconcile commit a2d35e30236c5d233516fa8b77c219665f97e77c
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/header-popup.html | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html index 01a7ba87f..17593693e 100644 --- a/httemplate/elements/header-popup.html +++ b/httemplate/elements/header-popup.html @@ -20,7 +20,7 @@ Example: <HTML> <HEAD> <TITLE> - <% $title |h %> + <% encode_entities($title) || $title_noescape |n %> </TITLE> <!-- per RT, to prevent IE compatibility mode --> <meta http-equiv="X-UA-Compatible" content="IE=edge" /> @@ -28,13 +28,16 @@ Example: <META HTTP-Equiv="Cache-Control" Content="no-cache"> <META HTTP-Equiv="Pragma" Content="no-cache"> <META HTTP-Equiv="Expires" Content="0"> - <% $head %> +% unless ( $no_jquery ) { + <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT> +% } + <% $head |n %> </HEAD> - <BODY <% $etc %>> + <BODY <% $etc |n %>> <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet"> -% if ( $title ) { +% if ( $title || $title_noescape ) { <FONT SIZE=6> - <CENTER><% $title |h %></CENTER> + <CENTER><% encode_entities($title) || $title_noescape |n %></CENTER> </FONT> % } % unless ( $nobr ) { @@ -42,17 +45,18 @@ Example: % } <%init> -my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); -#my( $nobr, $nocss ) = ( 0, 0 ); -my $nobr = 0; +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); +my( $nobr, $no_jquery ) = ( 0, 0 ); if ( ref($_[0]) ) { my $opt = shift; - $title = $opt->{title}; - $menubar = $opt->{menubar}; - $etc = $opt->{etc}; - $head = $opt->{head}; - $nobr = $opt->{nobr}; -# $nocss = $opt->{nocss}; + $title = $opt->{title}; + $title_noescape = $opt->{title_noescape}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; + #$nocss = $opt->{nocss}; + $no_jquery = $opt->{no_jquery}; } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. |