X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=4e0c74b8af02de640969928a23d9f8466675a1ce;hb=afe30fc7315196cc4ae6da7606995cb8388d1a32;hp=08de3b6861a9f6554c0973cc7e65869ad88d6ed5;hpb=55e2a98988c76425ec2dac583b91410eaf835659;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 08de3b686..4e0c74b8a 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_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 @@ -100,137 +71,98 @@ Example: % if ( $menu_position eq 'top' ) { -
+ |
|
-
-
-
- |
+ <% include('searchbar-combined.html') |n %>
|
-
- |
-
+ |
+
|
- | ||||||||||||||||||||||||||
-% if ( $curuser->access_right('List prospects') ) { - -% } + <% include('searchbar-prospect.html') |n %> | -% if ( $curuser->access_right('List customers') ) { - -% } + <% include('searchbar-cust_main.html') |n %> | -% if ( $conf->exists('address2-search') ) { - -% } + <% include('searchbar-address2.html') |n %> | -% if ( $curuser->access_right('View invoices') ) { - -% } + <% include('searchbar-cust_bill.html') |n %> | -% if ( $curuser->access_right('View customer services') ) { - -% } + <% include('searchbar-cust_svc.html') |n %> | -% if ( $conf->config("ticket_system") ) { - -% } + <% include('searchbar-ticket.html') |n %> | +% }
+ |
- - -
+ <% include('searchbar-prospect.html') |n %> + <% include('searchbar-cust_main.html') |n %> + <% include('searchbar-address2.html') |n %> + <% include('searchbar-cust_bill.html') |n %> + <% include('searchbar-cust_svc.html') |n %> + <% include('searchbar-ticket.html') |n %> |
- % } - - | +%# page content starts here + | - <% $title %> + <% $title |h %> % unless ( $nobr ) { @@ -242,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}; @@ -250,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. @@ -263,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 ) { @@ -270,20 +213,4 @@ if ( scalar(@agentnums) == 1 ) { } else { $company_name = $conf->config('company_name'); } - -my $prospect_label = '(name, company or phone)'; - -my $cust_width = 246; -my $cust_label = '(cust #, name, company'; -if ( $conf->exists('address1-search') ) { - $cust_label .= ', address'; - $cust_width += 56; -} -$cust_label .= ' or contact phone)'; - -my $address2_label = '(Unit #)'; -my $inv_label = '(inv #)'; -my $svc_label = '(user, email, ip, mac, domain or service phone)'; -my $ticketing_label = '(ticket #, subject, email or fulltext:text)'; - %init> |