radiant-event_map-extension 1.3.2 → 1.3.3

data/README.md

@@ -22,10 +22,12 @@ or as a gem:
 
 ## Configuration
 
-There is one required config setting:
+There is one required config setting if you're using the full-page map controller:
 
 * `event_map.layout` is the name of the layout used by the controller
 
+If you're only using the `events:googlemap` radius tag then this isn't required.
+
 ## Basic Usage
 
 ### Linking to maps
@@ -37,13 +39,21 @@ There are also two shortcuts:
 * 'google' is the default and equivalent to `http://maps.google.com/maps?q=:lat+:lng+(:title)` and will drop a pin on a google map.
 * 'bing' is equivalent to `http://www.bing.com/maps/?v=2&cp=:lat~:lng&rtp=~pos.:lat_:lng_:title&lvl=15&sty=s&eo=0`, which will display a 1:25000 ordnance survey map (if you're in the UK) with a destination flag at your chosen point.
 
+### Placing a map on one of your pages
+
+For simple uses this radius tag might suffice:
+
+	<r:events:googlemap [calendar="slug"] />
+
+For more searchability you need to use the full-page map controller.
+
 ### Displaying a map page
 
 Create a layout that includes a `map_canvas` div and these page parts:
 
 * `map_js` is required. It brings in the javascripts (and can be used in the header or at the end of the page as you prefer)
 * `title` is the page title and can also be shown with `r:title`
-* `faceting` here only gives the option to remove any date filters that have been applied. If you add the `taggable_events` extension it gets more useful.
+* `faceting` gives the option to remove any date filters that have been applied. If you add the `taggable_events` extension it gets more useful.
 
 Here's a starting point:
 
@@ -76,28 +86,16 @@ NB. we're not doing anything fancy here with offsets or masks: if you need that
 
 ### javascript compatibility
 
-The map javascript is generated by the EventVenuesController using `app/views/event_venues/index.js.erb`. It provides a `build_map_and_markers` method and the minimal jQuery hook required to populate #map_canvas when the DOM loads.
-
-If you're not using jQuery you should find it straightforward to call `build_map_and_markers(div element)` from another script, and in that case you don't have to use our naming scheme either.
-
-### Displaying a map on a normal radiant page
-
-	<r:events:googlemap calendar="slug" />
-	
-If you omit the calendar attribute then all future events will be displayed.
-
-The map will be presented in a `div#map_canvas` to which your stylesheet will need to give dimensions (and any text styles you want to apply the location bubbles).
-
-At the moment you don't get any other control of displayed events, but soon the radius tag will support all the usual period specifications.
+The map javascript is generated by the EventVenuesController using `app/views/event_venues/index.js.erb`. You should find that it automatically populates the map with or without jquery present.
 
 ### JSON interface
 
 If you don't want to use the included scripts, you can skip that whole mechanism and work with the event data instead. EventVenuesController provides a simple JSON interface. Usually it's at /map and looks for addresses like this:
 
-		/map									everything
+		/map								everything
 		/map/2010							events in 2010
-		/map/2010/12/					events in December 2010
-		/map/2010/12/12				events on 12 December 2010
+		/map/2010/12/						events in December 2010
+		/map/2010/12/12						events on 12 December 2010
 
 If you're using `taggable_events` then we also inherit the tag-faceting interface here.
 
@@ -107,6 +105,6 @@ If you're using `taggable_events` then we also inherit the tag-faceting interfac
 
 ## Author & Copyright
 
-Copyright 2008-2010 Will at spanner.org.
+Copyright 2008-2011 Will at spanner.org.
 
 Released under the same terms as Radiant and/or Rails.

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/app/views/event_venues/index.js.erb

@@ -1,15 +1,6 @@
-if(typeof jQuery == 'function') {
-	jQuery.fn.populate_map = function() { 
-		this.each(function() { build_map_and_markers(this); });
-	};
-
-  jQuery(function() {
-    jQuery("#map_canvas").populate_map();
-  });
-}
-
 function build_map_and_markers(element) {
-  if (element != null) {
+  if (!element) element = document.getElementById('map_canvas');
+  if (element) {
     var map = new google.maps.Map(element, {
       mapTypeId: google.maps.MapTypeId.<%= (Radiant::Config['event_map.googlemap.type'] || 'ROADMAP').upcase %>,
       mapTypeControlOptions: {
@@ -42,6 +33,15 @@ function add_marker (map, mark) {
   google.maps.event.addListener(marker, 'click', function() { infowindow.open(map, marker); });
 }
 
+if(typeof jQuery == 'function') {
+	jQuery.fn.populate_map = function() { this.each(function() { build_map_and_markers(this); }); };
+  jQuery(function() { jQuery("#map_canvas").populate_map(); });
+} else {
+  window.onLoad = build_map_and_markers;
+}
+
+
+
 
 
 

data/event_map_extension.rb

@@ -2,7 +2,7 @@
 # require_dependency 'application_controller'
 
 class EventMapExtension < Radiant::Extension
-  version "1.3.2"
+  version "1.3.3"
   description "Small additions to geocode calendar events and display on a map, separated here because only of interest to a few."
   url "spanner.org"
   

data/radiant-event_map-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-event_map-extension}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-12-09}
+  s.date = %q{2011-02-07}
   s.description = %q{Further extends the event_calendar extension to allow easy google mapping with automatic geolocation based on event venues}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_map-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +00:00
+date: 2011-02-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency