X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=858be71da054dda50bf5795b6a274461d3addd97;hb=d647e72f22abc6715b6597d17a68851409b53d0b;hp=61d031376a8c30ee8a34afa4550574a340373cbf;hpb=f1cfd3ba31c346283520ea88ad3b8b265559db02;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 61d031376..858be71da 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -2,18 +2,18 @@ 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

after the title - } - ); - - #old-style - include( '/elements/header.html', 'Title', $menubar, $etc, $head); + <& /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 + } + &> + + %#old-style + <& /elements/header.html, 'Title', $menubar, $etc, $head &> @@ -23,8 +23,11 @@ Example: - <% $title |h %> + <% $title %> + + + @@ -41,19 +44,18 @@ Example: <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> - <% include('logout.html') |n %> <% $head |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - +
- + - + % if ( $mobile ) { @@ -92,7 +94,7 @@ Example: - + + @@ -140,7 +142,7 @@ Example: % if ( $menu_position eq 'left' ) { - % } - +%# page content starts here
freeside<% $company_url ? qq() : '' |n %>freeside<% $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 @@ -69,7 +71,7 @@ Example: % if ( $menu_position eq 'top' ) { -
<% include('searchbar-prospect.html') |n %> @@ -124,7 +126,7 @@ Example: % } else { #$menu_position eq 'left' -
+ @@ -156,11 +158,11 @@ Example: - <% $title |h %> + <% $title_noescape || encode_entities($title) %> % unless ( $nobr ) { @@ -170,7 +172,7 @@ Example: <% $menubar !~ /^\s*$/ ? "$menubar

" : '' %> <%init> -my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); my( $nobr, $nocss ) = ( 0, 0 ); my $mobile; @@ -178,6 +180,7 @@ my $mobile; if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; + $title_noescape = $opt->{title_noescape}; $menubar = $opt->{menubar}; $etc = $opt->{etc}; $head = $opt->{head}; @@ -204,11 +207,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'); }