radiant-event_calendar-extension 1.4.12 → 1.4.14

data/app/controllers/events_controller.rb

@@ -28,7 +28,7 @@ class EventsController < SiteController
         ical = RiCal.Calendar do |cal| 
           events.each { |event| cal.add_subcomponent(event.to_ri_cal) } 
         end
-        send_data ical, :filename => "#{filename}.ics"	
+        send_data ical, :filename => "#{filename}.ics", :type => "text/calendar"
       }
     end
   end
@@ -42,7 +42,7 @@ class EventsController < SiteController
       }
       format.ics {
         ical = RiCal.Calendar { |cal| cal.add_subcomponent(@event.to_ri_cal) }
-        send_data ical.to_s, :filename => "#{@event.title.slugify}.ics"	
+        send_data ical.to_s, :filename => "#{@event.title.slugify}.ics", :type => "text/calendar"
       }
     end
   end

data/app/views/admin/event_venues/_event_venue.html.haml

@@ -5,7 +5,7 @@
         %h3.title
           = link_to event_venue.title, edit_admin_event_venue_url(event_venue)
         %p.description
-          = link_to "#{event_venue.events.count} #{pluralize(event_venue.events.count, t('event_venues_admin.index.event'))}", admin_event_venue_events_url(event_venue)
+          = link_to pluralize(event_venue.events.count, t('event_venues_admin.index.event')), admin_event_venue_events_url(event_venue)
     - tbody.location_cell do
       %td.location
         = event_venue.address

data/app/views/events/_event.html.haml

@@ -18,7 +18,7 @@
           = link_to event.title, event.url, :class => 'title'
         - else
           = event.title
-        - if event.facebook_id
+        - unless event.facebook_id.blank?
           = link_to t('event_calendar_extension.view_on_facebook'), event.facebook_url, :class => 'facebook event'
         = render :partial => 'events/keywords', :locals => {:event => event}
           

data/event_calendar_extension.rb

@@ -20,10 +20,7 @@ class EventCalendarExtension < Radiant::Extension
     UserActionObserver.instance.send :add_observer!, Calendar               # adds ownership and update hooks to the calendar data
     UserActionObserver.instance.send :add_observer!, Event                  # adds ownership and update hooks to the event data
     Radiant::AdminUI.send :include, EventCalendarAdminUI                    # defines shards for further extension of the calendar admin pages
-
-    admin.calendar = Radiant::AdminUI.load_default_calendar_regions
-    admin.event = Radiant::AdminUI.load_default_event_regions
-    admin.event_venue = Radiant::AdminUI.load_default_event_venue_regions
+    Radiant::AdminUI.load_event_calendar_regions
     admin.configuration.show.add :config, 'admin/configuration/calendar_show', :after => 'defaults'
     admin.configuration.edit.add :form,   'admin/configuration/calendar_edit', :after => 'edit_defaults'
 

data/lib/event_calendar_admin_ui.rb

@@ -8,14 +8,17 @@ module EventCalendarAdminUI
       alias_method :events, :event
       alias_method :event_venues, :event_venue
 
-      def load_default_regions_with_event_calendar
-        load_default_regions_without_event_calendar
+      def load_event_calendar_regions
         @calendar = load_default_calendar_regions
         @event = load_default_event_regions
         @event_venue = load_default_event_venue_regions
       end
 
-      alias_method_chain :load_default_regions, :event_calendar
+      # def load_default_regions_with_event_calendar
+      #   load_default_regions_without_event_calendar
+      #   load_event_calendar_regions
+      # end
+      # alias_method_chain :load_default_regions, :event_calendar
 
     protected
 

data/lib/radiant-event_calendar-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventCalendarExtension
-  VERSION = '1.4.12'
+  VERSION = '1.4.14'
   SUMMARY = %Q{Event Calendar Extension for Radiant CMS}
   DESCRIPTION = "An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)"
   URL = "http://github.com/radiant/radiant-event_calendar-extension"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 4
-  - 12
-  version: 1.4.12
+  - 14
+  version: 1.4.14
 platform: ruby
 authors: 
 - Loren Johnson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +01:00
+date: 2011-07-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -202,7 +202,7 @@ has_rdoc: true
 homepage: http://github.com/radiant/radiant-event_calendar-extension
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.4.12'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.4.14'\n\n  "
 rdoc_options: []
 
 require_paths: