[freeside-commits] branch master updated. 7e2a4d3ae0e73311ebb4fe01869544c6047f59c8

Wed Oct 4 08:40:29 PDT 2017

The branch, master has been updated
       via  7e2a4d3ae0e73311ebb4fe01869544c6047f59c8 (commit)
      from  90430c5c67581b41b3c4ad48f70b9e443092977b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e2a4d3ae0e73311ebb4fe01869544c6047f59c8
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Oct 4 11:37:20 2017 -0400

    RT# 76968 - added header logo and css to map page, fixed address look up error, added leaflet to license

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 4ab596d..e473982 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -146,6 +146,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/misc/confirm-censustract.html b/httemplate/misc/confirm-censustract.html
index b491d49..0f115e5 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 6ccc724..73f1071 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> </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');

-----------------------------------------------------------------------

Summary of changes:
 httemplate/docs/license.html             |    4 ++++
 httemplate/misc/confirm-censustract.html |    2 +-
 httemplate/misc/openmap.html             |   17 +++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)


