radiant-event_calendar-extension 1.0.2 → 1.1.0

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

@@ -1,6 +1,3 @@
-- 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"
@@ -10,104 +7,111 @@
 - @event.event_venue ||= EventVenue.new
 - @event.recurrence_rules.build unless @event.recurrence_rules.any?
 
-- form_for [:admin, @event] do |f|
-  = f.hidden_field :lock_version
-  = render_region :form_top
-
-  #event_form.form-area.container_12
-    - render_region :form do |form|
+- imported = @event.status == Status[:imported]
 
-      - form.edit_event do
-        .title
-          %p.event_title
-            = f.label :title, "Title"
-            = f.text_field :title, :class => 'textbox'
-          %p.keywords
-            = f.label :keywords, "Tags"
-            = f.text_field :keywords, :class => 'textbox'
+- if imported
+  %p 
+    This event comes from a calendar subscription, but you can add keywords here and give more information about its location. 
+    Please note that changes to the location will affect any other events linked to the same place.
 
-        .url
-          %p.url
-            = f.label :url, "Link to"
-            = f.text_field :url, :class => 'textbox'
+= render_region :form_top
 
-        .description
-          %p.description
-            - if defined? TinyMceFilter
-              = link_to image('mce', :alt=> 'toolbar icon'), '#', :class => 'toggleMCE', :rel => 'toggle[event_description]'
-            = f.label :description, "Description"
-            = f.text_area :description, :class => 'textarea', :style => "width: 100%; height: 8em;"
-          %p.calendar
-            = f.label :calendar_id, "Calendar"
-            = f.select :calendar_id, Calendar.all.map {|c| [c.name, c.id]}, {:include_blank => true}, :class => 'textbox'
-            %span.note
-              This is optional but can be used to file your events or to mix local events into a subscribed calendar.
-              
+#event_form.form-area
+  .main
+    - render_region :form do |form|
+      - form.edit_event do
+        %p.title
+          = f.label :title, "Title"
+          = f.text_field :title, :class => 'textbox', :disabled => imported
+            
       - form.edit_date do
-        .date
-          %p.start_date
-            = f.label :start_date, "Start date and time"
-            = f.text_field :start_date, :class => 'textbox date time'
-            = f.check_box :all_day
-            = f.label :all_day, 'All-day event?', :class => 'minor'
-            %span.note
-              (times will be ignored)
-          %p.end_date
-            = f.label :end_date, "end date and time"
-            = f.text_field :end_date, :class => 'textbox date time'
-          %p#event_note.note
-            If you specify an end date and later change the start date, the end will shift to preserve the event's duration.
+        %p.start_date
+          = f.label :start_date, "Start date and time"
+          = f.text_field :start_date, :class => 'textbox date time', :disabled => imported
+          = f.check_box :all_day, :disabled => imported
+          = f.label :all_day, 'All-day event?', :class => 'minor'
+        %p.end_date
+          = f.label :end_date, "end date and time"
+          = f.text_field :end_date, :class => 'textbox date time', :disabled => imported
 
         .recurrence
           - f.fields_for :recurrence_rules do |rf|
-            
+          
             %p.recurrence
-              = rf.check_box 'active', :class => 'toggle', :rel => "toggle[recurrence_detail]", :style => 'margin-left: 15px;'
+              = rf.check_box 'active', :class => 'toggle', :rel => "toggle[recurrence_detail]", :disabled => imported
               = rf.label :active, 'Repeats', :class => 'minor'
               %span.note
                 (this is for separate similar events. For events that span several days you only need to set the start and end.)
-              
-              %span#recurrence_detail
-                %span#recurrence_interval
-                  = rf.label :interval, "Every"
-                  = rf.text_field :interval, :class => 'textbox short'
-                %span#recurrence_period
-                  = rf.label :period, " "
-                  = rf.select :period, [['day', 'daily'], ['week', 'weekly'], ['month', 'monthly'], ['year', 'yearly']], {}, :class => 'textbox'
-                %span#recurrence_basis
-                  = rf.label :basis, " "
-                  = rf.select :basis, [['forever', 'unbounded'],['until', 'limit'], ['for', 'count']], {}, :class => 'textbox basis'
-                %span#recurrence_unbounded
-                %span#recurrence_limit
-                  = rf.label :limiting_date, " "
-                  = rf.text_field :limiting_date, :class => 'textbox date'
-                %span#recurrence_count
-                  = rf.label :limiting_count, "this many times:", :class => 'inline'
-                  = rf.text_field :limiting_count, :class => 'textbox short'
 
