radiant-event_calendar-extension 1.4.8 → 1.4.9

data/README.md

@@ -36,10 +36,10 @@ with this in your environment.rb:
 
 There are a few optional config settings:
 
-* `event_calendar.icals_path` is the directory (under /public/) holding the calendar subscription files. Default is `icals`.
-* `event_calendar.default_refresh_interval` is the period, in seconds, after which the calendar subscriptions are refreshed. Default is one hour. Set to zero to refresh only in the admin interface. 
+* `event_calendar.path` is the stem of all EventsController addresses. It defaults to `/calendar`, which gives you addresses like `/calendar/2011/June`. You can change the stem to any value you like provided it is not also a page address.
 * `event_calendar.layout` is the name of the layout that EventsController will use (see below)
-* `event_calendar.filename_prefix` is an optional prefix for ics filenames
+* `event_calendar.icals_path` is the directory (under /public/) holding the calendar subscription files. Default is `icals`.
+* `event_calendar.refresh_interval` is the period, in seconds, after which the calendar subscriptions are refreshed. Default is one hour. Set to zero to refresh only in the admin interface.
 * `event_calendar.cached?` determines whether the EventsController pages are cached by Rack::Cache. EventCalendarPages are always cached like other pages.
 * `event_calendar.cache_duration` determines for how long.
 
