X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Fheader.html;h=699f82c53d65764d3762bd63c4cb584a54d138f9;hb=8eb6542c022ac84b125416f3fb0828b278ba600a;hp=08de3b6861a9f6554c0973cc7e65869ad88d6ed5;hpb=55e2a98988c76425ec2dac583b91410eaf835659;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 08de3b686..699f82c53 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -2,19 +2,19 @@ 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() : '' |n %><% $company_url ? '' : '' |n %> | <% $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,156 +83,126 @@ 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 %> |
- +% } else { #$menu_position eq 'top' + | - |
-
-
- <% $title %>
-
+ + <% $title_noescape || encode_entities($title) %> +% unless ( $nobr ) { -+ % } <% $menubar !~ /^\s*$/ ? "$menubar " : '' %> + <%init> -my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); -my( $nobr, $nocss ) = ( 0, 0 ); +my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); +my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 ); + +my $mobile; + if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; - $menubar = $opt->{menubar}; - $etc = $opt->{etc}; - $head = $opt->{head}; - $nobr = $opt->{nobr}; - $nocss = $opt->{nocss}; + $title_noescape = $opt->{title_noescape}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; + $nocss = $opt->{nocss}; + $mobile = $opt->{mobile}; + $no_jquery = $opt->{no_jquery}; } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. @@ -263,27 +216,21 @@ 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 $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> |