diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-10-25 14:23:40 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-10-25 14:37:27 -0500 |
| commit | b327fcd3e29dfcb203920dc3c819fb86d0c19a5e (patch) | |
| tree | de4c50b84231b7d8635649fa72a087d0c21b1b4c | |
| parent | ba6079dc54bdec02fd3a83396a8430ad095ee2d3 (diff) | |
73107: Map regression: now always requiring API key
| -rw-r--r-- | httemplate/view/directions.html | 11 | ||||
| -rw-r--r-- | httemplate/view/map.html | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/httemplate/view/directions.html b/httemplate/view/directions.html index f23b7eb..8377d12 100644 --- a/httemplate/view/directions.html +++ b/httemplate/view/directions.html @@ -1,5 +1,3 @@ -% if ( $apikey ) { - %# the actual page <& /elements/header-popup.html, { title => '',#$name, @@ -12,11 +10,6 @@ <div id="directions_panel"></div> <div id="map_canvas"></div> -% } else { -<& /elements/header-popup.html &> -<& /elements/google_maps_api_key.html &> -% } - <%def .head> % my $lat = $cgi->param('lat'); % my $lon = $cgi->param('lon'); @@ -45,7 +38,7 @@ body { height: 100%; margin: 0px; padding: 0px } } </style> -<script type="text/javascript" src="https://maps.google.com/maps/api/js?v=3&key=<% $apikey %>"> +<script type="text/javascript" src="https://maps.google.com/maps/api/js?v=3<% $apikey ? '&key='.$apikey : '' %>"> </script> <script type="text/javascript"> @@ -77,7 +70,7 @@ function show_route() { // function name specified by google maps api, special hook for auth errors function gm_authFailure () { document.body.innerHTML = -<% include('/elements/google_maps_api_key.html', autherror => 1) |js_string%>; +<% include('/elements/google_maps_api_key.html', autherror => $apikey ) |js_string%>; } function initialize() { diff --git a/httemplate/view/map.html b/httemplate/view/map.html index b3459dc..01ffc6d 100644 --- a/httemplate/view/map.html +++ b/httemplate/view/map.html @@ -1,5 +1,3 @@ -% if ( $apikey ) { - %# the actual page <& /elements/header-popup.html, { title => '',#$name, @@ -11,11 +9,6 @@ <div id="map_canvas"></div> -% } else { -<& /elements/header-popup.html &> -<& /elements/google_maps_api_key.html &> -% } - <%def .head> <meta name="viewport" content="initial-scale=1.0, user-scalable=no" /> @@ -29,7 +22,7 @@ body { height: 100%; margin: 0px; padding: 0px } @media print { #map_canvas { height: 500px; margin: 0; } } </style> -<script type="text/javascript" src="https://maps.google.com/maps/api/js?v=3&key=<% $apikey %>"> +<script type="text/javascript" src="https://maps.google.com/maps/api/js?v=3<% $apikey ? '&key='.$apikey : '' %>"> </script> <script type="text/javascript"> @@ -39,7 +32,7 @@ var map; // function name specified by google maps api, special hook for auth errors function gm_authFailure () { document.body.innerHTML = -<% include('/elements/google_maps_api_key.html', autherror => 1) |js_string%>; +<% include('/elements/google_maps_api_key.html', autherror => $apikey ) |js_string%>; } |