X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Fheader.html;h=c8a83ca7ec2d3111b6cc38c2230d757af443a9cf;hb=796780078517c26803a7689ccd80931381de23ea;hp=30a6189f661a1866f4582eefaf296f48144dc1ea;hpb=5e0a78a1dca6d39ea70c8c01002024929e36f2d8;p=freeside.git
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 30a6189f6..c8a83ca7e 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -4,11 +4,12 @@ Example:
<& /elements/header.html',
{
- 'title' => 'Title',
- 'menubar' => \@menubar,
- 'etc' => '', #included in
tag, for things like onLoad=
- 'head' => '', #included before closing tag
- 'nobr' => 0, #1 for no after the title
+ 'title' => 'Title',
+ 'menubar' => \@menubar,
+ 'etc' => '', #included in tag, for things like onLoad=
+ 'head' => '', #included before closing tag
+ 'nobr' => 0, #1 for no after the title
+ 'no_jquery' => #for use from RT, which loads its own
}
&>
@@ -23,7 +24,7 @@ Example:
- <% $title |h %>
+ <% encode_entities($title) || $title_noescape |n %>
@@ -42,6 +43,11 @@ Example:
) |n
%>
+% unless ( $no_jquery ) {
+
+
+
+% }
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
@@ -75,18 +81,18 @@ Example:
% if ( $mobile ) {
-
+
-
+
<% include('searchbar-combined.html') |n %>
% } else {
-
+
@@ -96,27 +102,27 @@ Example:
-
+
<% include('searchbar-prospect.html') |n %>
-
+
<% include('searchbar-cust_main.html') |n %>
-
+
<% include('searchbar-address2.html') |n %>
-
+
<% include('searchbar-cust_bill.html') |n %>
-
+
<% include('searchbar-cust_svc.html') |n %>
-
+
<% include('searchbar-ticket.html') |n %>
% }
@@ -128,7 +134,7 @@ Example:
@@ -142,7 +148,7 @@ Example:
% if ( $menu_position eq 'left' ) {
-
+% } else { #$menu_position eq 'top'
+
% }
%# page content starts here
-
- <% $title |h %>
-
+
+ <% $title_noescape || encode_entities($title) %>
+
% unless ( $nobr ) {
-
+
% }
<% $menubar !~ /^\s*$/ ? "$menubar " : '' %>
<%init>
-my( $title, $menubar, $etc, $head ) = ( '', '', '', '' );
-my( $nobr, $nocss ) = ( 0, 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};
+ $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 = $opt->{no_jquery};
} else {
($title, $menubar) = ( shift, shift );
$etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.