X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=0174e1f92e60689dcf85a52d4d9fceceb5123d2f;hb=df4a68099abfa067014f36f92874fccefdea662e;hp=4f5015e7a11ecb24026964bf45385393554cb376;hpb=3ff1fb4e10fdaef86527c10bd416e988d2a62a49;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 4f5015e7a..0174e1f92 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -23,8 +23,11 @@ Example: - <% $title |h %> + <% $title_noescape || encode_entities($title) %> + + + @@ -39,6 +42,7 @@ Example: ) |n %> + <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> @@ -48,11 +52,11 @@ Example: STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - + - - % } else { - - - - - - - % } @@ -125,7 +129,7 @@ Example: - @@ -139,7 +143,7 @@ Example: % if ( $menu_position eq 'left' ) { - +% } else { #$menu_position eq 'top' +
% } %# 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 @@ -72,18 +76,18 @@ Example: % if ( $mobile ) { - 		+ + <% include('searchbar-combined.html') |n %> + @@ -93,27 +97,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 %>
+
+ @@ -154,22 +158,24 @@ Example: - - <% $title |h %> - +

+ <% $title_noescape || encode_entities($title) %> +

% unless ( $nobr ) { -

+
% } <% $menubar !~ /^\s*$/ ? "$menubar

" : '' %> <%init> -my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); my( $nobr, $nocss ) = ( 0, 0 ); my $mobile; @@ -177,6 +183,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}; @@ -203,11 +210,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'); }