X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=61d031376a8c30ee8a34afa4550574a340373cbf;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=bfa138fbdb79f8ee2c077edaefdef8e3fd4990d5;hpb=483a2e4dad0f7ce8dbdc06a825d1aa11bd742f6b;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index bfa138fbd..61d031376 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); - %# @@ -29,10 +28,14 @@ Example: +% if ( $mobile ) { + +% } <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, 'nocss' => $nocss, + 'mobile' => $mobile, ) |n %> @@ -43,8 +46,8 @@ Example: <% $head |n %> - STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0"> - + STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> +
+% if ( $mobile ) { + + + + +% } else { + % } -
freeside @@ -68,6 +71,19 @@ Example:
+ + + <% include('searchbar-combined.html') |n %> +
- <% include('searchbar-prospect.html') %> - <% include('searchbar-cust_main.html') %> - <% include('searchbar-address2.html') %> - <% include('searchbar-cust_bill.html') %> - <% include('searchbar-cust_svc.html') %> - <% include('searchbar-ticket.html') %> + <% 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 %> 		+ <% $title |h %> @@ -155,6 +172,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 +183,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,6 +197,13 @@ my $curuser = $FS::CurrentUser::CurrentUser; my $menu_position = $curuser->option('menu_position') || 'top'; #new default for 1.9 +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; my @agentnums = $curuser->agentnums; if ( scalar(@agentnums) == 1 ) { @@ -183,5 +211,4 @@ if ( scalar(@agentnums) == 1 ) { } else { $company_name = $conf->config('company_name'); } -