projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
elements
/
header.html
diff --git
a/httemplate/elements/header.html
b/httemplate/elements/header.html
index
4e0c74b
..
0174e1f
100644
(file)
--- a/
httemplate/elements/header.html
+++ b/
httemplate/elements/header.html
@@
-23,7
+23,7
@@
Example:
<HTML>
<HEAD>
<TITLE>
<HTML>
<HEAD>
<TITLE>
- <% $title
|h
%>
+ <% $title
_noescape || encode_entities($title)
%>
</TITLE>
<!-- per RT, to prevent IE compatibility mode -->
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
</TITLE>
<!-- per RT, to prevent IE compatibility mode -->
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@
-42,6
+42,7
@@
Example:
) |n
%>
) |n
%>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT>
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
@@
-51,7
+52,7
@@
Example:
<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>
<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=left BGCOLOR="#ffffff"> <!-- valign="top" -->
<font size=6><% $company_name || 'ExampleCo' %></font>
</td>
@@
-75,18
+76,18
@@
Example:
% if ( $mobile ) {
% if ( $mobile ) {
- <TD STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079;width:auto" BGCOLOR="#
cccccc
">
+ <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>
<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="#
cccccc
">
+ <TD STYLE="padding:1px 0px 0px 0px;border-top: 1px solid #7e0079;width:auto" BGCOLOR="#
dddddd
">
<% include('searchbar-combined.html') |n %>
</TD>
% } else {
<% 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>
<SCRIPT TYPE="text/javascript">
document.write(myBar);
</SCRIPT>
@@
-96,27
+97,27
@@
Example:
<TR CLASS="fssearchbar">
<TR CLASS="fssearchbar">
- <TD COLSPAN=1 BGCOLOR="#
cccccc
" ALIGN="right" STYLE="padding-left:2px">
+ <TD COLSPAN=1 BGCOLOR="#
dddddd
" ALIGN="right" STYLE="padding-left:2px">
<% include('searchbar-prospect.html') |n %>
</TD>
<% include('searchbar-prospect.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#
cccccc
" ALIGN="right" STYLE="padding-left:2px">
+ <TD COLSPAN=1 BGCOLOR="#
dddddd
" ALIGN="right" STYLE="padding-left:2px">
<% include('searchbar-cust_main.html') |n %>
</TD>
<% include('searchbar-cust_main.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#
cccccc
" ALIGN="center">
+ <TD COLSPAN=1 BGCOLOR="#
dddddd
" ALIGN="center">
<% include('searchbar-address2.html') |n %>
</TD>
<% include('searchbar-address2.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#
cccccc
" ALIGN="right">
+ <TD COLSPAN=1 BGCOLOR="#
dddddd
" ALIGN="right">
<% include('searchbar-cust_bill.html') |n %>
</TD>
<% include('searchbar-cust_bill.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#
cccccc
" ALIGN="right" STYLE="padding-left:2px">
+ <TD COLSPAN=1 BGCOLOR="#
dddddd
" ALIGN="right" STYLE="padding-left:2px">
<% include('searchbar-cust_svc.html') |n %>
</TD>
<% include('searchbar-cust_svc.html') |n %>
</TD>
- <TD COLSPAN=1 BGCOLOR="#
cccccc
" ALIGN="right" STYLE="padding-left:2px;padding-right:2px">
+ <TD COLSPAN=1 BGCOLOR="#
dddddd
" ALIGN="right" STYLE="padding-left:2px;padding-right:2px">
<% include('searchbar-ticket.html') |n %>
</TD>
% }
<% include('searchbar-ticket.html') |n %>
</TD>
% }
@@
-128,7
+129,7
@@
Example:
<TR CLASS="fsmenubar">
<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>
</TD>
</TR>
@@
-142,7
+143,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" CLASS="fsmenubar">
+ <TD BGCOLOR="#
dddddd
" 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>
@@
-157,22
+158,24
@@
Example:
</TD>
</TD>
+% } else { #$menu_position eq 'top'
+ <BR>
% }
%# page content starts here
<TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
% }
%# page content starts here
<TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
- <
FONT SIZE=6
>
- <% $title
|h
%>
- </
FONT
>
+ <
H1
>
+ <% $title
_noescape || encode_entities($title)
%>
+ </
H1
>
% unless ( $nobr ) {
% unless ( $nobr ) {
- <BR>
<BR>
+ <BR>
% }
<% $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
<%init>
% }
<% $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
<%init>
-my( $title, $
menubar, $etc, $head ) = (
'', '', '', '' );
+my( $title, $
title_noescape, $menubar, $etc, $head ) = ( '',
'', '', '', '' );
my( $nobr, $nocss ) = ( 0, 0 );
my $mobile;
my( $nobr, $nocss ) = ( 0, 0 );
my $mobile;
@@
-180,6
+183,7
@@
my $mobile;
if ( ref($_[0]) ) {
my $opt = shift;
$title = $opt->{title};
if ( ref($_[0]) ) {
my $opt = shift;
$title = $opt->{title};
+ $title_noescape = $opt->{title_noescape};
$menubar = $opt->{menubar};
$etc = $opt->{etc};
$head = $opt->{head};
$menubar = $opt->{menubar};
$etc = $opt->{etc};
$head = $opt->{head};
@@
-206,11
+210,13
@@
if ( $cgi->param('mobile') =~ /^(\d)$/ ) { # allow client to override
$mobile = $1;
}
$mobile = $1;
}
-my
$company_name
;
+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>