@@ -74,7 +74,7 @@ The events controller uses `share_layouts` to define various page parts that you
 * `pagination` is the usual will_paginate block.
 * `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.
 
-Set the config entry `event_calendar.layout` to the name of your layout and point a browser at /calendar to see what you've got.
+Set the config entry `event_calendar.layout` to the name of your layout and point a browser at /calendar to see what you've got. 
 
 Here's a basic sample layout that should just work:
 

data/app/controllers/events_controller.rb

@@ -15,7 +15,7 @@ class EventsController < SiteController
     @seen_events = {}
     respond_to do |format|
       format.html {
-        timeout = Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 1.hour
+        timeout = (Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 3600).seconds
         expires_in timeout.to_i, :public => true, :private => false
       }
       format.js {
@@ -36,7 +36,7 @@ class EventsController < SiteController
   def show
     @event = Event.find(params[:id])
     format.html {
-      timeout = Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 1.hour
+      timeout = (Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 3600).seconds
       expires_in timeout.to_i, :public => true, :private => false
     }
     format.ics {

data/app/views/admin/configuration/_calendar_edit.html.haml

@@ -0,0 +1,5 @@
+%fieldset
+  %h4= t('calendar')
+  %p= edit_config 'event_calendar.layout'
+  %p= edit_config 'event_calendar.cache_duration'
+  %p= edit_config 'event_calendar.refresh_interval'

data/app/views/admin/configuration/_calendar_show.html.haml

@@ -0,0 +1,8 @@
+%h4 
+  = t('calendar')
+%p.ruled
+  = show_config 'event_calendar.layout'
+%p.ruled
+  = show_config 'event_calendar.cache_duration'
+%p.ruled
+  = show_config 'event_calendar.refresh_interval'

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

@@ -17,6 +17,8 @@
           = link_to event.title, event.url, :class => 'title'
         - else
           = event.title
+        - if event.facebook_id
+          = link_to t('event_calendar_extension.view_on_facebook'), event.facebook_url, :class => 'facebook event'
         = render :partial => 'events/keywords', :locals => {:event => event}
           
       %p.practicalities
@@ -29,12 +31,12 @@
               = link_to event.event_venue.title, event.event_venue.url, :class => 'location'
             - else
               = event.event_venue.title
-            = event.event_venue.address
+            - if event.event_venue.address
+              %br
+              = event.event_venue.address
         - elsif event.location
           %span.location
             = event.location
-        - if event.facebook_id
-          = link_to t('event_calendar_extension.view_on_facebook'), event.facebook_url, :class => 'facebook event'
       - unless repeating
         = event.description_paragraph
     

data/config/initializers/radiant_config.rb

@@ -1,5 +1,10 @@
 Radiant.config do |config|
-  config.namespace('event_calendar') do |forum|
-    forum.define 'icals_path', :default => "/icals"
+  config.namespace('event_calendar') do |calendar|
+    calendar.define 'path', :default => "/calendar", :allow_blank => false
+    calendar.define 'icals_path', :default => "/icals", :allow_blank => false
+    calendar.define 'cache_duration', :type => :integer, :default => 3600, :units => 'seconds'
+    calendar.define 'refresh_interval', :type => :integer, :default => 3600, :units => 'seconds'
+    calendar.define 'recurrence_horizon', :type => :integer, :default => 10, :units => 'years'
+    calendar.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => false
   end
 end 

data/config/locales/en.yml

@@ -1,5 +1,10 @@
 ---
 en:
+  config:
+    event_calendar:
+      path: Calendar path
+      refresh_interval: Refresh subscriptions after
+      cache_duration: Cache duration
   time:
     formats:
       calendar_period_description_week: "in week %U of %Y"
@@ -36,9 +41,10 @@ en:
   delete_calendar: "delete calendar"
   really_delete_calendar: "Are you sure you want to delete the %{name} calendar?"
   calendar: Calendar
-  calendars: calendars
-  events: events
-  locations: locations
+  calendars: Calendars
+  events: Events
+  locations: Locations
+  event_venues: Locations
   defaults:
     cancel: Cancel
     or: or

data/config/routes.rb

@@ -7,9 +7,10 @@ ActionController::Routing::Routes.draw do |map|
     cal.calendars_home '/', :controller => 'events', :action => 'index'
   end
   
-  map.calendar "/calendar/events/:id.:format", :controller => 'events', :action => 'show'
-  map.calendar "/calendar.:format", :controller => 'events', :action => 'index'
-  map.calendar_year "/calendar/:year", :controller => 'events', :action => 'index'
-  map.calendar_month "/calendar/:year/:month", :controller => 'events', :action => 'index'
-  map.calendar_day "/calendar/:year/:month/:mday", :controller => 'events', :action => 'index'
+  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'
 end

data/event_calendar_extension.rb

@@ -24,13 +24,15 @@ class EventCalendarExtension < Radiant::Extension
     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
+    admin.configuration.show.add :config, 'admin/configuration/calendar_show', :after => 'defaults'
+    admin.configuration.edit.add :form,   'admin/configuration/calendar_edit', :after => 'edit_defaults'
 
     admin.dashboard.index.add(:main, "coming_events", :before => 'recent_assets') if admin.respond_to? :dashboard
     
-    tab('calendar') do
-      add_item('events', '/admin/event_calendar')
-      add_item('calendars', '/admin/event_calendar/calendars')
-      add_item('locations', '/admin/event_calendar/event_venues')
+    tab('Calendar') do
+      add_item('Events', '/admin/event_calendar')
+      add_item('Calendars', '/admin/event_calendar/calendars')
+      add_item('Locations', '/admin/event_calendar/event_venues')
     end
 
   end

data/lib/event_calendar_tags.rb

@@ -466,6 +466,24 @@ module EventCalendarTags
     tag.locals.event.facebook_url
   end
 
+  desc %{ 
+    Renders a link to the facebook version of this event, if any. Attributes are 
+    passed through in the usual way and if the tag is double its rendered contents
+    will become the link text.
+
+    Usage:
+    <pre><code><r:facebook_link class="facebook event" /></code></pre> 
+  }
+  tag "event:facebook_link" do |tag|
+    if tag.locals.event.facebook_id
+      options = tag.attr.dup
+      attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+      attributes = " #{attributes}" unless attributes.empty?
+      text = tag.double? ? tag.expand : I18n.t('event_calendar_extension.view_on_facebook')
+      %{<a href="#{tag.render('facebook_url')}"#{attributes}>#{text}</a>}
+    end
+  end
+
   #todo: venues:* tags
   
   desc %{ 

data/lib/radiant-event_calendar-extension.rb

@@ -1,5 +1,5 @@
 module RadiantEventCalendarExtension
-  VERSION = '1.4.8'
+  VERSION = '1.4.9'
   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: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 4
-  - 8
-  version: 1.4.8
+  - 9
+  version: 1.4.9
 platform: ruby
 authors: 
 - Loren Johnson
@@ -106,6 +106,8 @@ files:
 - app/views/admin/calendars/index.html.haml
 - app/views/admin/calendars/new.html.haml
 - app/views/admin/calendars/show.html.haml
+- app/views/admin/configuration/_calendar_edit.html.haml
+- app/views/admin/configuration/_calendar_show.html.haml
 - app/views/admin/dashboard/_coming_events.html.haml
 - app/views/admin/event_venues/_event_venue.html.haml
 - app/views/admin/event_venues/_form.html.haml
@@ -178,6 +180,7 @@ files:
 - public/stylesheets/sass/admin/event_calendar.sass
 - public/stylesheets/sass/admin/event_calendar_dashboard.sass
 - public/stylesheets/sass/event_calendar.sass
+- radiant-event_calendar-extension-1.4.9.gem
 - radiant-event_calendar-extension.gemspec
 - Rakefile
 - README.md
@@ -199,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.8'\n\n  "
+post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-event_calendar-extension', :version => '~> 1.4.9'\n\n  "
 rdoc_options: []
 
 require_paths: