event_calendar_engine 0.2.7 → 0.2.8

data/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 gem 'formtastic'
 gem 'RedCloth'
 gem 'prarupa'
+gem 'will_paginate', '~> 3.0.pre2'
 
 gemspec :path => File.expand_path("..", __FILE__)
 

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    event_calendar_engine (0.2.7)
+    event_calendar_engine (0.2.8)
       RedCloth
       RedCloth
       acts_as_revisable
@@ -20,6 +20,7 @@ PATH
       prarupa
       rails (= 3.0.3)
       will_paginate (~> 3.0.pre2)
+      will_paginate (~> 3.0.pre2)
 
 GEM
   remote: http://rubygems.org/
@@ -179,3 +180,4 @@ DEPENDENCIES
   rcov
   rspec-rails
   sqlite3
+  will_paginate (~> 3.0.pre2)

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/app/controllers/event_revisions_controller.rb

@@ -1,5 +1,7 @@
 class EventRevisionsController < EventCalendar::ApplicationController
   
+  helper EventCalendar::EventsHelper
+  
   def index
     if params[:id]
       redirect_to(event_revision_path(params[:id]))

data/app/controllers/events_controller.rb

@@ -13,6 +13,8 @@ class EventsController < EventCalendar::ApplicationController
           :start => event.start_on.in_time_zone(event.timezone),
           :end => event.end_on.in_time_zone(event.timezone),
           :url => event_path(event),
+          :className => "event_#{event.event_type.gsub(' ', '_')}",
+          :allDay => !event.one_day?,
           :details => render_to_string(:partial => 'events/details', :object => event)
         }
       end
@@ -54,9 +56,16 @@ class EventsController < EventCalendar::ApplicationController
   def index
     if params[:start] && params[:end]
       @events = Event.between(Time.at(params[:start].to_i), Time.at(params[:end].to_i))
+      unless params[:event_type].blank?
+        @events = @events.where(:event_type => params[:event_type])
+      end
     else
       @past_events = Event.past.order("start_on ASC")
       @current_events = Event.current.order("start_on ASC")
+      unless params[:event_type].blank?
+        @past_events = @past_events.where(:event_type => params[:event_type])
+        @current_events = @current_events.where(:event_type => params[:event_type])
+      end
     end
 
     respond_to do |format|
@@ -67,9 +76,10 @@ class EventsController < EventCalendar::ApplicationController
   end
 
   def search
-    # TODO render a search results page instead of a calendar
-    @events = Event.search(params[:q],
-      :narrow_fields => params[:fields] ? params[:fields].keys : nil).paginate :page => params[:page]
+    @events = Event.search(params[:q], {
+      # :narrow_fields => params[:fields] ? params[:fields].keys : nil
+    }).paginate :page => params[:page]
+    @link = Link.new
   end
   
   # GET /events/1

data/app/helpers/event_calendar/application_helper.rb

@@ -139,7 +139,7 @@ module EventCalendar::ApplicationHelper
   def link_to_new_link(event, wrapper_options={}, link_options={})
     return unless has_authorization?(:create, Link.new)
     link_wrapper(new_event_link_path(event), wrapper_options, {
-      :link_text => 'New link',
+      :link_text => 'Add a new link to this event',
       :class => 'fake_button'
     }.merge!(link_options))
   end

data/app/helpers/events_helper.rb

@@ -1,2 +1,18 @@
 module EventsHelper
+  def event_one_liner(event)
+    "#{h(event.name)} #{event_abbrev_date(event)} #{event_details_link(event)}".html_safe
+  end
+  
+  def event_abbrev_date(event)
+    if event.one_day?
+      "(<em>#{event.start_on.strftime("%a")} #{event.start_day.ordinalize}</em>)".html_safe
+    else
+      "(<em>#{event.start_on.strftime("%a")} #{event.start_day.ordinalize} - #{event.end_on.strftime("%a")} #{event.end_day.ordinalize}</em>)".html_safe
+    end
+  end
+  
+  def event_details_link(event)
+    path = event.deleted? ? 'event_revision_path' : 'event_path'
+    "<span class=\"fake_button\">#{link_to('details', send(path, event))}</span>".html_safe
+  end
 end

data/app/views/event_revisions/_list_group.html.erb

@@ -6,19 +6,12 @@
       <li><%= month %>
         <ul>
           <% months_events.each do |event| %>
