X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=c83529e2b186bc2e9dcd6167dde1c1fc88c04142;hb=8d534e61d74e561a15f0863a835cda4af639a9ea;hp=8a9cb8526ef7407e61a5588a3ba38478b8147c95;hpb=9a778387bc4bfc97d28b25a9c123700fc6c15062;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 8a9cb8526..c83529e2b 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); - %# @@ -40,45 +39,11 @@ Example: <% 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"> +
-% } -
freeside @@ -110,76 +75,47 @@ 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' + + + + + + + + +% } + + @@ -190,11 +126,20 @@ Example: + +
+ <% 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 |h %> @@ -238,19 +183,4 @@ if ( scalar(@agentnums) == 1 ) { $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)'; -