From 73a1dde8bb01395076054908cc9daed8db87a397 Mon Sep 17 00:00:00 2001
From: Allan LeSage <allanlesage@gmail.com>
Date: Fri, 5 Aug 2011 13:00:32 -0500
Subject: [PATCH] Removed JS map-hiding for no latLng, template hides instead;
 enlarged map; some JS-includes.

---
 media/chipy/css/google_maps.css       | 9 ++-------
 media/chipy/js/venue_location.js      | 5 -----
 templates/meetings/meeting_block.html | 8 ++------
 templates/meetings/past_index.html    | 4 ++++
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/media/chipy/css/google_maps.css b/media/chipy/css/google_maps.css
index 3963968..dc5b151 100644
--- a/media/chipy/css/google_maps.css
+++ b/media/chipy/css/google_maps.css
@@ -7,16 +7,11 @@ div#map_canvas {
 	}
 
 div.tiny_map {
-	height: 120px;
-	width: 120px;
+	height: 192px;
+	width: 256px;
 	}
 
 div.s div.tiny_map {
 	float: right;
 	}
 
-div.google_map {
-    float: right;
-    height: 192px;
-    width: 256px;
-}
diff --git a/media/chipy/js/venue_location.js b/media/chipy/js/venue_location.js
index ca578bb..679f5b9 100644
--- a/media/chipy/js/venue_location.js
+++ b/media/chipy/js/venue_location.js
@@ -14,11 +14,6 @@ function drawMapThumb(mapdiv,venueLatLng,label) {
   };
   
   // make the map pop
-  // This belongs in CSS usually, but a failed map
-  // degrades gracefully if you change style/class in JS.
-  mapdiv.style.float = 'right';
-  mapdiv.style.height = '120px';
-  mapdiv.style.width = '120px';
   var mapCanvas = new google.maps.Map(mapdiv, mapOpts);
   var markerOpts = {
       map: mapCanvas,
diff --git a/templates/meetings/meeting_block.html b/templates/meetings/meeting_block.html
index 037f8fe..f2d2051 100644
--- a/templates/meetings/meeting_block.html
+++ b/templates/meetings/meeting_block.html
@@ -39,7 +39,6 @@
 {% if meetings %}
 	
 	{% block head_extra_stylesheets %}
-		<link rel="stylesheet" href="{{ STATIC_URL }}chipy/css/google_maps.css" />
 		<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 	{% endblock %}
 	
@@ -54,20 +53,17 @@
     <!-- content area -->
 
 <h1>ChiPy {{meeting.which}} Meeting</h1>
-<div class="tiny_map" id="mtgmap_{{meeting.id}}"></div>
 <p><b>When:</b> {{meeting.when|date:"l F jS Y P"}}</p>
-<div class="tiny_map"></div>
 <p><b>Where:</b> <span class="venue_name">{{meeting.venue.name}}</span>
 			<span class='address'>{{meeting.venue.address|safe}}</span>
 			<span class='phone'>{{meeting.venue.phone}}</span></p>
 
-<div id="map_canvas_mtg" class="google_map"></div>
-
 {% if meeting.venue.jsonLatLng %}
+<div id="mtgmap_{{ meeting.id }}" class="tiny_map"></div>
 <script type="text/javascript">
 if ({{meeting.venue.jsonLatLng|safe}}) {
 	latlng = new google.maps.LatLng({{meeting.venue.jsonLatLng}});
-	drawMapThumb(	document.getElementById("mtgmap_{{meeting.id}}"),
+	drawMapThumb(document.getElementById("mtgmap_{{ meeting.id }}"),
 			latlng,
 			"{{meeting.venue.name}}");
 }
diff --git a/templates/meetings/past_index.html b/templates/meetings/past_index.html
index 96f92ae..5fdd647 100755
--- a/templates/meetings/past_index.html
+++ b/templates/meetings/past_index.html
@@ -11,6 +11,10 @@
   Shadowbox.init();
 </script>
 
+<!-- Google Maps API items for the meetings venues. -->
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
+<script type="text/javascript" src="/site_media/static/chipy/js/venue_location.js"></script>
+
 {% endblock %}