73107: Map regression: now always requiring API key [show instructions during directi...

[freeside.git] / httemplate / view / directions.html

diff --git a/httemplate/view/directions.html b/httemplate/view/directions.html
index f23b7eb..1c99cda 100644 (file)
--- 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">
@@ -69,7 +62,8 @@ function show_route() {
     if ( status == google.maps.DirectionsStatus.OK ) {
       directionsDisplay.setDirections(result);
     } else { 
-      document.body.innerHTML = ('<P STYLE="color: red;">Directions lookup failed with the following error: '+status+'</P>');
+      document.body.innerHTML = ('<P STYLE="color: red;">Directions lookup failed with the following error: '+status+'</P>')
+        + <% include('/elements/google_maps_api_key.html' ) |js_string%>;
     }
   });
 }
@@ -77,7 +71,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() {