radiant-event_calendar-extension 1.0.2 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/app/controllers/admin/events_controller.rb

@@ -2,8 +2,14 @@ class Admin::EventsController < Admin::ResourceController
   paginate_models :per_page => 20
   
   def load_models
-    finder = params[:all] ? Event.all : Event.future_and_current
-    self.models = finder.paginate(pagination_parameters)
+    pp = pagination_parameters
+    unless params[:p]
+      first_event = Event.future_and_current.first
+      i = Event.all.index(first_event)
+      p = (i / pp[:per_page].to_i) + 1
+      pp[:page] = p if p && p > 1
+    end
+    self.models = Event.paginate(pp)
   end
 
 end

data/app/controllers/admin/icals_controller.rb

@@ -15,8 +15,8 @@ class Admin::IcalsController < Admin::ResourceController
   
   def refresh
     ical = Ical.find(params[:id])
-    if ical.refresh
-      flash[:notice] = ical.calendar.name + " calendar refreshed from iCal subscription ."
+    if events = ical.refresh
+      flash[:notice] = ical.calendar.name + " calendar refreshed from iCal subscription."
     else
       flash[:notice] = "Error parsing " + ical.calendar.name + " calendar from iCal subscription."
     end

data/app/controllers/events_controller.rb

@@ -5,7 +5,7 @@ class EventsController < SiteController
   helper_method :url_for_date, :url_for_month, :url_without_period, :calendar_parameters, :month_name, :short_month_name, :day_names
   before_filter :numerical_parameters
   
-  radiant_layout { |controller| controller.layout_for :event_calendar }
+  radiant_layout { Radiant::Config['event_calendar.layout'] }
   no_login_required
 
   # delivers designated lists of events in minimal formats

data/app/models/event.rb

@@ -123,6 +123,22 @@ class Event < ActiveRecord::Base
     calendar.slug if calendar
   end
   
+  def location
+    if event_venue
+      event_venue.to_s
+    else
+      read_attribute(:location)
+    end
+  end
+  
+  def address
+    event_venue.address if event_venue
+  end
+
+  def postcode
+    event_venue.postcode if event_venue
+  end
+  
   def description_paragraph
     if description =~ /\<p/
       description
@@ -142,19 +158,7 @@ class Event < ActiveRecord::Base
   def occurrence?
     !master?
   end
-
-  def location
-    event_venue ? event_venue.to_s : read_attribute(:location)
-  end
   
-  def address
-    event_venue ? event_venue.address : read_attribute(:location)
-  end
-
-  def postcode
-    event_venue ? event_venue.postcode : read_attribute(:postcode)
-  end
-
   def date
     start_date.to_datetime.strftime(date_format)
   end
@@ -285,6 +289,10 @@ class Event < ActiveRecord::Base
   def continuing?
     end_date && start_date < Time.now && end_date > Time.now
   end
+
+  def finished?
+    start_date < Time.now && (!end_date || end_date < Time.now)
+  end
   
   def editable?
     status != Status[:imported]
@@ -332,7 +340,6 @@ class Event < ActiveRecord::Base
       :uuid => cal_event.uid,
       :title => cal_event.summary,
       :description => cal_event.description,
-      :location => cal_event.location,
       :url => cal_event.url,
       :start_date => cal_event.dtstart,
       :end_date => cal_event.dtend,
@@ -340,6 +347,7 @@ class Event < ActiveRecord::Base
       :created_at => cal_event.dtstamp
     })
     event.status = Status[:imported]
+    event.set_venue_from_location(cal_event.location)
     cal_event.rrule.each { |rule| event.add_recurrence(rule) }
     event
   rescue => error
@@ -348,23 +356,31 @@ class Event < ActiveRecord::Base
   end
   
   def update_from(cal_event)
+    #TODO handle and merge local updates
     self.update_attributes({
       :title => cal_event.summary,
       :description => cal_event.description,
-      :location => cal_event.location,
       :url => cal_event.url,
       :start_date => cal_event.dtstart,
       :end_date => cal_event.dtend,
       :all_day => !cal_event.dtstart.is_a?(DateTime)
     })
     self.status = Status[:imported]
