X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=0174e1f92e60689dcf85a52d4d9fceceb5123d2f;hb=df4a68099abfa067014f36f92874fccefdea662e;hp=90ab0b71c12eb9275623f2ce8dd3a6be8f4f2a7c;hpb=f22b714f2b7a38c8a930d8248ccb32751db82b5e;p=freeside.git
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 90ab0b71c..0174e1f92 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -2,19 +2,18 @@
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
+ }
+ &>
+
+ %#old-style
+ <& /elements/header.html, 'Title', $menubar, $etc, $head &>
%doc>
@@ -24,33 +23,40 @@ Example:
- <% $title |h %>
+ <% $title_noescape || encode_entities($title) %>
+
+
+
+% if ( $mobile ) {
+
+% }
<% include('menu.html', 'freeside_baseurl' => $fsurl,
'position' => $menu_position,
'nocss' => $nocss,
+ 'mobile' => $mobile,
) |n
%>
+
<% 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">
+
- |
+ <% $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
@@ -66,9 +72,22 @@ Example:
% if ( $menu_position eq 'top' ) {
-
+
-
+
-
+ |
<% 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 'left'
-
+
@@ -123,7 +143,7 @@ Example:
% if ( $menu_position eq 'left' ) {
-
+ |
+% } else { #$menu_position eq 'top'
+
% }
-
+%# page content starts here
-
- <% $title |h %>
-
+
+ <% $title_noescape || encode_entities($title) %>
+
% unless ( $nobr ) {
-
+
% }
<% $menubar !~ /^\s*$/ ? "$menubar
" : '' %>
<%init>
-my( $title, $menubar, $etc, $head ) = ( '', '', '', '' );
+my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' );
my( $nobr, $nocss ) = ( 0, 0 );
+
+my $mobile;
+
if ( ref($_[0]) ) {
my $opt = shift;
$title = $opt->{title};
+ $title_noescape = $opt->{title_noescape};
$menubar = $opt->{menubar};
$etc = $opt->{etc};
$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.
@@ -176,12 +203,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');
}
-
%init>
|