radiant-event_calendar-extension 1.3.6 → 1.3.7

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/app/controllers/events_controller.rb

@@ -1,5 +1,6 @@
 class EventsController < SiteController
   require "uri"
+  include Radiant::Pagination::Controller
   
   helper_method :events, :all_events, :continuing_events, :period, :calendars, :list_description
   helper_method :url_for_date, :url_for_month, :url_without_period, :calendar_parameters, :month_name, :short_month_name, :day_names
@@ -14,12 +15,8 @@ class EventsController < SiteController
     @seen_events = {}
     respond_to do |format|
       format.html {
-        if Radiant::Config['event_calendar:cached?']
-          timeout = Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout
-          expires_in timeout.to_i, :public => true, :private => false
-        else
-          expires_now
-        end
+        timeout = Radiant::Config['event_calendar:cache_duration'] || self.class.cache_timeout || 1.hour
+        expires_in timeout.to_i, :public => true, :private => false
       }
       format.js {
         render :json => events.to_json
@@ -102,6 +99,12 @@ class EventsController < SiteController
     parts << "in #{calendars.to_sentence}" if calendars
     @description = parts.join(' ')
   end
+  
+  # these methods build calendar links by using supplied parameters to amend the current parameter set
+  # anything not mentioned is carried forward unchanged.
+  # this is only slightly worthwhile here but gets much more useful when there are more ways to select events.
+  
+  # this whole mechanism should probably be moved into a helper.
       
   def url_for_date(date)
     url_for(url_parts({
@@ -135,8 +138,8 @@ class EventsController < SiteController
     url_parts.map{|p| params[p] }.join("_")
   end
   
-  # this is broken down to provide chain points for other extensions that add more ways to filter
-  # eg, to start with, taggable_events
+  # this is broken down into minimal parts to provide chain points for other extensions
+  # that add more ways to filter. eg, to start with, taggable_events
 
   def calendar_parameters
     url_parts
@@ -151,31 +154,31 @@ class EventsController < SiteController
     [:year, :month, :mday, :category, :slug, :calendar_id]
   end
   
-  def month_name(month)
-    month_names[month]
-  end
-  
-  def short_month_name(month)
-    short_month_names[month]
-  end
-  
   def day_names
     return @day_names if @day_names
     @day_names ||= Date::DAYNAMES.dup
     @day_names.push(@day_names.shift) # Class::Date and ActiveSupport::CoreExtensions::Time::Calculations have different ideas of when is the start of the week. We've gone for the rails standard.  
     @day_names
   end
-  
-protected
-  
-  def short_month_names
-    @short_month_names ||= Date::ABBR_MONTHNAMES.dup
+
+  def month_name(month)
+    month_names[month]
   end
-  
+
   def month_names
     @month_names ||= Date::MONTHNAMES.dup
   end
-  
+
+  def short_month_name(month)
+    short_month_names[month]
+  end
+
+  def short_month_names
+    @short_month_names ||= Date::ABBR_MONTHNAMES.dup
+  end
+
+private
+
   # months can be passed around either as names or numbers
   # any date part can be 'now' or 'next' for ease of linking
   # and everything is converted to_i to save clutter later
@@ -190,12 +193,5 @@ protected
       params[p] = params[p].to_i
     end
   end
-  
-  def pagination_parameters
-    {
-      :page => (params[:p] || 1).to_i, 
-      :per_page => (params[:pp] || Radiant::Config['event_calendar.per_page'] || 10).to_i
-    }
-  end
-  
+    
 end

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

@@ -22,7 +22,7 @@
       %p.practicalities
         = event.summarize_start
         - if event.event_venue
-          at
+          = t('at')
           - if event.event_venue.url
             = link_to event.event_venue.title, event.event_venue.url, :class => 'location'
           - else

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

@@ -1,11 +1,4 @@
-- content_for :breadhead do
-  - home = Page.find_by_parent_id(nil)
-  = link_to home.breadcrumb, home.url
-  \>
-
-- content_for :title do
-  Events
-  = list_description
+= render :partial => 'events/other_page_parts'
 
 - content_for :events do
   = render :partial => 'event', :collection => events
@@ -13,23 +6,23 @@
   - if events.length < 5 && continuing_events.any?
     - if events.any?
       %h2.listheader
-        Continuing events
+        = t('continuing_events')
     = render :partial => 'event', :collection => continuing_events
 
   - if events.empty? && continuing_events.empty?
     - if period
       %h2
-        Sorry: there are no events
+        = t('sorry_no_events')
         = render :partial => 'events/defacet'
     - else
       %h2
-        Sorry: there are no events coming up
+        = t('sorry_no_events')
         
 - content_for :continuing_events do
   - if continuing_events.any? && events.length >= 5
     #continuing
       %h3
-        Continuing events
+        = t('continuing_events')
       %ul
         - continuing_events.each do |event|
           %li
@@ -38,13 +31,13 @@
             - else
               = event.title
             %span.detail
-              runs until 
+              = t('runs_until')
               = event.last_day
               - if event.event_venue
-                at
+                =t('at')
                 = link_to event.event_venue.title, event.event_venue.url
               - elsif event.location
-                at
+                = t('at')
                 = event.location
 
 - content_for :calendar do
@@ -52,10 +45,25 @@
     = render :partial => "events/minicalendar", :locals => {:date => period ? period.start : Date.today}
 
 - content_for :pagination do
-  - if events.next_page || events.previous_page
-    = will_paginate(events, :param_name => :p)
+  = will_paginate events
 
 - content_for :faceting do
   = render :partial => 'faceting'
 
-= render :partial => 'events/other_page_parts'
+- content_for :title do
+  = t('pagetitle.calendar')
+  
+- content_for :full_title do
+  = t('events').titlecase
+  = list_description
+
+- content_for :sidebar do
+  = yield :calendar
+  = yield :continuing_events
+
+
+= yield :faceting
+#events
+  = yield :pagination if events.previous_page
+  = yield :events
+  = yield :pagination if events.next_page

data/config/locales/en.yml

@@ -1,5 +1,11 @@
 en:
+  at: "at"
+  calendar: "calendar"
   refresh_calendar: "refresh calendar"
   edit_calendar: "edit calendar"
   delete_calendar: "delete calendar"
-  really_delete_calendar: "Are you sure you want to delete the %{name} calendar?"
+  really_delete_calendar: "Are you sure you want to delete the %{name} calendar?"
+  sorry_no_events: "Sorry: there are no events to display"
+  runs_until: "runs until"
+  events: "events"
+  pagetitle.calendar: "Calendar"

data/event_calendar_extension.rb

@@ -1,5 +1,5 @@
 class EventCalendarExtension < Radiant::Extension
-  version "1.3.6"
+  version "1.3.7"
   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

@@ -45,6 +45,72 @@ $input: $coolgrey11
 
 /*** calendars and maps *******
 
+#events
+  .event
+    :position relative
+    :margin-bottom 20px
+    .dateholder
+      :position absolute
+      :left 15px
+      :top 2px
+      :padding 5px 5px 0 5px
+      :border 0
+      +functionalfonts
+      :text-align center
+      :line-height 1.05
+      :background-color = !page
+      :border
+        :style solid
+        :width 1px
+        :color = !verypale
+      span.month, span.dow 
+        :display block
+        :font-weight lighter
+        :font-size 80%
+        :text-transform uppercase
+      span.day, span.dom
+        :display block
+        :font-weight bold
+        :font-size 160%
+    .detail
+      h3
+        :margin 0
+        :font-size 180%
+      p 
+        :margin-top 0
+        :font-size 90%
+        :line-height 1.4
+      p.venue 
+        :font-style italic
+        :margin-bottom 6px
+      p.description 
+        :margin-bottom 16px
+
+#continuing
+  h3
+    +functionalfonts
+    :font-weight bold
+    :font-size 1.2em
+    :margin-bottom 0
+  ul
+    +functionalfonts
+    :font-size 90%
+    :line-height 1.2
+    :padding-left 0
+    li
+      :margin-top 10px
+      :font-style normal
+      a.title
+        :font-weight bold
+      span.detail
+        :font-size 80%
+
+#faceting  
+  a.defilter
+    :padding-left 14px
+    :background transparent url(/images/furniture/detag.png) no-repeat top left
+    :color #c00
+
 table.minimonth
   font-style: normal
   border-collapse: collapse

data/radiant-event_calendar-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-event_calendar-extension}
-  s.version = "1.3.6"
+  s.version = "1.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2011-02-03}
   s.description = %q{An event calendar extension that administers events locally or draws them from any ical or CalDAV publishers (Google Calendar, .Mac, Darwin Calendar Server, etc.)}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-event_calendar-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 3
-  - 6
-  version: 1.3.6
+  - 7
+  version: 1.3.7
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +00:00
+date: 2011-02-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency