X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=c8a83ca7ec2d3111b6cc38c2230d757af443a9cf;hb=50f247ce6da7497428ce772d3c37c6cba3b9c736;hp=c6ad3c387abcb4f55738c49c2f5cb00f084ae4d6;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index c6ad3c387..c8a83ca7e 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -2,18 +2,19 @@ Example: - include( '/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+ | <% $company_url ? qq() : '' |n %><% $company_url ? '' : '' |n %> | <% $company_name || 'ExampleCo' %> | -Logged in as <% getotaker %> logout Preferences + | Logged in as <% $FS::CurrentUser::CurrentUser->username |h %> logout Preferences % if ( $conf->config("ticket_system") % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { | Ticketing preferences @@ -79,18 +81,18 @@ Example: % if ( $mobile ) { - | + | - | + | <% include('searchbar-combined.html') |n %> | % } else { -+ | @@ -100,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 %> | % } @@ -132,7 +134,7 @@ Example:|||||||||||
+ | + | @@ -161,35 +163,39 @@ Example: | +% } else { #$menu_position eq 'top' +
-
- <% $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. @@ -210,11 +216,13 @@ 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'); } %init> |