event-calendar 2.3.2 → 2.3.3

data/README.rdoc

@@ -180,6 +180,7 @@ The default options for the calendar are:
     :abbrev => true,
     :first_day_of_week => 0, # See note below when setting this
     :show_today => true,
+    :show_header => true,
     :month_name_text => Time.zone.now.strftime("%B %Y"),
     :previous_month_text => nil,
     :next_month_text => nil,

data/VERSION

@@ -1 +1 @@
-2.3.2
+2.3.3

data/event-calendar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{event-calendar}
-  s.version = "2.3.2"
+  s.version = "2.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Schuil"]
-  s.date = %q{2010-12-29}
+  s.date = %q{2011-03-03}
   s.description = %q{Rails helper for showing multiple, overlapping events across calendar days and rows.}
   s.email = %q{}
   s.extra_rdoc_files = [

data/generators/event_calendar/templates/stylesheet.css

@@ -134,6 +134,10 @@ a.ec-day-link {
   color: #777;
 }
 
+.ec-other-month-bg {
+  
+}
+
 
 /* Event cell and container */
 .ec-event-cell {

data/lib/event_calendar.rb

@@ -57,7 +57,7 @@ module EventCalendar
       )
     end
     
-    # Create the various strips that show evetns
+    # Create the various strips that show events.
     def create_event_strips(strip_start, strip_end, events)
       # create an inital event strip, with a nil entry for every day of the displayed days
       event_strips = [[nil] * (strip_end - strip_start + 1)]

data/lib/event_calendar/calendar_helper.rb

@@ -1,6 +1,6 @@
 module EventCalendar
   module CalendarHelper
- 
+
     # Returns an HTML calendar which can show multiple, overlapping events across calendar days and rows.
     # Customize using CSS, the below options, and by passing in a code block.
     #
@@ -11,6 +11,7 @@ module EventCalendar
     # :abbrev => true # Abbreviate day names. Reads from the abbr_day_names key in the localization file.
     # :first_day_of_week => 0 # Renders calendar starting on Sunday. Use 1 for Monday, and so on.
     # :show_today => true # Highlights today on the calendar using CSS class.
+    # :show_header => true # Show the calendar's header. (month name, next, & previous links)
     # :month_name_text => nil # Displayed center in header row.
     #     Defaults to current month name from Date::MONTHNAMES hash.
     # :previous_month_text => nil # Displayed left of the month name if set
@@ -30,7 +31,7 @@ module EventCalendar
     #     If it is an all day event, or the event is multiple days, then it will display as usual.
     #     Otherwise it will display without a background color bar.
     # :use_javascript => true # Outputs HTML with inline javascript so events spanning multiple days will be highlighted.
-    #     If this option is false, cleaner HTML will be output, but events spanning multiple days will 
+    #     If this option is false, cleaner HTML will be output, but events spanning multiple days will
     #     not be highlighted correctly on hover, so it is only really useful if you know your calendar
     #     will only have single-day events. Defaults to true.
     # :link_to_day_action => false # If controller action is passed,
@@ -47,37 +48,40 @@ module EventCalendar
     #
     def calendar(options = {}, &block)
       block ||= Proc.new {|d| nil}
- 
+
       defaults = {
         :year => (Time.zone || Time).now.year,
         :month => (Time.zone || Time).now.month,
         :abbrev => true,
         :first_day_of_week => 0,
         :show_today => true,
+        :show_header => true,
         :month_name_text => (Time.zone || Time).now.strftime("%B %Y"),
         :previous_month_text => nil,
         :next_month_text => nil,
         :event_strips => [],
-        
+
         # it would be nice to have these in the CSS file
         # but they are needed to perform height calculations
         :width => nil,
-        :height => 500, 
+        :height => 500,
         :day_names_height => 18,
         :day_nums_height => 18,
         :event_height => 18,
         :event_margin => 1,
         :event_padding_top => 2,
-        
+
         :use_all_day => false,
         :use_javascript => true,
         :link_to_day_action => false
       }
       options = defaults.merge options
-    
+
       # default month name for the given number
-      options[:month_name_text] ||= I18n.translate(:'date.month_names')[options[:month]]
-      
+      if options[:show_header]
+        options[:month_name_text] ||= I18n.translate(:'date.month_names')[options[:month]]
+      end
+
       # make the height calculations
       # tricky since multiple events in a day could force an increase in the set height
       height = options[:day_names_height]
@@ -85,7 +89,7 @@ module EventCalendar
       row_heights.each do |row_height|
         height += row_height
       end
-      
+
       # the first and last days of this calendar month
       if options[:dates].is_a?(Range)
         first = options[:dates].begin
@@ -94,7 +98,7 @@ module EventCalendar
         first = Date.civil(options[:year], options[:month], 1)
         last = Date.civil(options[:year], options[:month], -1)
       end
-      
+
       # create the day names array [Sunday, Monday, etc...]
       day_names = []
       if options[:abbrev]
@@ -105,70 +109,73 @@ module EventCalendar
       options[:first_day_of_week].times do
         day_names.push(day_names.shift)
       end
- 
+
       # Build the HTML string
       cal = ""
-      
+
       # outer calendar container
       cal << %(<div class="ec-calendar")
       cal << %(style="width: #{options[:width]}px;") if options[:width]
       cal << %(>)
-      
+
       # table header, including the monthname and links to prev & next month
-      cal << %(<table class="ec-calendar-header" cellpadding="0" cellspacing="0">)
-      cal << %(<thead><tr>)
-      if options[:previous_month_text] or options[:next_month_text]
-        cal << %(<th colspan="2" class="ec-month-nav ec-previous-month">#{options[:previous_month_text]}</th>)
-        colspan = 3
-      else
-        colspan = 7
-      end
-      cal << %(<th colspan="#{colspan}" class="ec-month-name">#{options[:month_name_text]}</th>)
-      if options[:next_month_text]
-        cal << %(<th colspan="2" class="ec-month-nav ec-next-month">#{options[:next_month_text]}</th>)
+      if options[:show_header]
+        cal << %(<table class="ec-calendar-header" cellpadding="0" cellspacing="0">)
+        cal << %(<thead><tr>)
+        if options[:previous_month_text] or options[:next_month_text]
+          cal << %(<th colspan="2" class="ec-month-nav ec-previous-month">#{options[:previous_month_text]}</th>)
+          colspan = 3
+        else
+          colspan = 7
+        end
+        cal << %(<th colspan="#{colspan}" class="ec-month-name">#{options[:month_name_text]}</th>)
+        if options[:next_month_text]
+          cal << %(<th colspan="2" class="ec-month-nav ec-next-month">#{options[:next_month_text]}</th>)
+        end
+        cal << %(</tr></thead></table>)
       end
-      cal << %(</tr></thead></table>)
-      
+
       # body container (holds day names and the calendar rows)
       cal << %(<div class="ec-body" style="height: #{height}px;">)
-      
-      # day names 
+
+      # day names
       cal << %(<table class="ec-day-names" style="height: #{options[:day_names_height]}px;" cellpadding="0" cellspacing="0">)
       cal << %(<tbody><tr>)
       day_names.each do |day_name|
         cal << %(<th class="ec-day-name" title="#{day_name}">#{day_name}</th>)
       end
       cal << %(</tr></tbody></table>)
-      
+
       # container for all the calendar rows
       cal << %(<div class="ec-rows" style="top: #{options[:day_names_height]}px; )
       cal << %(height: #{height - options[:day_names_height]}px;">)
-      
+
       # initialize loop variables
       first_day_of_week = beginning_of_week(first, options[:first_day_of_week])
       last_day_of_week = end_of_week(first, options[:first_day_of_week])
       last_day_of_cal = end_of_week(last, options[:first_day_of_week])
       row_num = 0
       top = 0
-      
+
       # go through a week at a time, until we reach the end of the month
       while(last_day_of_week <= last_day_of_cal)
         cal << %(<div class="ec-row" style="top: #{top}px; height: #{row_heights[row_num]}px;">)
         top += row_heights[row_num]
-        
+
         # this weeks background table
         cal << %(<table class="ec-row-bg" cellpadding="0" cellspacing="0">)
         cal << %(<tbody><tr>)
         first_day_of_week.upto(first_day_of_week+6) do |day|
           today_class = (day == Date.today) ? "ec-today-bg" : ""
-          cal << %(<td class="ec-day-bg #{today_class}">&nbsp;</td>)
+          other_month_class = (day < first) || (day > last) ? 'ec-other-month-bg' : ''
+          cal << %(<td class="ec-day-bg #{today_class} #{other_month_class}">&nbsp;</td>)
         end
         cal << %(</tr></tbody></table>)
-        
+
         # calendar row
         cal << %(<table class="ec-row-table" cellpadding="0" cellspacing="0">)
         cal << %(<tbody>)
-        
+
         # day numbers row
         cal << %(<tr>)
         first_day_of_week.upto(last_day_of_week) do |day|
@@ -185,7 +192,7 @@ module EventCalendar
           cal << %(</td>)
         end
         cal << %(</tr>)
-        
+
         # event rows for this day
         # for each event strip, create a new table row
         options[:event_strips].each do |strip|
@@ -193,7 +200,7 @@ module EventCalendar
           # go through through the strip, for the entries that correspond to the days of this week
           strip[row_num*7, 7].each_with_index do |event, index|
             day = first_day_of_week + index
-            
+
             if event
               # get the dates of this event that fit into this week
               dates = event.clip_range(first_day_of_week, last_day_of_week)
@@ -202,10 +209,11 @@ module EventCalendar
               if dates[0] == day.to_date
                 # check if we should display the bg color or not
                 no_bg = no_event_bg?(event, options)
-                
+                class_name = event.class.name.tableize.singularize
+
                 cal << %(<td class="ec-event-cell" colspan="#{(dates[1]-dates[0]).to_i + 1}" )
                 cal << %(style="padding-top: #{options[:event_margin]}px;">)
-                cal << %(<div class="ec-event ec-event-#{event.id} )
+                cal << %(<div class="ec-event ec-#{class_name}-#{event.id} )
                 if no_bg
                   cal << %(ec-event-no-bg" )
                   cal << %(style="color: #{event.color}; )
@@ -213,14 +221,15 @@ module EventCalendar
                   cal << %(ec-event-bg" )
                   cal << %(style="background-color: #{event.color}; )
                 end
+
                 cal << %(padding-top: #{options[:event_padding_top]}px; )
                 cal << %(height: #{options[:event_height] - options[:event_padding_top]}px;" )
                 if options[:use_javascript]
                   # custom attributes needed for javascript event highlighting
-                  cal << %(data-event-id="#{event.id}" data-color="#{event.color}" )
+                  cal << %(data-event-id="#{event.id}" data-event-class="#{class_name}" data-color="#{event.color}" )
                 end
                 cal << %(>)
-                
+
                 # add a left arrow if event is clipped at the beginning
                 if event.start_at.to_date < dates[0]
                   cal << %(<div class="ec-left-arrow"></div>)
@@ -229,25 +238,25 @@ module EventCalendar
                 if event.end_at.to_date > dates[1]
                   cal << %(<div class="ec-right-arrow"></div>)
                 end
-                
+
                 if no_bg
                   cal << %(<div class="ec-bullet" style="background-color: #{event.color};"></div>)
                   # make sure anchor text is the event color
                   # here b/c CSS 'inherit' color doesn't work in all browsers
-                  cal << %(<style type="text/css">.ec-event-#{event.id} a { color: #{event.color}; }</style>)
+                  cal << %(<style type="text/css">.ec-#{class_name}-#{event.id} a { color: #{event.color}; }</style>)
                 end
-                
+
                 if block_given?
                   # add the additional html that was passed as a block to this helper
                   cal << block.call({:event => event, :day => day.to_date, :options => options})
                 else
                   # default content in case nothing is passed in
-                  cal << %(<a href="/events/#{event.id}" title="#{h(event.name)}">#{h(event.name)}</a>)
+                  cal << %(<a href="/#{class_name.pluralize}/#{event.id}" title="#{h(event.name)}">#{h(event.name)}</a>)
                 end
-                
+
                 cal << %(</div></td>)
               end
-              
+
             else
               # there wasn't an event, so create an empty cell and container
               cal << %(<td class="ec-event-cell ec-no-event-cell" )
@@ -261,39 +270,40 @@ module EventCalendar
           end
           cal << %(</tr>)
         end
-        
+
         cal << %(</tbody></table>)
         cal << %(</div>)
-        
+
         # increment the calendar row we are on, and the week
         row_num += 1
         first_day_of_week += 7
         last_day_of_week += 7
-      end      
-    
-      cal << %(</div>)   
+      end
+
+      cal << %(</div>)
       cal << %(</div>)
       cal << %(</div>)
     end
-    
+
     # override this in your own helper for greater control
     def day_link(text, date, day_action)
       link_to(text, params.merge(:action => day_action, :year => date.year, :month => date.month, :day => date.day), :class => 'ec-day-link')
     end
-    
+
     # check if we should display without a background color
     def no_event_bg?(event, options)
       options[:use_all_day] && !event.all_day && event.days == 0
     end
-    
+
     # default html for displaying an event's time
     # to customize: override, or do something similar, in your helper
+    # for instance, you may want to add localization
     def display_event_time(event, day)
       time = event.start_at
       if !event.all_day and time.to_date == day
         # try to make it display as short as possible
-        fmt = (time.min == 0) ? "%l" : "%l:%M"
-        t = time.strftime(fmt)
+        format = (time.min == 0) ? "%l" : "%l:%M"
+        t = time.strftime(format)
         am_pm = time.strftime("%p") == "PM" ? "p" : ""
         t += am_pm
         %(<span class="ec-event-time">#{t}</span>)
@@ -301,9 +311,9 @@ module EventCalendar
         ""
       end
     end
-  
+
     private
-    
+
     # calculate the height of each row
     # by default, it will be the height option minus the day names height,
     # divided by the total number of calendar rows
@@ -336,11 +346,11 @@ module EventCalendar
       end
       row_heights
     end
-  
+
     #
     # helper methods for working with a calendar week
     #
-    
+
     def days_between(first, second)
       if first > second
         second + (7 - first)
@@ -348,17 +358,17 @@ module EventCalendar
         second - first
       end
     end
-  
+
     def beginning_of_week(date, start = 0)
       days_to_beg = days_between(start, date.wday)
       date - days_to_beg
     end
-    
+
     def end_of_week(date, start = 0)
       beg = beginning_of_week(date, start)
       beg + 6
     end
-  
+
     def weekend?(date)
       [0, 6].include?(date.wday)
     end

data/lib/generators/event_calendar/templates/javascript.js

@@ -9,14 +9,16 @@ Event.observe(window, "load", function() {
   $$(".ec-event-bg").each(function(ele) {
     ele.observe("mouseover", function(evt) {
       event_id = ele.readAttribute("data-event-id");
-      $$(".ec-event-"+event_id).each(function(el) {
+      event_class_name = ele.readAttribute("data-event-class");
+      $$(".ec-"+event_class_name+"-"+event_id).each(function(el) {
         el.setStyle({ backgroundColor: highlight_color });
       });
     });
     ele.observe("mouseout", function(evt) {
-      event_color = ele.readAttribute("data-color");
       event_id = ele.readAttribute("data-event-id");
-      $$(".ec-event-"+event_id).each(function(el) {
+      event_class_name = ele.readAttribute("data-event-class");
+      event_color = ele.readAttribute("data-color");
+      $$(".ec-"+event_class_name+"-"+event_id).each(function(el) {
         el.setStyle({ backgroundColor: event_color });
       });
     });

data/lib/generators/event_calendar/templates/jq_javascript.js

@@ -2,18 +2,20 @@
  * Smart event highlighting
  * Handles when events span rows, or don't have a background color
  */
-$(document).ready(function() {
+jQuery(document).ready(function($) {
   var highlight_color = "#2EAC6A";
   
   // highlight events that have a background color
   $(".ec-event-bg").live("mouseover", function() {
     event_id = $(this).attr("data-event-id");
-    $(".ec-event-"+event_id).css("background-color", highlight_color);
+		event_class_name = $(this).attr("data-event-class");
+    $(".ec-"+event_class_name+"-"+event_id).css("background-color", highlight_color);
   });
   $(".ec-event-bg").live("mouseout", function() {
     event_id = $(this).attr("data-event-id");
+		event_class_name = $(this).attr("data-event-class");
     event_color = $(this).attr("data-color");
-    $(".ec-event-"+event_id).css("background-color", event_color);
+    $(".ec-"+event_class_name+"-"+event_id).css("background-color", event_color);
   });
   
   // highlight events that don't have a background color

data/lib/generators/event_calendar/templates/stylesheet.css

@@ -134,6 +134,10 @@ a.ec-day-link {
   color: #777;
 }
 
+.ec-other-month-bg {
+  
+}
+
 
 /* Event cell and container */
 .ec-event-cell {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event-calendar
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Jeff Schuil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -08:00
+date: 2011-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: []