X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=e5211bf466a31d27ee3f59f71fbc1988cdf8d1aa;hb=cb7ff9f91771b63d712493d966de041d857e83e7;hp=c83529e2b186bc2e9dcd6167dde1c1fc88c04142;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index c83529e2b..e5211bf46 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -25,27 +25,40 @@ Example: <% $title |h %> + + + +% if ( $mobile ) { + +% } <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, 'nocss' => $nocss, + 'mobile' => $mobile, ) |n %> <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> <% include('logout.html') |n %> +% my $timeout = $conf->config('logout-timeout'); +% if ( $timeout && $timeout =~ /^\s*\d+\s*$/ ) { + +% } <% $head |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - +
- + @@ -65,7 +78,20 @@ Example: % if ( $menu_position eq 'top' ) { - + + +% if ( $mobile ) { + + + + +% } else { % } - +%# page content starts here
freeside<% $company_url ? qq() : '' |n %>freeside<% $company_url ? '' : '' |n %> <% $company_name || 'ExampleCo' %>
+ + + <% include('searchbar-combined.html') |n %> + @@ -138,7 +165,7 @@ Example: @@ -154,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}; @@ -162,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. @@ -175,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'); } -