projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
popup view for collapsed packages, #25130, #27305
[freeside.git]
/
httemplate
/
elements
/
header.html
diff --git
a/httemplate/elements/header.html
b/httemplate/elements/header.html
index
432e9c6
..
1f2b6c8
100644
(file)
--- a/
httemplate/elements/header.html
+++ b/
httemplate/elements/header.html
@@
-25,6
+25,9
@@
Example:
<TITLE>
<% $title |h %>
</TITLE>
<TITLE>
<% $title |h %>
</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">
<META HTTP-Equiv="Cache-Control" Content="no-cache">
<META HTTP-Equiv="Pragma" Content="no-cache">
<META HTTP-Equiv="Expires" Content="0">
@@
-42,14
+45,20
@@
Example:
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
<% include('logout.html') |n %>
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
<% include('logout.html') |n %>
+% my $timeout = $conf->config('logout-timeout');
+% if ( $timeout && $timeout =~ /^\s*\d+\s*$/ ) {
+ <script type="text/javascript">
+ setTimeout('logout()', <% 60000 * $timeout %>);
+ </script>
+% }
<% $head |n %>
</HEAD>
<BODY BGCOLOR="#f8f8f8" <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px">
<% $head |n %>
</HEAD>
<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">
+ <table width="100%" CELLPADDING=0 CELLSPACING=0 STYLE="padding-left:0px; padding-right:4px"
CLASS="fshead"
>
<tr>
<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">) : '' %><IMG BORDER=0 ALT="freeside" HEIGHT="36" SRC="<%$fsurl%>view/REAL_logo.cgi"><% $company_url ? '</A>' : '' %
></td>
<td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
<font size=6><% $company_name || 'ExampleCo' %></font>
</td>
<td align=left BGCOLOR="#ffffff"> <!-- valign="top" -->
<font size=6><% $company_name || 'ExampleCo' %></font>
</td>
@@
-69,7
+78,7
@@
Example:
% if ( $menu_position eq 'top' ) {
% if ( $menu_position eq 'top' ) {
- <TR>
+ <TR
CLASS="fsmenubar"
>
% if ( $mobile ) {
% if ( $mobile ) {
@@
-92,7
+101,7
@@
Example:
</TR>
</TR>
- <TR>
+ <TR
CLASS="fssearchbar"
>
<TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px">
<% include('searchbar-prospect.html') |n %>
<TD COLSPAN=1 BGCOLOR="#cccccc" ALIGN="right" STYLE="padding-left:2px">
<% include('searchbar-prospect.html') |n %>
@@
-124,7
+133,7
@@
Example:
% } else { #$menu_position eq 'left'
% } 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>
<TD COLSPAN="7" WIDTH="100%" STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079" BGCOLOR="#cccccc">
</TD>
@@
-140,7
+149,7
@@
Example:
% if ( $menu_position eq 'left' ) {
% if ( $menu_position eq 'left' ) {
- <TD BGCOLOR="#cccccc" ALIGN="left" HEIGHT="100%" WIDTH="154" VALIGN="top" ALIGN="right">
+ <TD BGCOLOR="#cccccc" ALIGN="left" HEIGHT="100%" WIDTH="154" VALIGN="top" ALIGN="right"
CLASS="fsmenubar"
>
<SCRIPT TYPE="text/javascript">
document.write(myBar);
</SCRIPT>
<SCRIPT TYPE="text/javascript">
document.write(myBar);
</SCRIPT>
@@
-156,7
+165,7
@@
Example:
</TD>
% }
</TD>
% }
-
+%# page content starts here
<TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
<FONT SIZE=6>
<TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
<FONT SIZE=6>
@@
-190,13
+199,6
@@
if ( ref($_[0]) ) {
$head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
}
$head = @_ ? shift : ''; #$head is for things that go in the <HEAD> section
}
-if ( !defined($mobile) ) {
- $mobile = FS::UI::Web::is_mobile();
-}
-if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override
- $mobile = $1;
-}
-
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
@@
-204,11
+206,20
@@
my $curuser = $FS::CurrentUser::CurrentUser;
my $menu_position = $curuser->option('menu_position')
|| 'top'; #new default for 1.9
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] );
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');
} else {
$company_name = $conf->config('company_name');
+ $company_url = $conf->config('company_url');
}
</%init>
}
</%init>