X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=a67538d11ef74bd6933cd4a27639498978b77cb4;hb=06809c379e25e6753d39ca79a39c977e5194c696;hp=61d031376a8c30ee8a34afa4550574a340373cbf;hpb=f1cfd3ba31c346283520ea88ad3b8b265559db02;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 61d031376..a67538d11 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -9,6 +9,7 @@ Example: '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,8 +24,11 @@ Example: - <% $title |h %> + <% encode_entities($title) || $title_noescape |n %> + + + @@ -39,17 +43,35 @@ Example: ) |n %> +% unless ( $no_jquery ) { + + + +% } + <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> <% include('logout.html') |n %> +% my $timeout = $conf->config('logout-timeout'); +% if ( $timeout && $timeout =~ /^\s*\d+\s*$/ ) { + +% } <% $head |n %> +%# announce our base path, and the Mason comp path of this page + + STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - +
- + @@ -69,7 +91,7 @@ Example: % if ( $menu_position eq 'top' ) { - + % if ( $mobile ) { @@ -92,7 +114,7 @@ Example: - + + @@ -140,7 +162,7 @@ Example: % if ( $menu_position eq 'left' ) { - % } - +%# page content starts here
freeside<% $company_url ? qq() : '' |n %>freeside<% $company_url ? '' : '' |n %> <% $company_name || 'ExampleCo' %>
<% include('searchbar-prospect.html') |n %> @@ -124,7 +146,7 @@ Example: % } else { #$menu_position eq 'left' -
+ @@ -156,11 +178,11 @@ Example: - <% $title |h %> + <% $title_noescape || encode_entities($title) %> % unless ( $nobr ) { @@ -168,22 +190,25 @@ Example: % } <% $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 = 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. @@ -204,11 +229,14 @@ if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override $mobile = $1; } -my $company_name; +my($company_name, $company_url); my @agentnums = $curuser->agentnums; if ( scalar(@agentnums) == 1 ) { $company_name = $conf->config('company_name', $agentnums[0] ); + $company_url = $conf->config('company_url', $agentnums[0] ); } else { $company_name = $conf->config('company_name'); + $company_url = $conf->config('company_url'); } +