radiant-event_map-extension 1.2.0 → 1.3.0

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.authors = ["spanner"]
     gem.add_dependency "geokit"
     gem.add_dependency "radiant", ">= 0.9.0"
-    gem.add_dependency "radiant-event_calendar-extension"
+    gem.add_dependency "radiant-event_calendar-extension", ">= 1.3.0"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. This is only required if you plan to package event_map as a gem."

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/app/controllers/event_venues_controller.rb

@@ -3,7 +3,7 @@
 
 class EventVenuesController < EventsController
   helper_method :venues, :events_at_venue
-  layout false
+  radiant_layout { Radiant::Config['event_map.layout'] }
   
   def index
     respond_to do |format|

data/app/views/event_venues/index.html.haml

@@ -1,3 +1,10 @@
+- content_for :breadhead do
+  - home = Page.find_by_parent_id(nil)
+  = link_to home.breadcrumb, home.url
+  \>
+  = link_to "calendar", calendar_url
+  \>
+
 - content_for :title do
   Events
   = list_description
@@ -8,10 +15,5 @@
 - content_for :map_js do
   %script{:src => "http://maps.google.com/maps/api/js?sensor=false"}
   %script{:src => "#{url_for(calendar_parameters.merge(:format => :js))}"}
-
-/ deprecated older syntax probably unknown to anyone but me
-- content_for :head do
-  %script{:src => "http://maps.google.com/maps/api/js?sensor=false"}
-  %script{:src => "#{url_for(calendar_parameters.merge(:format => :js))}"}
   
 = render :partial => 'events/other_page_parts'

data/event_map_extension.rb

@@ -2,7 +2,7 @@
 # require_dependency 'application_controller'
 
 class EventMapExtension < Radiant::Extension
-  version "1.2.0"
+  version "1.3.0"
   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,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-event_map-extension}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
@@ -37,8 +37,6 @@ Gem::Specification.new do |s|
      "lib/grid_ref.rb",
      "lib/mappable.rb",
      "lib/tasks/event_map_extension_tasks.rake",
-     "pkg/radiant-event_map-extension-1.0.1.gem",
-     "pkg/radiant-event_map-extension-1.1.0.gem",
      "public/images/event_calendar/event_shadow.png",
      "public/images/event_calendar/one_event.png",
      "public/images/event_calendar/several_events.png",
@@ -66,16 +64,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<geokit>, [">= 0"])
       s.add_runtime_dependency(%q<radiant>, [">= 0.9.0"])
-      s.add_runtime_dependency(%q<radiant-event_calendar-extension>, [">= 0"])
+      s.add_runtime_dependency(%q<radiant-event_calendar-extension>, [">= 1.3.0"])
     else
       s.add_dependency(%q<geokit>, [">= 0"])
       s.add_dependency(%q<radiant>, [">= 0.9.0"])
-      s.add_dependency(%q<radiant-event_calendar-extension>, [">= 0"])
+      s.add_dependency(%q<radiant-event_calendar-extension>, [">= 1.3.0"])
     end
   else
     s.add_dependency(%q<geokit>, [">= 0"])
     s.add_dependency(%q<radiant>, [">= 0.9.0"])
-    s.add_dependency(%q<radiant-event_calendar-extension>, [">= 0"])
+    s.add_dependency(%q<radiant-event_calendar-extension>, [">= 1.3.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_map-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - spanner
@@ -56,10 +56,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
   type: :runtime
   version_requirements: *id003
 description: Further extends the event_calendar extension to allow easy google mapping with automatic geolocation based on event venues
@@ -92,8 +94,6 @@ files:
 - lib/grid_ref.rb
 - lib/mappable.rb
 - lib/tasks/event_map_extension_tasks.rake
-- pkg/radiant-event_map-extension-1.0.1.gem
-- pkg/radiant-event_map-extension-1.1.0.gem
 - public/images/event_calendar/event_shadow.png
 - public/images/event_calendar/one_event.png
 - public/images/event_calendar/several_events.png