X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=e5211bf466a31d27ee3f59f71fbc1988cdf8d1aa;hb=f279524a0b3266ae4fb342ab8ee26d8918c86c75;hp=b76d09d70e19ae2c623a152739f6365f4a79a17e;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index b76d09d70..e5211bf46 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -15,7 +15,6 @@ Example: #old-style include( '/elements/header.html', 'Title', $menubar, $etc, $head); - %doc> %# @@ -26,27 +25,40 @@ Example:
<% $company_url ? qq() : '' |n %> |
<% $company_name || 'ExampleCo' %> | @@ -66,7 +78,20 @@ Example: % if ( $menu_position eq 'top' ) { -|||||||||
+ + | ++ <% include('searchbar-combined.html') |n %> + | + +% } else {@@ -139,8 +165,8 @@ Example: | % } - -+%# page content starts here + | <% $title |h %> @@ -155,6 +181,9 @@ Example: my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); my( $nobr, $nocss ) = ( 0, 0 ); + +my $mobile; + if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; @@ -163,6 +192,7 @@ if ( ref($_[0]) ) { $head = $opt->{head}; $nobr = $opt->{nobr}; $nocss = $opt->{nocss}; + $mobile = $opt->{mobile}; } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. @@ -176,12 +206,20 @@ my $curuser = $FS::CurrentUser::CurrentUser; my $menu_position = $curuser->option('menu_position') || 'top'; #new default for 1.9 -my $company_name; +if ( !defined($mobile) ) { + $mobile = $curuser->option('mobile_menu',1) && FS::UI::Web::is_mobile(); +} +if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override + $mobile = $1; +} + +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> |