diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-10-04 11:37:20 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-10-05 10:53:05 -0400 |
| commit | 88830aed0668033e8e43f44476eabd3a5d4a6a4e (patch) | |
| tree | d8f00e35eabad058db85c8ca77dbb45b060ab26d | |
| parent | 83034dcf171ea70b4e60037594879ce595a94274 (diff) | |
RT# 76968 - added header logo and css to map page, fixed address look up error, added leaflet to license
Conflicts:
httemplate/docs/license.html
| -rw-r--r-- | httemplate/docs/license.html | 7 | ||||
| -rw-r--r-- | httemplate/misc/confirm-censustract.html | 2 | ||||
| -rw-r--r-- | httemplate/misc/openmap.html | 17 |
3 files changed, 14 insertions, 12 deletions
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html index 9101b9f1e..1cce9b3ae 100644 --- a/httemplate/docs/license.html +++ b/httemplate/docs/license.html @@ -133,8 +133,6 @@ under the terms of the MIT license. Contains the XRegExp library by Steven Levithan, licensed under the terms of the MIT license. -<<<<<<< HEAD -======= <P> Contains the Google Maps Longitude and Latitude Picker, by Richard Dancsi, licensed under the terms of the MIT license. @@ -147,7 +145,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. ->>>>>>> f650b4e... RT# 21110, Updated files to use jquery-validate jquery plugin. This allows for field validation instead of just form validation. Also updated footer so it does not use experimental keys on scalar. Dereferenced hash ref prior to using keys. +<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 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> </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'); |