radiant-event_calendar-extension 1.4.14 → 1.5.0

data/README.md

@@ -8,13 +8,15 @@ See the [event_map](http://github.com/spanner/radiant-event_map-extension) exten
 
 ## Requirements
 
-Radiant 0.9 or 1, `layouts` or `share_layouts` and the `ri_cal` gem to handle iCal data. It's declared in the extension so this should do it:
+From v1.5 onward event_calendar is only compatible with Radiant 1 and should be installed as a gem. Its dependencies will be brought in automatically.
 
-	sudo rake gems:install
-	
-This is compatible with `multi_site` and with the [sites](http://github.com/spanner/radiant-sites-extension) extension. With the latter everything will be site-scoped.
+	sudo gem install radiant-event_calendar-extension
+
+and then in your radiant application's Gemfile:
+
+	gem "radiant-event_calendar-extennsion", "~>1.5.0"
 
-There is a 0.81 tag in the repository for the last version good with radiant 0.8.1 and `scoped_admin`.
+There is a 0.91 and 0.81 tags in the repository for the last versions good with those versions of radiant.
 
 This version includes some optional experiments in dashboard integration. If you're using dashboard you need the spanner fork.
 

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

@@ -18,6 +18,7 @@
           = link_to event.title, event.url, :class => 'title'
         - else
           = event.title
+        = link_to t('event_calendar_extension.download_event'), event_url(event, :format => :ics), :class => 'ical download'
         - 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/config/routes.rb

@@ -7,10 +7,10 @@ ActionController::Routing::Routes.draw do |map|
     cal.calendars_home '/', :controller => 'events', :action => 'index'
   end
   
-  prefix = Radiant.config['event_calendar.path'] || "/calendar"
-  map.calendar "#{prefix}/events/:id.:format", :controller => 'events', :action => 'show'
-  map.calendar "#{prefix}.:format", :controller => 'events', :action => 'index'
-  map.calendar_year "#{prefix}/:year", :controller => 'events', :action => 'index'
-  map.calendar_month "#{prefix}/:year/:month", :controller => 'events', :action => 'index'
-  map.calendar_day "#{prefix}/:year/:month/:mday", :controller => 'events', :action => 'index'
+  calendar_prefix = Radiant.config['event_calendar.path'] || "/calendar"
+  map.resources :events, :path_prefix => calendar_prefix, :only => [:index, :show]
+  map.calendar "#{calendar_prefix}.:format", :controller => 'events', :action => 'index'
+  map.calendar_year "#{calendar_prefix}/:year", :controller => 'events', :action => 'index'
+  map.calendar_month "#{calendar_prefix}/:year/:month", :controller => 'events', :action => 'index'
+  map.calendar_day "#{calendar_prefix}/:year/:month/:mday", :controller => 'events', :action => 'index'
 end

data/event_calendar_extension.rb

@@ -8,12 +8,6 @@ class EventCalendarExtension < Radiant::Extension
   description RadiantEventCalendarExtension::DESCRIPTION
   url RadiantEventCalendarExtension::URL
 
-  extension_config do |config|
-    config.gem "ri_cal"
-    config.gem "chronic"
-    config.gem "uuidtools"
-  end
-
   def activate
     Page.send :include, EventCalendarTags                                   # defines a wide range of events: tags for use on normal and calendar pages
     Status.send :include, EventStatuses                                     # adds support for draft and submitted events

data/lib/radiant-event_calendar-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventCalendarExtension
-  VERSION = '1.4.14'
+  VERSION = '1.5.0'
   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"

data/public/stylesheets/sass/event_calendar.sass

@@ -59,11 +59,11 @@ $link: $red
       +functionalfonts
       text-align: center
       line-height: 1.05
-      background-color: white
+      background-color: $page
       border:
         style: solid
         width: 1px
-        color: #d6d6d4
+        color: $verypale
       span.month, span.dow
         display: block
         font-weight: lighter
@@ -81,6 +81,19 @@ $link: $red
         margin-top: 0
         font-size: 90%
         line-height: 1.4
+      a.facebook, a.twitter, a.ical
+        display: inline-block
+        width: 11px
+        height: 12px
+        margin: 6px 0
+        overflow: hidden
+        text-indent: -500px
+      a.ical
+        background: transparent url(/images/event_calendar/ical_small.png) no-repeat top left
+      a.facebook
+        background: transparent url(/images/event_calendar/facebook_small.png) no-repeat top left
+      a.twitter
+        background: transparent url(/images/event_calendar/twitter_small.png) no-repeat top left
       p.venue
         font-style: italic
         margin-bottom: 6px

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 14
-  version: 1.4.14
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Loren Johnson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +01:00
+date: 2011-09-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,8 +174,11 @@ files:
 - public/images/admin/calendar.png
 - public/images/admin/redo.png
 - public/images/admin/redo_disabled.png
+- public/images/event_calendar/facebook_small.png
 - public/images/event_calendar/flag.png
 - public/images/event_calendar/ical.png
+- public/images/event_calendar/ical_small.png
+- public/images/event_calendar/twitter_small.png
 - public/javascripts/admin/event_calendar.js
 - public/stylesheets/sass/admin/event_calendar.sass
 - public/stylesheets/sass/admin/event_calendar_dashboard.sass
@@ -202,7 +205,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.14'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.5.0'\n\n  "
 rdoc_options: []
 
 require_paths: