summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2017-10-14 17:04:23 -0700
committerIvan Kohler <ivan@freeside.biz>2017-10-14 17:04:23 -0700
commit5dabafc5e63ae7559ca6d2867e653660b981e639 (patch)
tree4321703a47774935cd941a3a5764bf4b733f2ccf /httemplate
parent5ac72e74de9e105c8952eee7cf905ab9116926e1 (diff)
parentfba604e65e810922ce0269cc887b5c57ce135352 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/docs/license.html4
-rw-r--r--httemplate/elements/header-logo.html114
-rw-r--r--httemplate/misc/confirm-censustract.html2
-rw-r--r--httemplate/misc/openmap.html17
4 files changed, 128 insertions, 9 deletions
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 91fbbe286..570f503d6 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -148,6 +148,10 @@ under the terms of the MIT license.
Contains the form validation jQuery plugin <a href="https://jqueryvalidation.org/">jQuery Validation</a> by Jörn Zaefferer,
licensed under the terms of MIT License.
+<P>
+Contains the leaflet JavaScript library <a href="http://leafletjs.com/">Leaflet JS</a> by Vladimir Agafonkin,
+licensed under the terms of MIT License.
+
<!-- artwork -->
<P>
diff --git a/httemplate/elements/header-logo.html b/httemplate/elements/header-logo.html
new file mode 100644
index 000000000..f272c56f6
--- /dev/null
+++ b/httemplate/elements/header-logo.html
@@ -0,0 +1,114 @@
+<%doc>
+
+Example:
+
+ <& /elements/header-logo.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
+ }
+ &>
+
+</%doc>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+%#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+%# above is what RT declares, should we switch now? hopefully no glitches result
+%# or just fuck it, XHTML died anyway, HTML 5 or bust?
+<HTML>
+ <HEAD>
+ <TITLE>
+ <% encode_entities($title) || $title_noescape |n %>
+ </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">
+% }
+
+% unless ( $nocss ) {
+ <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+ <link href="<%$fsurl%>elements/freeside-print.css" type="text/css" rel="stylesheet" media="print">
+% }
+
+% 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>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery.validate.min.js"></SCRIPT>
+% if ( $FS::CurrentUser::CurrentUser->option('printtofit') ) {
+ <SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
+% }
+% }
+ <% include('init_overlib.html') |n %>
+ <% include('rs_init_object.html') |n %>
+ <script type="text/javascript" src="<% $fsurl %>elements/topreload.js"></script>
+ <% $head |n %>
+
+%# announce our base path, and the Mason comp path of this page
+ <script type="text/javascript">
+ window.fsurl = <% $fsurl |js_string %>;
+ window.request_comp_path = <% $m->request_comp->path |js_string %>;
+ </script>
+
+ </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" CLASS="fshead">
+ <tr>
+ <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>
+ </tr>
+ </table>
+
+<%init>
+
+my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' );
+my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 );
+
+my $mobile;
+
+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};
+$no_jquery = $opt->{no_jquery};
+
+my $conf = new FS::Conf;
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my $menu_position = $curuser->option('menu_position')
+ || 'top'; #new default for 1.9
+
+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> \ No newline at end of file
diff --git a/httemplate/misc/confirm-censustract.html b/httemplate/misc/confirm-censustract.html
index b491d4954..0f115e5d7 100644
--- a/httemplate/misc/confirm-censustract.html
+++ b/httemplate/misc/confirm-censustract.html
@@ -16,7 +16,7 @@ Confirm census tract
<% $location{address1} |h %> <% $location{address2} |h %><BR>
<% $location{city} |h %>, <% $location{state} |h %> <% $location{zip} |h %><BR>
<BR>
-% my $querystring = "census_year=$year&address=$location{address1}, $location{address2}, $location{city}, $location{state}, $location{zip}";
+% my $querystring = "census_year=$year&address=$location{address1}, $location{address2}, $location{city}, $location{state}";
<A HREF="<%$p%>misc/openmap.html?<% $querystring %>"
TARGET="_blank">Map service module location</A><BR>
% $querystring = "census_year=$year&pre=$pre&zip_code=" . $cache->get('zip');
diff --git a/httemplate/misc/openmap.html b/httemplate/misc/openmap.html
index 6ccc72491..73f107142 100644
--- a/httemplate/misc/openmap.html
+++ b/httemplate/misc/openmap.html
@@ -1,11 +1,7 @@
-<html>
-<head>
- <title>Find Census Tract Map</title>
- <link rel="stylesheet" href="elements/leaflet/leaflet.css"/>
- <script src="elements/leaflet/leaflet.js"></script>
-</head>
-<body>
- <h1>Please select your location on the map</h1>
+<& /elements/header-logo.html, { title => 'Find Census Tract Map', head => $head, } &>
+
+<P><h1>Please select your location on the map</h1></P>
+<P>&nbsp;</P>
<table>
<tr>
<td valign=top>
@@ -79,6 +75,11 @@ local $SIG{__DIE__}; #disable Mason error trap
my $DEBUG = 0;
+my $head = '
+ <link rel="stylesheet" href="elements/leaflet/leaflet.css"/>
+ <script src="elements/leaflet/leaflet.js"></script>
+';
+
my $census_year = $cgi->param('census_year');
my $pre = $cgi->param('pre');
my $zip_code = $cgi->param('zip_code');
generated by cgit v1.2.1 (git 2.18.0) at 2025-10-04 16:23:45 +0000