+    self.set_venue_from_location(cal_event.location)
     cal_event.rrule.each { |rule| self.add_recurrence(rule) }
+    self.save!
     self
   rescue => error
     logger.error "Event update error: #{error}."
     raise
   end
   
+  def set_venue_from_location(location='')
+    unless location.blank?
+      self.event_venue = EventVenue.find_by_title(location) || EventVenue.find_or_create_by_location(location)
+    end
+  end
+  
 protected
 
   def set_uuid

data/app/models/event_venue.rb

@@ -1,17 +1,15 @@
 class EventVenue < ActiveRecord::Base
   has_many :events, :dependent => :nullify
   has_site if respond_to? :has_site
-  validates_presence_of :title, :address
   default_scope :order => 'title asc'
   
   def to_s
-    %{#{title}, #{address}}
+    title
   end
   
-  def location
-    address
-  end
-  def location=(location)
-    address = location
+  # location is the string read in automatically from ical subscriptions
+  def title
+    read_attribute(:title) || location
   end
+  
 end

data/app/models/ical.rb

@@ -13,8 +13,9 @@ class Ical < ActiveRecord::Base
   
   def refresh
     retrieve_file
-    parse_file
+    updated = parse_file
     logger.info self.calendar.category + "/" + self.calendar.name + " - iCalendar subscription refreshed on " + Time.now.strftime("%m/%d at %H:%M")
+    updated
   end
 
   def retrieve_file
@@ -40,6 +41,7 @@ class Ical < ActiveRecord::Base
   end
 
   def parse_file(thisfile=filename)
+    affected = []
     begin
       Ical.transaction do
         self.last_refresh_count = 0
@@ -50,7 +52,7 @@ class Ical < ActiveRecord::Base
           cal.events.each do |cal_event|
             if event = Event.find_by_uuid(cal_event.uid)
               if cal_event.dtstamp > event.updated_at
-                event.update_from(cal_event) 
+                affected.push event.update_from(cal_event) 
               else
               end
               event_count += 1
@@ -59,12 +61,14 @@ class Ical < ActiveRecord::Base
               event.site = self.calendar.site if event.respond_to? :site=
               self.calendar.events << event
               event.save!
+              affected.push event
             end
           end
         end
         self.last_refresh_count = event_count
         self.last_refresh_date = Time.now.utc
         self.save!
+        affected
       end
     rescue => error
       logger.error "RiCal parse error with: #{self.calendar.name}: #{error}."

data/app/views/admin/calendars/_form.html.haml

@@ -1,50 +1,64 @@
+- @calendar.build_ical unless @calendar.ical
+
 #calendar_form.form-area
   = render_region :form_top
   = error_messages_for :calendar
 
-  - render_region :form do |form|
-    - form.edit_name do
-      .title
-        %p.calendar_title
-          = f.label :name
-          = f.text_field :name, :class => "textbox"
-        %p.calendar_category
-          = f.label :category
-          = f.text_field :category, :class => "textbox"
-        %p.calendar_slug
-          = f.label :slug
-          = f.text_field :slug, :class => "textbox"
-        %p.note
-          The category and slug are used create a url in the form /[calendar page]/category/slug showing only the events of this calendar.
-
-      .description
-        %p.description
-          = f.label :description, "Description"
-          = f.text_area 'description', :size => '40x6', :class => "textarea"
-
-    - @calendar.build_ical unless @calendar.ical
-    - form.edit_ical do
-
-      - f.fields_for :ical do |ical_f| 
-        .ical
+  .main
+    - render_region :form do |form|
+      - form.edit_name do
+        .title
+          %p.title
+            = f.label :name
+            = f.text_field :name, :class => "textbox"
+
+      - form.edit_ical do
+        - f.fields_for :ical do |ical_f| 
           %p.url
             = ical_f.label :url, "Subscription url (optional)"
             = ical_f.text_field :url, :class => "textbox"
-            = ical_f.check_box :refresh_interval
-            = ical_f.label :refresh_interval, 'Refresh automatically?', :class => 'minor'
 
-          %p.username
-            = ical_f.label :username
-            = ical_f.text_field :username, :class => "textbox"
+          .drawer
+            .drawer_contents#subscription
+
+              %div.username
+                = ical_f.label :username, 'Username', :class => 'minor'
+                = ical_f.text_field :username, :class => "textbox"
 
-          %p.password
-            = ical_f.label :password
-            = ical_f.text_field :password, :class => "textbox"
+              %div.password
+                = ical_f.label :password, 'Password', :class => 'minor'
+                = ical_f.text_field :password, :class => "textbox"
 
-          %p.note
-            The url should be a complete http(s) address that works in your browser.
+              %div.refreshment
+                = ical_f.check_box :refresh_interval
+                = ical_f.label :refresh_interval, 'Refresh automatically?', :class => 'minor'
+                
+            .drawer_handle
+              %a.toggle{:href=>'#subscription', :rel=>"toggle[subscription]", :class=>"more"}
+                more
+
+      - form.edit_filing do
+        .filing
+          %p.calendar_category
+            = f.label :category
+            = f.text_field :category, :class => "textbox"
+          %p.calendar_slug
+            = f.label :slug
+            = f.text_field :slug, :class => "textbox"
+
+      - form.edit_description do
+        .description
+          %p.description
+            = f.label :description, "Description"
+            = f.text_area 'description', :size => '40x6', :class => "textarea"
 
   - render_region :form_bottom do |form_bottom|
+    - form_bottom.edit_metadata do
+      .metadata
+        %p.keywords
+          = f.label :keywords
+          = f.text_field :keywords, :class => "textbox"
+
     - form_bottom.edit_timestamp do
       = updated_stamp @calendar  
 

data/app/views/admin/calendars/edit.html.haml

@@ -4,7 +4,6 @@
   - main.edit_header do
     %h1 
       Edit Calendar
-      = render :partial => 'actions'
 
   - main.edit_form do
     - form_for :calendar, @calendar, :url => admin_calendar_path(@calendar), :html => { :method => "put", :multipart => true } do |f|

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

@@ -12,7 +12,7 @@
     - tbody.url_cell do
       %td.url
         - if event_venue.url
-          = link_to event_venue.url
+          = link_to truncate(event_venue.url, 48), event_venue.url
     - tbody.modify_cell do
       %td.remove
         = link_to 'remove', remove_admin_event_venue_url(event_venue)

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

@@ -1,44 +1,48 @@
-- include_stylesheet "admin/event_calendar"
-- include_javascript "admin/event_calendar"
-- if defined? TinyMceFilter
-  - include_javascript "tiny_mce/tiny_mce"
-  - include_javascript "tiny_mce/tiny_mce_settings"
-  - include_javascript "tiny_mce/application"
-
 - or_choose ||= false
 - event_venue ||= EventVenue.new
 
-.title
-  %p.venue_title
+.main
+  %p.title
     = f.label :title, "Venue or location title"
     = f.text_field :title, :class => 'textbox'
     - if or_choose && @venues.any?
       = link_to "choose an existing place", '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
-
-%p.note
+    - else
+      %span.note
+        We remember these details for you, so changes here affect every event occurring in this place
+      
   - if or_choose && @venues.any?
-    If you've used this place before, please 
-    = link_to "choose it from the list", '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
-    so that you can update it globally
-  - else
-    Next time you add an event you'll be able to choose this venue from a list
+    %p.note
+      If you've used this place before, please 
+      = link_to "choose it from the list", '#', :class => 'swapper', :rel => 'toggle[venue,new_venue]'
+      so that you can update it globally
+
+.metadata
+  %p.keywords
+    = f.label :keywords
+    = f.text_field :keywords, :class => "textbox"
+
+.main
+  %p.location
+    = f.label :location, "Location tag"
+    = f.text_field :location, :class => "textbox"
+    %span.note
+      This is used to recognise the venue in a calendar feed. It can be postcode, grid reference or any distinctive string.
 
-%p.url
-  = f.label :url, "Venue website"
-  = f.text_field :url, :class => 'textbox'
+  %p.address
+    - if defined? TinyMceFilter
+      = link_to image('mce', :alt=> 'toolbar icon'), '#', :class => 'toggleMCE', :rel => (@event ? "toggle[event_event_venue_attributes_address]" : "toggle[event_venue_address]")
+    = f.label :address, "Address or directions"
+    = f.text_area :address, :class => 'textarea'
 
-%p.venue_location
-  = f.label :address, "Address or location"
-  = f.text_area :address, :class => 'textarea'
+.metadata
+  %p.venue_postcode
+    = f.label :postcode, "Postcode or grid reference"
+    = f.text_field :postcode, :class => 'textbox place'
+    %span.note
+      This is only required if your address is unusual or you want these events to show on a map in a particular place.
 
-%p.venue_postcode
-  = f.label :postcode, "Postcode or grid reference"
-  = f.text_field :postcode, :class => 'textbox place'
-  %span.note
-    This is only required if your address is unusual or you want these events to show on a map in a particular place.
+  %p.url
+    = f.label :url, "Venue url"
+    = f.text_field :url, :class => 'textbox'
 
-%p.venue_description
-  - if defined? TinyMceFilter
-    = link_to image('mce', :alt=> 'toolbar icon'), '#', :class => 'toggleMCE', :rel => "toggle[event_venue_#{event_venue.id}_description]"
-  = f.label :description, "Description"
-  = f.text_area :description, :class => 'textarea', :id => "event_venue_#{event_venue.id}_description"

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

@@ -1,4 +1,9 @@
-- include_stylesheet "admin/calendar"
+- include_stylesheet "admin/event_calendar"
+- include_javascript "admin/event_calendar"
+- if defined? TinyMceFilter
+  - include_javascript "tiny_mce/tiny_mce"
+  - include_javascript "tiny_mce/tiny_mce_settings"
+  - include_javascript "tiny_mce/application"
 
 - render_region :main do |main|
   - main.edit_header do

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

@@ -1,4 +1,9 @@
-- include_stylesheet "admin/calendar"
+- include_stylesheet "admin/event_calendar"
+- include_javascript "admin/event_calendar"
+- if defined? TinyMceFilter
+  - include_javascript "tiny_mce/tiny_mce"
+  - include_javascript "tiny_mce/tiny_mce_settings"
+  - include_javascript "tiny_mce/application"
 
 - render_region :main do |main|
   - main.edit_header do

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

@@ -1,25 +1,19 @@
 - master_event = event.occurrence? ? event.master : event
-- cssclass = "node level-1"
+- cssclass = "node"
 - cssclass << " continuing" if event.continuing?
+- cssclass << " past" if event.finished?
 
 %tr{:class => cssclass}
   - render_region :tbody do |tbody|
     - tbody.date_cell do
       %td.datemark
-        - if event.editable?
-          %a{:href => admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'}
-            %span.month= Date::ABBR_MONTHNAMES[event.start_date.month]
-            %span.day= event.start_date.mday
-        - else
+        %a{:href => admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'}
           %span.month= Date::ABBR_MONTHNAMES[event.start_date.month]
           %span.day= event.start_date.mday
     - tbody.title_cell do
       %td.event
         %h3.title
-          - if event.editable?
-            = link_to event.title, edit_admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'
-          - else
-            = event.title
+          = link_to event.title, edit_admin_event_url(master_event), :class => event.occurrence? ? 'occurrence' : 'master'
         %p.description
           = truncate(event.description, 128)
         - unless event.keywords.blank?
@@ -35,7 +29,8 @@
         = event.summarize_period
     - tbody.location_cell do
       %td.location
-        = event.location
+        - if event.event_venue
+          = event.event_venue.title
     - tbody.modify_cell do
       %td.remove
         - if event.editable?