projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#34237 installer scheduling [various v3 backport fixes]
[freeside.git]
/
httemplate
/
elements
/
header.html
diff --git
a/httemplate/elements/header.html
b/httemplate/elements/header.html
index
d73e14c
..
a5dedd7
100644
(file)
--- a/
httemplate/elements/header.html
+++ b/
httemplate/elements/header.html
@@
-9,6
+9,7
@@
Example:
'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
'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
}
);
}
);
@@
-23,7
+24,7
@@
Example:
<HTML>
<HEAD>
<TITLE>
<HTML>
<HEAD>
<TITLE>
- <%
$title |h
%>
+ <%
encode_entities($title) || $title_noescape |n
%>
</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
+43,12
@@
Example:
) |n
%>
) |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 %>
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
<% include('logout.html') |n %>
@@
-58,7
+65,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>
@@
-169,7
+176,7
@@
Example:
<TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
<FONT SIZE=6>
<TD CLASS="background" HEIGHT="100%" VALIGN="top"> <!-- WIDTH="100%"> -->
<FONT SIZE=6>
- <% $title
|h
%>
+ <% $title
_noescape || encode_entities($title)
%>
</FONT>
% unless ( $nobr ) {
</FONT>
% unless ( $nobr ) {
@@
-179,20
+186,22
@@
Example:
<% $menubar !~ /^\s*$/ ? "$menubar<BR><BR>" : '' %>
<%init>
<% $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};
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};
- $mobile = $opt->{mobile};
+ $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 = exists($opt->{no_jquery}) ? $opt->{no_jquery} : 1; #v3 only, 0 on v4+
} else {
($title, $menubar) = ( shift, shift );
$etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
} else {
($title, $menubar) = ( shift, shift );
$etc = @_ ? shift : ''; #$etc is for things like onLoad= etc.
@@
-213,11
+222,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>