X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=766d3ecbd54d104a1c14fe69128e40491672c781;hb=8cfa2aa87c0c9f44da6b5b9e065868524ca014b3;hp=b76d09d70e19ae2c623a152739f6365f4a79a17e;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index b76d09d70..766d3ecbd 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+ | <% $company_url ? qq() : '' %><% $company_url ? '' : '' %> | <% $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 @@ -66,7 +71,20 @@ Example: % if ( $menu_position eq 'top' ) { -
+
+ |
+
+ <% include('searchbar-combined.html') |n %>
+ |
+
+% } else {
@@ -139,8 +158,8 @@ Example:
|
% }
-
-
+%# page content starts here
+ |
<% $title |h %>
@@ -155,6 +174,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 +185,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,12 +199,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');
}
-
%init>
| |