-      - form.edit_venue do
-        - prefer_new = @venues.empty? || @event.event_venue.new_record?
-        - toggle_precedence = prefer_new ? "new_venue,venue" : "venue,new_venue"
-        
-        - if @venues.any?
-          #venue
+            %p#recurrence_detail
+              %span#recurrence_interval
+                = rf.label :interval, "Repeats every"
+                = rf.text_field :interval, :class => 'textbox short'
+              %span#recurrence_period
+                = rf.label :period, " "
+                = rf.select :period, [['day', 'daily'], ['week', 'weekly'], ['month', 'monthly'], ['year', 'yearly']], {}, :class => 'textbox'
+              %span#recurrence_basis
+                = rf.label :basis, " "
+                = rf.select :basis, [['forever', 'unbounded'],['until', 'limit'], ['for', 'count']], {}, :class => 'textbox basis'
+              %span#recurrence_unbounded
+              %span#recurrence_limit
+                = rf.label :limiting_date, " "
+                = rf.text_field :limiting_date, :class => 'textbox date'
+              %span#recurrence_count
+                = rf.label :limiting_count, "this many times:", :class => 'inline'
+                = rf.text_field :limiting_count, :class => 'textbox short'
+
+      - form.edit_description do
+        %p.description
+          - if !imported && defined? TinyMceFilter
+            = link_to image('mce', :alt=> 'toolbar icon'), '#', :class => 'toggleMCE', :rel => 'toggle[event_description]'
+          = f.label :description, "Description"
+          = f.text_area :description, :class => 'textarea', :style => "width: 100%; height: 8em;", :disabled => imported
+
+  - render_region :form_bottom do |form_bottom|
+    - form_bottom.edit_metadata do
+      .metadata
+        %p.keywords
+          = f.label :keywords
+          = f.text_field :keywords, :class => "textbox"
+        %p.calendar
+          = f.label :calendar_id, "Calendar"
+          = f.select :calendar_id, Calendar.all.map {|c| [c.name, c.id]}, {:include_blank => true}, :class => 'textbox', :disabled => imported
+          %br
+          %span.note
+            This is optional but can be used to file your events or to mix local events into a subscribed calendar.
+        %p.url
+          = f.label :url, "Event url"
+          = f.text_field :url, :class => 'textbox', :disabled => imported
+
+    - form_bottom.edit_venue do
+      - toggle_precedence = %w{venue new_venue}
+      - toggle_precedence.reverse! if @venues.empty? || @event.event_venue.new_record?
+  
+      - if imported
+        - f.fields_for :event_venue, @event.event_venue do |ef|
+          = render :partial => 'admin/event_venues/form', :locals => {:event_venue => @event.event_venue, :f => ef, :or_choose => false, :compact => true}
+
+      - else
+        -if @venues.any?
+          #venue.main
             %p#existing_venue
               = f.label :event_venue_id, "Choose a place"
-              = f.select :event_venue_id, @venues.map {|v| [v.title, v.id]}, {:include_blank => true}, :class => 'textbox'
-              = link_to "add a new place", new_admin_event_venue_url, :class => 'swapper', :rel => "toggle[#{toggle_precedence}]"
-            %p.note
-              You can 
-              = link_to "edit the venue list", admin_event_venues_url
-              to update addresses and directions for all relevant events.
-
+              = f.select :event_venue_id, @venues.map {|v| [v.title, v.id]}, {:include_blank => true}, :class => 'textbox', :disabled => imported
+              - if imported
+                = link_to "edit this location", admin_event_venue_url(@event.event_venue)
+                to add title, description and directions
+              - else
+                = link_to "add a new place", new_admin_event_venue_url, :class => 'swapper', :rel => "toggle[#{toggle_precedence.join(',')}]"
         #new_venue
-          - event_venue = @event.event_venue.new_record? ? @event.event_venue : EventVenue.new
-          - f.fields_for :event_venue, event_venue do |ef|
-            = render :partial => 'admin/event_venues/form', :locals => {:event_venue => event_venue, :f => ef, :or_choose => @venues.any?, :compact => true}
+          - @event.build_event_venue unless @event.event_venue
+          - f.fields_for :event_venue, @event.event_venue do |ef|
+            = render :partial => 'admin/event_venues/form', :locals => {:event_venue => @event.event_venue, :f => ef, :or_choose => @venues.any?, :compact => true}
+
 
