X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=61d031376a8c30ee8a34afa4550574a340373cbf;hb=ea3ce8d7f076e7fecff4be7ae63bc413adb0adf5;hp=08de3b6861a9f6554c0973cc7e65869ad88d6ed5;hpb=55e2a98988c76425ec2dac583b91410eaf835659;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 08de3b686..61d031376 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); - %# @@ -24,15 +23,19 @@ Example: - <% $title %> + <% $title |h %> +% if ( $mobile ) { + +% } <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, 'nocss' => $nocss, + 'mobile' => $mobile, ) |n %> @@ -40,51 +43,17 @@ Example: <% include('rs_init_object.html') |n %> <% include('logout.html') |n %> - - <% $head |n %> - <% $etc |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"> +
- - - - - - +% } else { - - - - - - - -% } + +% }
freeside <% $company_name || 'ExampleCo' %> Logged in as <% getotaker %>  [ logout ]
Preferences + 		Logged in as <% getotaker %>  logout
Preferences % if ( $conf->config("ticket_system") % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { | Ticketing preferences @@ -102,104 +71,69 @@ Example:
+% if ( $mobile ) { + + - - - - - -
<% include('/elements/about_freeside.html') |n %><% include('/elements/about_rt.html') |n %>
+ 		+ <% include('searchbar-combined.html') |n %>
-
+ +
-% 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' + + + + + + + + +% } + + @@ -210,27 +144,23 @@ Example: -
- -
- - - - - - -
<% include('/elements/about_freeside.html') |n %>
<% include('/elements/about_rt.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 %> - % } - + - <% $title %> + <% $title |h %> % unless ( $nobr ) { @@ -242,6 +172,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 +183,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 +197,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 +211,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)'; -