-          <li class="zoom">
-            <p>
-              <%= link_to event.name, event_revision_path(event) %>
+          <li>
+              <%= event_one_liner(event) %>
               <%= link_to 'restore', restore_event_revision_path(event),
                           :confirm => 'Are you sure you want to restore this deleted event?',
                           :method => "post",
                           :class => 'fake_button' %>
-            </p>
-            <%- if event.one_day? -%>
-            <%= render :partial => 'events/one_day_list_event', :object => event %>
-            <%- else -%>
-            <%= render :partial => 'events/multi_day_list_event', :object => event %>
-            <%- end -%>
           </li>
           <% end %>
         </ul>

data/app/views/events/_calendar.html.erb

@@ -11,7 +11,11 @@
 $(document).ready(function()
   {
     $('#calendar').fullCalendar({ 
-      editable: false, events: '<%= events_path %>', height: 500, aspectRatio: 1,
+      header: { left: 'prev,next today', center: 'title', right: 'month,agendaWeek,agendaDay' },
+      editable: false, 
+      events: '<%= events_path(:event_type => params[:event_type] || @event_type) %>', 
+      height: 500, 
+      aspectRatio: 1,
       eventMouseover: updateEventDescription
     });
   }

data/app/views/events/_details.html.erb

@@ -1,5 +1,6 @@
+<p><%= event_details_link(details) %></p>
 <%- unless details.one_day? %>
-<%= render :partial => 'events/multi_day_list_event', :object => details %>
+<%= event_abbrev_date(details) %>
 <%= textilize(details.location) %>
 <%= textilize(details.description) %>
 <%- else -%>

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

@@ -5,4 +5,4 @@
   
   <p><strong>Materials/Resources</strong></p>
   <%= render :partial => 'links/links' if event.current_revision? %>
-<% end %>
+<% end %>

data/app/views/events/_list.html.erb

@@ -1,9 +1,8 @@
-<div class="span-8">
+<div class="span-9">
   <h2>Current Events (<em><%= @current_events.count %></em>)</h2>
   <%= render :partial => 'events/list_group', :locals => {:events => @current_events} %>
 </div>
-<div class="span-8 last">
+<div class="span-9 last">
   <h2>Past Events (<em><%= @past_events.count %></em>)</h2>
   <%= render :partial => 'events/list_group', :locals => {:events => @past_events} %>
 </div>
-<div style="clear:both;"></div>

data/app/views/events/_list_group.html.erb

@@ -1,18 +1,14 @@
+<%- closed_or_open = closed_or_open.present? ? closed_or_open : 'closed' -%>
 <ul class="events">
   <% events.group_by(&:start_year).each do |year, years_events| %>
   <li><span class="collapsible open"><%= year %></span>
     <ul>
       <% years_events.group_by(&:start_month).each do |month, months_events| %>
-      <li><span class="collapsible closed"><%= month %></span>
+      <li><span class="collapsible <%= closed_or_open %>"><%= month %></span>
         <ul>
           <% months_events.each do |event| %>
-          <li class="zoom">
-            <p class="collapsible closed"><%= link_to event.name, event_path(event) %> (<%= event.start_on.strftime("%a") %> <%= event.start_day.ordinalize %>)</p>
-            <%- if event.one_day? -%>
-            <%= render :partial => 'events/one_day_list_event', :object => event %>
-            <%- else -%>
-            <%= render :partial => 'events/multi_day_list_event', :object => event %>
-            <%- end -%>
+          <li>
+            <%= event_one_liner(event) %>
           </li>
           <% end %>
         </ul>

data/app/views/events/_multi_day_list_event.html.erb

@@ -1,4 +1,5 @@
 <p>
   <%= multi_day_list_event.start_on.strftime("%A") %> <%= multi_day_list_event.start_day.ordinalize %> - 
   <%= multi_day_list_event.end_on.strftime("%A") %> <%= multi_day_list_event.end_day.ordinalize %>
-</p>
+  [<%= link_to "click for full details", event_path(multi_day_list_event) %>]
+</p>

data/app/views/events/_one_day_list_event.html.erb

@@ -1,2 +1,5 @@
-<p><%= one_day_list_event.start_on.strftime("%A") %> <%= one_day_list_event.start_day.ordinalize %></p>
+<p>
+  <%= one_day_list_event.start_on.strftime("%A") %> <%= one_day_list_event.start_day.ordinalize %>
+  [<%= link_to "click for full details", event_path(one_day_list_event) %>]
+</p>
 <p><%= event_times(one_day_list_event) %></p>

data/app/views/events/_search_form.html.erb

@@ -0,0 +1,7 @@
+<div>
+  <strong>Search Events:</strong>
+  <%= form_tag search_events_path, :method => :get, :style => 'display:inline' do %>
+    <%= text_field_tag 'q', params[:q] %>
+    <%= submit_tag 'go', :class => 'fake_button' %><br/>
+  <% end %>
+</div>

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

@@ -1,10 +1,33 @@
-<p style="float: right;">
-  <a href="#" class="fake_button view_events calendar">Calendar</a>
-  <a href="#" class="fake_button view_events list">List</a>
-</p>
+<% if params[:event_type].blank? %>
+  <h1>All Events</h1>
+<% else %>
+  <h1>Events: <%= params[:event_type] %></h1>
+<% end %>
+
+<div class="span-16 last">
+  <div style="float:left"><%= render :partial => 'search_form' %></div>
+  <p style="float: right;">
+    <a href="#" class="fake_button view_events calendar">Calendar</a>
+    <a href="#" class="fake_button view_events list">List</a>
+  </p>
+</div>
+
+<div style="clear:both;"></div>
+
 <div id="event_calendar">
   <%= render :partial => 'calendar' %>
 </div>
 <div id="event_list" style="display: none;">
   <%= render :partial => 'list' %>
 </div>
+
+<div style="clear:both;">
+  Events filter: 
+  <%= form_tag events_path, :method => :get, :style => 'display:inline' do %>
+    <%= select_tag :event_type, '<option value="">all</option>'.html_safe + options_for_select(Event.existing_event_types, params[:event_type]) %>
+    <%= submit_tag "go" %>
+  <% end %>
+</div>
+
+<div style="clear:both;"></div>
+

data/app/views/events/search.html.erb

@@ -1,11 +1,18 @@
+<h1>Events Search</h1>
+
+<%= render :partial => 'events/search_form' %>
+
 <div class="span-16">
-  <h1>Search Results</h1>
-  
-  <% unless @events.empty? %>
-    <%= render :partial => 'event', :collection => @events %>
+  <h4><%= pluralize(@events.count, 'Result') %> Found</h4>
+  <% if @events.present? and @events.any? %>
+    <%= render 'events/list_group', :events => @events, :closed_or_open => 'open' %>
   <% else %>
     <p>Sorry no events could be located, try broadening your search terms or using partial words.</p>
   <% end %>
 </div>
 
-<%= render :partial => 'sidebar' %>
+<div style="clear:both;"></div>
+<p>
+  <%= link_to "Back to full list of events", events_path %>
+</p>
+

data/app/views/events/show.html.erb

@@ -1 +1 @@
-<%= render @event %>
+<%= render @event %>

data/app/views/links/_link.html.erb

@@ -1,6 +1,7 @@
 <%= content_tag_for :p, link, :class => 'zoom' do %>
-  <%= link_to link.name, link.url, :class => 'link_name' %> <em class="link_url"><%= link.url %></em>
+  <%= link_to link.name, link.url, :class => 'link_name', :target => :blank %> 
+  <em class="link_url"><%= link.url %></em>
   <%= link_to_edit_link(@event, link, {}, {:class => 'edit fake_button magic'}) %>
   <%= link_to_delete_link(@event, link, {}, {:class => 'fake_button magic'}) %><br>
-  <span class="link_description"><%= link.description %></span>
-<% end %>
+  <span class="link_description"><%= textilize_without_paragraph link.description unless link.description.blank? %></span>
+<% end %>

data/config/routes.rb

@@ -1,6 +1,9 @@
 Rails.application.routes.draw do
   root :to => "events#index"
   resources :events do
+    collection do
+      get :search
+    end
     resources :attendees
     resources :links
   end

data/public/javascripts/event_calendar/event_calendar.js

@@ -15,9 +15,14 @@ jQuery(function($) {
   $('a.show_hide_link').attach(ShowHideLink);
   $('a.view_events').attach(EventView);
   $('div.links').attach(MagicButtons);
-  $('div.links').attach(QuickZoom);
-  $('div.event').attach(QuickZoom);
-  $('ul.events').attach(QuickZoom);
+
+  /* I'm taking these zooms out - fonts that change size are a first class
+   * ticket to getting slapped by our graphic designer
+   * - Jason 
+   *  $('div.links').attach(QuickZoom);
+   *  $('div.event').attach(QuickZoom);
+   *  $('ul.events').attach(QuickZoom);
+   */
   $('div.links').attach(ecDynamicForm, {
     formElement: $('#link_dynamic_form')
   });

data/public/javascripts/event_calendar/event_calendar_behaviors.js

@@ -250,6 +250,7 @@ var Collapsible = $.klass({
         event.preventDefault();
       }
       clickedElement.siblings().toggle();
+      clickedElement.toggleClass('open closed');
     }
   })
 });

