refinerycms-events 0.0.2 → 0.0.3

data/app/controllers/admin/events_controller.rb

@@ -1,5 +1,4 @@
 class Admin::EventsController < Admin::BaseController
-  helper :calendars
   crudify :event, :title_attribute => :title, :sortable => false, :order => 'start_at DESC'
 
 end

data/app/controllers/events_controller.rb

@@ -1,7 +1,6 @@
 class EventsController < ApplicationController
 
   before_filter :find_page
-  helper :calendars
 
   def index
     @date = Date.parse(params[:date]) rescue Date.today

data/app/helpers/{calendars_helper.rb → events_helper.rb}

@@ -1,4 +1,4 @@
-module CalendarsHelper
+module EventsHelper
   def datetime(d)
     I18n.localize(d, :format => "%B %d, %Y %l:%M %p")
   end
@@ -49,11 +49,15 @@ module CalendarsHelper
     end
   end
 
-  def event_list
+  def event_list(options = Hash.new)
     grouped_events = Event.
-      all(:limit => 10, :order => 'start_at ASC',
-          :conditions => [ 'start_at >= ?', Time.now ]).
+      all(:limit => options.fetch(:limit) { 10 }, :order => 'start_at ASC',
+          :conditions => [ 'start_at >= ? || end_at >= ?', Time.now, Time.now ]).
       group_by { |e| e.start_at.to_date }
-    render :partial => '/events/event_list', :object => grouped_events
+
+    render(:partial => '/events/event_list',
+           :object => grouped_events,
+           :locals => { :heading => options[:heading],
+                        :see_more_link => options.fetch(:see_more_link) { 'View the calendar' } } )
   end
 end

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

@@ -1,20 +1,23 @@
-<dl class="event-list">
-  <% event_list.each do |d, events| -%>
-  <dt><%= date(d) %></dt>
-  <dd>
-    <ul>
-      <% events.each do |e| -%>
-      <li class="event">
-	<%= link_to(event_title(e), event_path(e)) %>
-	<% unless e.location.blank? -%>
-	@ <%= h(e.location) %>
-	<% end -%>
-      </li>
+<% unless event_list.blank? -%>
+  <%= content_tag('h1', heading) if heading %>
+  <dl class="event-list">
+    <% event_list.each do |d, events| -%>
+    <dt><%= date(d) %></dt>
+    <dd>
+      <ul>
+        <% events.each do |e| -%>
+        <li class="event">
+	  <%= link_to(event_title(e), event_path(e)) %>
+  	  <% unless e.location.blank? -%>
+  	    @ <%= h(e.location) %>
+  	  <% end -%>
+        </li>
+        <% end -%>
+      </ul>
       <% end -%>
-    </ul>
-    <% end -%>
-  </dd>
-  <dt>
-    <%= link_to 'View the calendar', events_path %>
-  </dt>
-</dl>
+    </dd>
+    <dt>
+      <%= link_to(see_more_link, events_path) %>
+    </dt>
+  </dl>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-events
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - SemanticGap
@@ -48,7 +48,7 @@ files:
 - app/models/event.rb
 - app/controllers/events_controller.rb
 - app/controllers/admin/events_controller.rb
-- app/helpers/calendars_helper.rb
+- app/helpers/events_helper.rb
 - app/views/events/index.html.erb
 - app/views/events/show.html.erb
 - app/views/events/_event_list.html.erb