-  - render_region :form_bottom do |form_bottom|
     - form_bottom.edit_timestamp do
       = updated_stamp @event
+      
     - form_bottom.edit_buttons do
       %p.buttons
         = save_model_button(@event)

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

@@ -1,6 +1,11 @@
+- include_stylesheet "admin/event_calendar"
+- include_javascript "admin/event_calendar"
+
 - render_region :main do |main|
   - main.edit_header do
     %h1 
       Edit Event
+
   - main.edit_form do
-    = render :partial => 'form'
+    - form_for :event, @event, :url => admin_event_path(@calendar), :html => { :method => "put", :multipart => true } do |f|
+      = render :partial => 'form', :locals => { :f => f }

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

@@ -1,6 +1,11 @@
+- include_stylesheet "admin/event_calendar"
+- include_javascript "admin/event_calendar"
+
 - render_region :main do |main|
   - main.edit_header do
     %h1 
       Add an event to the calendar
+
   - main.edit_form do
-    = render :partial => 'form'
+    - form_for :event, @event, :url => admin_events_path do |f|
+      = render :partial => "form", :locals => { :f => f }

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

@@ -17,13 +17,21 @@
           = link_to event.title, event.url, :class => 'title'
         - else
           = event.title
+        - event.attached_tags.each do |tag|
+          %span.tag
+            = tag.name
+          
       %p.practicalities
         = event.summarize_start
         - if event.event_venue
-          %br
-          = link_to event.event_venue.title, event.event_venue.url
+          at
+          - if event.event_venue.url
+            = link_to event.event_venue.title, event.event_venue.url
+          - else
+            = event.event_venue.title
           = event.event_venue.address
-
+        - elsif event.location
+          = event.location
       - unless repeating
         = event.description_paragraph
     

data/db/migrate/20100216080944_more_event_data.rb

@@ -7,7 +7,7 @@ class MoreEventData < ActiveRecord::Migration
     add_column :events, :keywords, :string
     add_column :events, :contact, :string
     add_column :events, :postcode, :string
-    add_column :events, :lock_version, :integer
+    add_column :events, :lock_version, :integer, :default => 0
     add_column :events, :created_by_id, :integer
     add_column :events, :created_at, :datetime
     add_column :events, :updated_by_id, :integer

data/db/migrate/20100927140126_amended_events.rb

@@ -0,0 +1,11 @@
+class AmendedEvents < ActiveRecord::Migration
+  def self.up
+    add_column :events, :amended, :boolean
+    add_column :events, :deleted, :boolean
+  end
+
+  def self.down
+    remove_column :events, :amended
+    remove_column :events, :deleted
+  end
+end

data/db/migrate/20100927203940_calendar_keywords.rb

@@ -0,0 +1,14 @@
+class CalendarKeywords < ActiveRecord::Migration
+  def self.up
+    add_column :calendars, :keywords, :string
+    add_column :event_venues, :keywords, :string
+    add_column :event_venues, :location, :string
+    add_index :event_venues, :location
+  end
+
+  def self.down
+    remove_column :calendars, :keywords
+    remove_column :event_venues, :keywords
+    remove_column :event_venues, :location
+  end
+end

data/lib/event_calendar_admin_ui.rb

@@ -23,8 +23,8 @@ module EventCalendarAdminUI
         returning OpenStruct.new do |calendar|
           calendar.edit = Radiant::AdminUI::RegionSet.new do |edit|
             edit.main.concat %w{edit_header edit_form}
-            edit.form.concat %w{edit_name edit_ical}
-            edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+            edit.form.concat %w{edit_name edit_ical edit_filing edit_description}
+            edit.form_bottom.concat %w{edit_metadata edit_timestamp edit_buttons}
           end
           calendar.index = Radiant::AdminUI::RegionSet.new do |index|
             index.thead.concat %w{name_header url_header refresh_header action_header}
@@ -40,8 +40,8 @@ module EventCalendarAdminUI
         returning OpenStruct.new do |event|
           event.edit = Radiant::AdminUI::RegionSet.new do |edit|
             edit.main.concat %w{edit_header edit_form}
-            edit.form.concat %w{edit_event edit_date edit_venue}
-            edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+            edit.form.concat %w{edit_event edit_date edit_description}
+            edit.form_bottom.concat %w{edit_metadata edit_venue edit_timestamp edit_buttons}
           end
           event.index = Radiant::AdminUI::RegionSet.new do |index|
             index.top.concat %w{help_text}