X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=4f5015e7a11ecb24026964bf45385393554cb376;hp=90ab0b71c12eb9275623f2ce8dd3a6be8f4f2a7c;hb=3ff1fb4e10fdaef86527c10bd416e988d2a62a49;hpb=f22b714f2b7a38c8a930d8248ccb32751db82b5e diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 90ab0b71c..4f5015e7a 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -2,19 +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 &> @@ -29,28 +28,31 @@ Example: +% 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 %> <% $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 { % } - +%# page content starts here
freeside <% $company_name || 'ExampleCo' %> Logged in as <% getotaker %>  logout
Preferences + 		Logged in as <% getotaker %>  logout
Preferences % if ( $conf->config("ticket_system") % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { | Ticketing preferences @@ -66,7 +68,20 @@ Example: % if ( $menu_position eq 'top' ) { -
+ + + <% include('searchbar-combined.html') |n %> + @@ -139,7 +155,7 @@ Example: @@ -155,6 +171,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 +182,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 +196,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 +210,4 @@ if ( scalar(@agentnums) == 1 ) { } else { $company_name = $conf->config('company_name'); } -