X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=4e0c74b8af02de640969928a23d9f8466675a1ce;hb=822d38841a1620b8b8e8c5ac4102ad64de9ae17f;hp=432e9c6afb49d77a23b68328081bd9c219c148e4;hpb=68fcc90d8e95f1efe0efe07b2f59e5fab2d8c535;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 432e9c6af..4e0c74b8a 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -2,18 +2,18 @@ Example: - include( '/elements/header.html', - { - 'title' => 'Title', - 'menubar' => \@menubar, - 'etc' => '', #included in tag, for things like onLoad= - 'head' => '', #included before closing tag - 'nobr' => 0, #1 for no

after the title - } - ); - - #old-style - include( '/elements/header.html', 'Title', $menubar, $etc, $head); + <& /elements/header.html', + { + 'title' => 'Title', + 'menubar' => \@menubar, + 'etc' => '', #included in tag, for things like onLoad= + 'head' => '', #included before closing tag + 'nobr' => 0, #1 for no

after the title + } + &> + + %#old-style + <& /elements/header.html, 'Title', $menubar, $etc, $head &> @@ -25,6 +25,9 @@ Example: <% $title |h %> + + + @@ -41,19 +44,18 @@ Example: <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> - <% include('logout.html') |n %> <% $head |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - +
- + % if ( $mobile ) { @@ -92,7 +94,7 @@ Example: - + + @@ -140,7 +142,7 @@ Example: % if ( $menu_position eq 'left' ) { - % } - +%# page content starts here
freeside <% $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 @@ -69,7 +71,7 @@ Example: % if ( $menu_position eq 'top' ) { -
<% include('searchbar-prospect.html') |n %> @@ -124,7 +126,7 @@ Example: % } else { #$menu_position eq 'left' -
+ @@ -156,7 +158,7 @@ Example: @@ -190,13 +192,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,6 +199,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 ) {