diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-05 18:26:01 -0600 |
---|---|---|
committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-05 18:26:01 -0600 |
commit | ac33786c789f76aef8c6bea4726d9bdf301cb04a (patch) | |
tree | 69574140f049031340c4cc1dbb54c3572ef79f93 /httemplate/elements/header.html | |
parent | e191e4ede379c5f032f1b139ae868becb066547d (diff) |
RT#34237 installer scheduling [various v3 backport fixes]
Diffstat (limited to 'httemplate/elements/header.html')
-rw-r--r-- | httemplate/elements/header.html | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 5e949af15..a5dedd749 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -9,6 +9,7 @@ Example: 'etc' => '', #included in <BODY> tag, for things like onLoad= 'head' => '', #included before closing </HEAD> tag 'nobr' => 0, #1 for no <BR><BR> after the title + 'no_jquery' => #for use from RT, which loads its own } ); @@ -23,7 +24,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" /> @@ -42,7 +43,7 @@ Example: ) |n %> -% if ( $jquery ) { +% unless ( $no_jquery ) { <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css"> <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT> <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT> @@ -175,7 +176,7 @@ Example: <TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> --> <FONT SIZE=6> - <% $title |h %> + <% $title_noescape || encode_entities($title) %> </FONT> % unless ( $nobr ) { @@ -185,22 +186,22 @@ Example: <% $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %> <%init> -my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); -my( $nobr, $nocss ) = ( 0, 0 ); -my $jquery = 0; +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); +my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 ); my $mobile; if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; - $menubar = $opt->{menubar}; - $etc = $opt->{etc}; - $head = $opt->{head}; - $nobr = $opt->{nobr}; - $nocss = $opt->{nocss}; - $mobile = $opt->{mobile}; - $jquery = $opt->{jquery}; + $title_noescape = $opt->{title_noescape}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; + $nocss = $opt->{nocss}; + $mobile = $opt->{mobile}; + $no_jquery = exists($opt->{no_jquery}) ? $opt->{no_jquery} : 1; #v3 only, 0 on v4+ } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. |