X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=c8a83ca7ec2d3111b6cc38c2230d757af443a9cf;hb=796780078517c26803a7689ccd80931381de23ea;hp=c9e8f5756538965bea38ab0dcf1ee194a08b1de6;hpb=e26b6570a1ff89dcdd0aee757857c3b335bf90be;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index c9e8f5756..c8a83ca7e 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

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 + 'no_jquery' => #for use from RT, which loads its own + } + &> + + %#old-style + <& /elements/header.html, 'Title', $menubar, $etc, $head &> @@ -24,67 +24,44 @@ Example: - <% $title %> + <% encode_entities($title) || $title_noescape |n %> + + + +% if ( $mobile ) { + +% } <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, 'nocss' => $nocss, + 'mobile' => $mobile, ) |n %> +% unless ( $no_jquery ) { + + + +% } <% 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 { + + -% } - - + - - - - - - +% }
freeside<% $company_url ? qq() : '' |n %>freeside<% $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,9 +77,22 @@ Example: % if ( $menu_position eq 'top' ) { -
+ + + + <% include('searchbar-combined.html') |n %> + @@ -110,113 +100,102 @@ Example:
-% if ( $curuser->access_right('List prospects') ) { -
-
- Adv - -
-% } + 		+ <% include('searchbar-prospect.html') |n %> -% if ( $curuser->access_right('List customers') ) { -
-
- Advanced - -
-% } + 		+ <% include('searchbar-cust_main.html') |n %> -% if ( $conf->exists('address2-search') ) { -
- - -
- -
-% } + 		+ <% include('searchbar-address2.html') |n %> -% if ( $curuser->access_right('View invoices') ) { -
- -% if ( $curuser->access_right('List invoices') ) { - Adv\ -% } -
-
-% } + 		+ <% include('searchbar-cust_bill.html') |n %> -% if ( $curuser->access_right('View customer services') ) { -
-
- Advanced - -
-% } + 		+ <% include('searchbar-cust_svc.html') |n %> -% if ( $conf->config("ticket_system") ) { -
-
- Advanced - -
-% } + 		+ <% include('searchbar-ticket.html') |n %>
+% } else { #$menu_position eq 'left' + + + + + + + + +% } + + % if ( $menu_position eq 'left' ) { - +% } else { #$menu_position eq 'top' +
% } +%# page content starts here +
+ + +
+ <% 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 %> + 		- - - - <% $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. @@ -230,27 +209,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 $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)'; -