X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=e5211bf466a31d27ee3f59f71fbc1988cdf8d1aa;hb=ac07dfa491181046e8dd2881d6093da9e8d3616f;hp=432e9c6afb49d77a23b68328081bd9c219c148e4;hpb=68fcc90d8e95f1efe0efe07b2f59e5fab2d8c535;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 432e9c6af..e5211bf46 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -25,6 +25,9 @@ Example: <% $title |h %> + + + @@ -42,14 +45,20 @@ Example: <% 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"> - +
- + @@ -69,7 +78,7 @@ Example: % if ( $menu_position eq 'top' ) { - + % if ( $mobile ) { @@ -92,7 +101,7 @@ Example: - + + @@ -140,7 +149,7 @@ Example: % if ( $menu_position eq 'left' ) { - % } - +%# page content starts here
freeside<% $company_url ? qq() : '' |n %>freeside<% $company_url ? '' : '' |n %> <% $company_name || 'ExampleCo' %>
<% include('searchbar-prospect.html') |n %> @@ -124,7 +133,7 @@ Example: % } else { #$menu_position eq 'left' -
+ @@ -156,7 +165,7 @@ Example: @@ -190,13 +199,6 @@ if ( ref($_[0]) ) { $head = @_ ? shift : ''; #$head is for things that go in the section } -if ( !defined($mobile) ) { - $mobile = FS::UI::Web::is_mobile(); -} -if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override - $mobile = $1; -} - my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; @@ -204,11 +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'); }