data/public/stylesheets/event_calendar/fullcalendar_changes.css

@@ -9,3 +9,13 @@
 	border: 0 !important; /* important overrides pre jquery ui 1.7 styles */
 	background: url(data:image/gif;base64,AAAA) !important; /* hover fix for IE */
 	}
+
+.fc td { text-align: center; }
+
+.event_conference,
+  .fc-agenda .event_conference .fc-event-time,
+  .event_conference a { background-color: #0A0; border-color: #090; color: white; }
+
+.event_meeting,
+  .fc-agenda .event_meeting .fc-event-time,
+  .event_meeting a { background-color: #C00; border-color: #900; color: white; }

data/spec/fixtures/event_calendar_events.yml

@@ -13,6 +13,7 @@ restorable_event:
   name: Restorable Event
   event_type: Meeting
   location: "Portland, Oregon"
+  description: "Focus group to gather requirements for new reporting system."
   start_on: 2011-02-04 14:00:00.000000
   end_on: 2011-02-04 15:00:00.000000
   timezone: 'Pacific Time (US & Canada)'
@@ -22,6 +23,7 @@ linkable_event:
   name: Linkable Event
   event_type: Meeting
   location: "Portland, Oregon"
+  description: "Overview of work done and work still to do. Snacks/drinks provided."
   start_on: 2011-02-04 14:00:00.000000
   end_on: 2011-02-04 15:00:00.000000
   timezone: 'Pacific Time (US & Canada)'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,12 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: formtastic
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,10 +30,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: RedCloth
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +44,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: prarupa
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,25 +58,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: event_calendar_engine
+  name: will_paginate
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1923831917
         segments: 
+        - 3
         - 0
-        version: "0"
+        - pre
+        - 2
+        version: 3.0.pre2
+  prerelease: false
+  type: :runtime
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: acts_as_revisable
+  name: event_calendar_engine
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,11 +89,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: engineer
+  name: acts_as_revisable
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,11 +103,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: engineer
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -116,11 +117,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,11 +131,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,11 +145,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +159,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,11 +173,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: rcov
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -186,11 +187,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id012
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -200,11 +201,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id013
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -214,11 +215,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id014
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -228,11 +229,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id015
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -242,11 +243,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id016
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: rcov
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -256,11 +257,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id017
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: jeweler
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -270,11 +271,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id018
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -284,11 +285,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id019
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -298,11 +299,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id020
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -312,11 +313,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id021
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -326,11 +327,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id022
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: sqlite3
+  name: rcov
   version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -340,11 +341,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id023
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: sqlite3
   version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -354,11 +355,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id024
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: jeweler
   version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -368,11 +369,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id025
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -382,11 +383,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id026
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -396,11 +397,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id027
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -410,11 +411,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id028
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id029 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -424,11 +425,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id029
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: sqlite3
+  name: rcov
   version_requirements: &id030 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -438,11 +439,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id030
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: sqlite3
   version_requirements: &id031 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -452,11 +453,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id031
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: jeweler
   version_requirements: &id032 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -466,11 +467,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id032
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id033 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -480,11 +481,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id033
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id034 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -494,11 +495,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id034
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id035 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -508,11 +509,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id035
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id036 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -522,11 +523,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id036
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: sqlite3
+  name: rcov
   version_requirements: &id037 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -536,11 +537,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id037
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: sqlite3
   version_requirements: &id038 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -550,11 +551,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id038
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: jeweler
   version_requirements: &id039 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -564,11 +565,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id039
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id040 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -578,11 +579,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id040
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id041 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -592,11 +593,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id041
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id042 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -606,11 +607,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id042
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id043 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -620,11 +621,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id043
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: sqlite3
+  name: rcov
   version_requirements: &id044 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -634,11 +635,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id044
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: sqlite3
   version_requirements: &id045 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -648,11 +649,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id045
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: jeweler
   version_requirements: &id046 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -662,11 +663,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id046
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id047 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -676,11 +677,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id047
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id048 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -690,11 +691,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id048
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id049 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -704,11 +705,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id049
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id050 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -718,11 +719,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id050
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: sqlite3
+  name: rcov
   version_requirements: &id051 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -732,11 +733,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id051
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: sqlite3
   version_requirements: &id052 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -746,11 +747,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id052
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: jeweler
   version_requirements: &id053 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -760,11 +761,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id053
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rspec-rails
   version_requirements: &id054 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -774,11 +775,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id054
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: cucumber-rails
   version_requirements: &id055 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -788,11 +789,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id055
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: capybara
   version_requirements: &id056 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -802,11 +803,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id056
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: acts_as_fu
   version_requirements: &id057 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -816,11 +817,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id057
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: sqlite3
+  name: rcov
   version_requirements: &id058 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -830,27 +831,25 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id058
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: rails
+  name: sqlite3
   version_requirements: &id059 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 3
-        version: 3.0.3
+        version: "0"
+  prerelease: false
+  type: :development
   requirement: *id059
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: RedCloth
+  name: jeweler
   version_requirements: &id060 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -860,11 +859,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id060
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: prarupa
+  name: rspec-rails
   version_requirements: &id061 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -874,11 +873,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id061
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: formtastic
+  name: cucumber-rails
   version_requirements: &id062 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -888,11 +887,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id062
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: acts_as_revisable
+  name: capybara
   version_requirements: &id063 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -902,27 +901,25 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id063
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: will_paginate
+  name: acts_as_fu
   version_requirements: &id064 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 3
         segments: 
-        - 3
         - 0
-        - pre2
-        version: 3.0.pre2
+        version: "0"
+  prerelease: false
+  type: :development
   requirement: *id064
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
+  name: rcov
   version_requirements: &id065 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -932,11 +929,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id065
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec-rails
+  name: sqlite3
   version_requirements: &id066 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -946,25 +943,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id066
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber-rails
+  name: rails
   version_requirements: &id067 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 3
+        version: 3.0.3
+  prerelease: false
+  type: :runtime
   requirement: *id067
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: capybara
+  name: RedCloth
   version_requirements: &id068 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -974,11 +973,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id068
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: acts_as_fu
+  name: prarupa
   version_requirements: &id069 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -988,11 +987,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id069
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rcov
+  name: formtastic
   version_requirements: &id070 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -1002,12 +1001,127 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id070
 - !ruby/object:Gem::Dependency 
+  name: acts_as_revisable
+  version_requirements: &id071 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  requirement: *id071
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  version_requirements: &id072 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1923831917
+        segments: 
+        - 3
+        - 0
+        - pre
+        - 2
+        version: 3.0.pre2
+  prerelease: false
+  type: :runtime
+  requirement: *id072
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id073 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id073
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id074 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :development
+  requirement: *id074
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
+  version_requirements: &id075 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
+  type: :development
+  requirement: *id075
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  version_requirements: &id076 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id076
+- !ruby/object:Gem::Dependency 
+  name: acts_as_fu
+  version_requirements: &id077 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id077
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id078 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id078
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  version_requirements: &id071 !ruby/object:Gem::Requirement 
+  version_requirements: &id079 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1016,7 +1130,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id071
+  prerelease: false
+  type: :development
+  requirement: *id079
 description: Provides basic event management features with versioned history of changes.
 email: 
 - jason.lapier@gmail.com
@@ -1070,6 +1186,7 @@ files:
 - app/views/events/_list_group.html.erb
 - app/views/events/_multi_day_list_event.html.erb
 - app/views/events/_one_day_list_event.html.erb
+- app/views/events/_search_form.html.erb
 - app/views/events/attendees.html.erb
 - app/views/events/edit.html.erb
 - app/views/events/index.html.erb
@@ -1241,7 +1358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Simple versioned event management for Rails 3.