X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=98a8d7c5ef4c98b8d51219df3de184c99a97c5de;hb=5376c66e2e5c1849763777f9d44ad013405c1d9e;hp=bfa138fbdb79f8ee2c077edaefdef8e3fd4990d5;hpb=483a2e4dad0f7ce8dbdc06a825d1aa11bd742f6b;p=freeside.git
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index bfa138fbd..98a8d7c5e 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 <BODY> tag, for things like onLoad=
- 'head' => '', #included before closing </HEAD> tag
- 'nobr' => 0, #1 for no <BR><BR> after the title
- }
- );
-
- #old-style
- include( '/elements/header.html', 'Title', $menubar, $etc, $head);
-
+ <& /elements/header.html',
+ {
+ 'title' => 'Title',
+ 'menubar' => \@menubar,
+ 'etc' => '', #included in <BODY> tag, for things like onLoad=
+ 'head' => '', #included before closing </HEAD> tag
+ 'nobr' => 0, #1 for no <BR><BR> after the title
+ 'no_jquery' => #for use from RT, which loads its own
+ }
+ &>
+
+ %#old-style
+ <& /elements/header.html, 'Title', $menubar, $etc, $head &>
</%doc>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -24,33 +24,44 @@ Example:
<HTML>
<HEAD>
<TITLE>
- <% $title |h %>
+ <% encode_entities($title) || $title_noescape %>
</TITLE>
+ <!-- per RT, to prevent IE compatibility mode -->
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <!-- The X-UA-Compatible <meta> tag above must be very early in <head> -->
<META HTTP-Equiv="Cache-Control" Content="no-cache">
<META HTTP-Equiv="Pragma" Content="no-cache">
<META HTTP-Equiv="Expires" Content="0">
+% if ( $mobile ) {
+ <META NAME="viewport" content="width=device-width height=device-height user-scalable=yes">
+% }
<% include('menu.html', 'freeside_baseurl' => $fsurl,
'position' => $menu_position,
'nocss' => $nocss,
+ 'mobile' => $mobile,
) |n
%>
+% unless ( $no_jquery ) {
+ <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css">
+ <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT>
+% }
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
- <% include('logout.html') |n %>
<% $head |n %>
</HEAD>
- <BODY BGCOLOR="#f8f8f8" <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0">
- <table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0; padding-right:4">
+ <BODY BGCOLOR="#f8f8f8" <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px">
+ <table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0px; padding-right:4px" CLASS="fshead">
<tr>
- <td BGCOLOR="#ffffff"><IMG BORDER=0 ALT="freeside" HEIGHT="36" SRC="<%$fsurl%>view/REAL_logo.cgi"></td>
+ <td BGCOLOR="#ffffff"><% $company_url ? qq(<A HREF="$company_url">) : '' |n %><IMG BORDER=0 ALT="freeside" HEIGHT="36" SRC="<%$fsurl%>view/REAL_logo.cgi"><% $company_url ? '</A>' : '' |n %></td>
<td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
<font size=6><% $company_name || 'ExampleCo' %></font>
</td>
- <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% getotaker %> </b> <FONT SIZE="-2"><a href="javascript:void(0);" onClick="logout();">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
+ <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% $FS::CurrentUser::CurrentUser->username |h %> </b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
% if ( $conf->config("ticket_system")
% && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
| <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a>
@@ -66,9 +77,22 @@ Example:
% if ( $menu_position eq 'top' ) {
- <TR>
+ <TR CLASS="fsmenubar">
+
+% if ( $mobile ) {
+
+ <TD STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079;width:auto" BGCOLOR="#dddddd">
+ <SCRIPT TYPE="text/javascript">
+ document.write(myBar.toString());
+ </SCRIPT>
+ </TD>
+ <TD STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079;width:auto" BGCOLOR="#dddddd">
+ <% include('searchbar-combined.html') |n %>
+ </TD>
+
+% } else {
- <TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
+ <TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#dddddd">
<SCRIPT TYPE="text/javascript">
document.write(myBar);
</SCRIPT>
@@ -76,40 +100,41 @@ Example:
</TR>
- <TR>
+ <TR CLASS="fssearchbar">
- <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px">
- <% include('searchbar-prospect.html') %>
+ <TD COLSPAN=1 BGCOLOR="#dddddd" ALIGN="right" STYLE="padding-left:2px">
+ <% include('searchbar-prospect.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px">
- <% include('searchbar-cust_main.html') %>
+ <TD COLSPAN=1 BGCOLOR="#dddddd" ALIGN="right" STYLE="padding-left:2px">
+ <% include('searchbar-cust_main.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="center">
- <% include('searchbar-address2.html') %>
+ <TD COLSPAN=1 BGCOLOR="#dddddd" ALIGN="center">
+ <% include('searchbar-address2.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right">
- <% include('searchbar-cust_bill.html') %>
+ <TD COLSPAN=1 BGCOLOR="#dddddd" ALIGN="right">
+ <% include('searchbar-cust_bill.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px">
- <% include('searchbar-cust_svc.html') %>
+ <TD COLSPAN=1 BGCOLOR="#dddddd" ALIGN="right" STYLE="padding-left:2px">
+ <% include('searchbar-cust_svc.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px;padding-right:2px">
- <% include('searchbar-ticket.html') %>
+ <TD COLSPAN=1 BGCOLOR="#dddddd" ALIGN="right" STYLE="padding-left:2px;padding-right:2px">
+ <% include('searchbar-ticket.html') |n %>
</TD>
+% }
</TR>
</TABLE>
% } else { #$menu_position eq 'left'
- <TR>
+ <TR CLASS="fsmenubar">
- <TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
+ <TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#dddddd">
</TD>
</TR>
@@ -123,46 +148,54 @@ Example:
% if ( $menu_position eq 'left' ) {
- <TD BGCOLOR="#cccccc" ALIGN="left" HEIGHT="100%" WIDTH="154" VALIGN="top" ALIGN="right">
+ <TD BGCOLOR="#dddddd" ALIGN="left" HEIGHT="100%" WIDTH="154" VALIGN="top" ALIGN="right" CLASS="fsmenubar">
<SCRIPT TYPE="text/javascript">
document.write(myBar);
</SCRIPT>
<BR>
- <% include('searchbar-prospect.html') %>
- <% include('searchbar-cust_main.html') %>
- <% include('searchbar-address2.html') %>
- <% include('searchbar-cust_bill.html') %>
- <% include('searchbar-cust_svc.html') %>
- <% include('searchbar-ticket.html') %>
+ <% 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 %>
</TD>
+% } else { #$menu_position eq 'top'
+ <BR>
% }
+%# page content starts here
+ <TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
- <TD BGCOLOR="#f8f8f8" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
-
- <FONT SIZE=6>
- <% $title |h %>
- </FONT>
+ <H1>
+ <% $title_noescape || encode_entities($title) %>
+ </H1>
% unless ( $nobr ) {
- <BR><BR>
+ <BR>
% }
<% $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
<%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.
@@ -176,12 +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');
}
-
</%init>