X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=5e949af15eb72ba3a98fedc52b834846d57f6446;hb=70c5f94c948159a7f561d999dbad62e0eae0cd8f;hp=22e872eca3019d5e3139162f75e11c84688301c6;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 22e872eca..5e949af15 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -15,7 +15,6 @@ Example: #old-style include( '/elements/header.html', 'Title', $menubar, $etc, $head); - %doc> %# @@ -24,276 +23,159 @@ Example:
+ | <% $company_url ? qq() : '' |n %><% $company_url ? '' : '' |n %> | <% $company_name || 'ExampleCo' %> | -Logged in as <% getotaker %> Preferences + | Logged in as <% getotaker %> logout Preferences % if ( $conf->config("ticket_system") % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { - | Ticketing preferences + | Ticketing preferences % } |
- | ||||||||||||||||
+ | + | + <% include('searchbar-combined.html') |n %> + | +% } else { -
-
| + | ||||||||||||
- | -||||||||||||||||
- | -||||||||||||||||
+ <% 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 ) { @@ -305,6 +187,10 @@ input.fstext { my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); my( $nobr, $nocss ) = ( 0, 0 ); +my $jquery = 0; + +my $mobile; + if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; @@ -313,6 +199,8 @@ if ( ref($_[0]) ) { $head = $opt->{head}; $nobr = $opt->{nobr}; $nocss = $opt->{nocss}; + $mobile = $opt->{mobile}; + $jquery = $opt->{jquery}; } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. @@ -326,25 +214,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'); } - -my $cust_width = 288; #251 #ok for IE, slightly bigger for windows firefox -my $cust_label = '(cust #, name, company'; -if ( $conf->exists('address1-search') ) { - $cust_label .= ', address'; - $cust_width += 64; -} -$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> |