tb_events 1.1.2 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cce5c6d901c2e10830c45cee8f2fbe19b4b053
-  data.tar.gz: e3e23097abe47c1a0e76d38799f5202d58810c87
+  metadata.gz: ce1daf8729504d0663c17b5eea3fe706f86965da
+  data.tar.gz: fa913c71926dacde2922cb5d538d64599968c512
 SHA512:
-  metadata.gz: 7bf7eef8c225bdb0b76f87b06d4f7b7a6ed46a94e2ceaf9790f2dfde84cba76c27176bebe7e364185eb39a6d50b513074d190bf52a2fd934c492e64ec748de21
-  data.tar.gz: a83743a64d224a4f1f221d1c980efb338869bf1bd91c48b6fa09eb4582595ae8fe261169bdcd1ea6b6fa5ab423e4f3f464562e5f6ec62e87b2c2a3b221eabd86
+  metadata.gz: c2f3c7f6768a50f6a29150c72cdbc13644c31c9d91dd8a4a18fecc4cef78c3ef90f251c7210ec08ea858d8490315438b5c8d8d3a1e7ad2798c73c40c4d983a61
+  data.tar.gz: 1a9e8432f194112a8051958f4d5a6710774f46de4ad04c42ffb729ab443a4ccc143a5a38d4792f39409813b736044cacb783da08864e1964c156c2866b2f4eb0

data/app/assets/javascripts/admin/events/application.js

@@ -0,0 +1,16 @@
+//= require_self
+//= require_directory
+
+(function(){
+
+spud.admin.events = {
+  init: function(){
+    $(document).on('ajax:success','.js-spud-calendar-delete-action', deletedCalendar);
+  }
+};
+
+var deletedCalendar = function(){
+  $(this).closest('.spud_events_admin_calendar_legend_item').fadeOut(500, function(){ $(this).remove(); });
+};
+
+})();

data/app/assets/stylesheets/admin/events/application.css

@@ -0,0 +1,4 @@
+/*
+*= require_self
+*= require_directory
+*/

data/app/assets/stylesheets/{spud → admin/events}/calendars.css

@@ -49,10 +49,8 @@
 
 #spud_events_admin_calendar,
 #spud_events_calendar {
-  width: 700px;
-  padding-bottom: 50px;
+  margin: 0 0 20px;
   position: relative;
-  float: left;
 }
 #spud_events_calendar {
   width: auto;
@@ -78,20 +76,23 @@
   vertical-align: top;
   width: 98px;
 }
-.spud_events_admin_calendar_date_container,
-.spud_events_calendar_date_container {
-  display: block;
-  padding: 18px 5px 0;
-  position: relative;
-}
-span.spud_events_admin_calendar_date,
-span.spud_events_calendar_date {
+.calendar-day{
   position: absolute;
   top: 3px;
-  right: 3px;
+  left: 3px;
   font-size: 11px;
   line-height: 11px;
 }
+.calendar-events-list{
+  list-style: none;
+  margin: 20px 0 0;
+}
+.calendar-events-list li{
+  margin: 4px;
+}
+.calendar-events-list a{
+  text-decoration: none;
+}
 
 /*  Calendar Legend
 ----------------------- */
@@ -100,7 +101,6 @@ span.spud_events_calendar_date {
   list-style: none;
   border: 1px solid #d9d9d9;
   padding: 0;
-  margin: 45px 0 0 725px;
 }
 #spud_events_admin_calendar_legend li,
 #spud_events_calendar_legend li {
@@ -120,17 +120,3 @@ span.spud_events_calendar_date {
 #spud_events_calendar_legend li:last-child {
   border: none;
 }
-.spud_events_admin_calendar_actions,
-.spud_events_calendar_actions {
-  text-align: right;
-}
-
-#spud_events_admin_calendar_legend  span,
-#spud_events_calendar_legend  span {
-  display: inline-block;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  padding: 2px 8px;
-  margin: 8px 0 0 8px;
-}

data/app/controllers/admin/calendars_controller.rb

@@ -51,7 +51,7 @@ class Admin::CalendarsController < Admin::ApplicationController
 private
 
   def calendar_params
-    params.require(:spud_calendar).permit(:title, :color)
+    params.require(:spud_calendar).permit(:title)
   end
 
 end

data/app/helpers/admin/calendars_helper.rb

@@ -1,15 +1,15 @@
 module Admin::CalendarsHelper
 
-  def link_to_previous_admin_calendar_month(date, url_for_options)
+  def link_to_previous_admin_calendar_month(date, url_for_options={})
     date = date.advance(:months => -1)
     calendar = params[:calendar] ? params[:calendar] : nil
-    link_to('« Previous Month'.html_safe, admin_list_spud_calendar_events_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link previous_calendar btn').html_safe
+    link_to('« Previous Month'.html_safe, admin_list_spud_calendar_events_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link previous_calendar btn btn-sm btn-default').html_safe
   end
 
-  def link_to_next_admin_calendar_month(date, url_for_options)
+  def link_to_next_admin_calendar_month(date, url_for_options={})
     date = date.advance(:months => 1)
     calendar = params[:calendar] ? params[:calendar] : nil
-    link_to('Next Month »'.html_safe, admin_list_spud_calendar_events_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link next_calendar btn').html_safe
+    link_to('Next Month »'.html_safe, admin_list_spud_calendar_events_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link next_calendar btn btn-sm btn-default pull-right').html_safe
   end
 
 end

data/app/helpers/calendars_helper.rb

@@ -6,43 +6,56 @@ module CalendarsHelper
   # * opts:
   #   - headers: Array of weekday headers (optional)
   #
-  def spud_calendar_for_date(date, opts={})
-    SpudEvents::CalendarBuilder.new(self, date, opts).table do |day|
-      concat content_tag(:span, day.day.to_s, :class => 'calendar-day')
-      if block_given?
-        yield(day)
-      end
-    end
+  def spud_calendar_for_date(date, opts={}, &block)
+    events = SpudCalendarEvent.in_month_of(date)
+    spud_calendar_for_events(events, date, opts, &block)
   end
 
-  # Builds a calendar for the given date, with events
+  # Builds a calendar for the given date and identifier
   #
-  # * events: An array or relation of SpudCalendarEvent records
+  # * identifier: Symbol for the SpudCalendar you wish to display
   # * date: Determines the month to be displayed. Given date will have the "today" css class
   # * opts:
   #   - headers: Array of weekday headers (optional)
   #
-  def spud_calendar_for_events(events, date, opts={})
-    events_grouped = events.group_by(&:start_date)
-    builder = SpudEvents::CalendarBuilder.new(self, date, opts).table do |day|
-      events = events_grouped[day] || []
-      if block_given?
-        yield(day, events)
-      else
-        ## TODO
-      end
+  def spud_calendar_for_identifier(identifier, date, opts={}, &block)
+    calendar = SpudCalendar.with_identifier(identifier)
+    if calendar.present?
+      events = calendar.spud_calendar_events.in_month_of(date)
+    else
+      logger.warn "Failed to load calendar by identifer '#{identifier}'. Does it exist?"
+      events = []
     end
+    spud_calendar_for_events(events, date, opts, &block)
   end
 
-  # Builds a calendar for the given date
+  # Builds a calendar for the given date, with events
   #
-  # * identifier: Symbol for the SpudCalendar you wish to display
+  # * events: An array or relation of SpudCalendarEvent records
   # * date: Determines the month to be displayed. Given date will have the "today" css class
   # * opts:
   #   - headers: Array of weekday headers (optional)
   #
-  def spud_calendar_for_identifier(identifier, date, opts)
-    ## TODO
+  def spud_calendar_for_events(events, date, opts={}, &block)
+    events_grouped = events.group_by(&:start_date)
+    cache(['spud-calendar', date.to_s, events]) do
+      concat(
+        SpudEvents::CalendarBuilder.new(self, date, opts).table do |day|
+          events = events_grouped[day] || []
+          if block
+            block.call(day, events)
+          else
+            concat content_tag(:span, day.day.to_s, :class => 'calendar-day')
+            if events.length > 0
+              list_items = events.collect{ |event|
+                '<li>' + link_to(event.title, calendar_event_path(event)) + '</li>'
+              }.join('')
+              concat content_tag(:ul, raw(list_items), :class => 'events-list')
+            end
+          end
+        end
+      )
+    end
   end
 
   def link_to_previous_calendar_month(date)
@@ -57,24 +70,4 @@ module CalendarsHelper
     link_to('Next Month &raquo;'.html_safe, calendar_path(:month => date.month, :year => date.year, :calendar => calendar), :class => 'spud_events_calendar_link next_calendar btn').html_safe
   end
 
-  def calendar_fore_color(backcolor)
-    fore_color = "ffffff"
-    if backcolor.length != 6
-      return fore_color
-    end
-
-    red = backcolor[0,2].hex
-    green = backcolor[2,2].hex
-    blue = backcolor[4,2].hex
-
-    perceived_brightness = Math.sqrt(red*red*0.241 + green*green*0.691 + blue*blue*0.068)
-
-
-    # average = (red+green+blue) / 3
-    if(perceived_brightness >= 130)
-      return "000000"
-    else
-      return fore_color
-    end
-  end
 end

data/app/models/spud/spud_calendar_event_model.rb

@@ -5,14 +5,9 @@ class Spud::SpudCalendarEventModel < ActiveRecord::Base
   validates_presence_of :title, :start_at, :end_at, :spud_calendar_id
 
   scope :ordered, ->{ order('start_at desc') }
+  scope :in_month_of, ->(date){ where(:start_at => date.beginning_of_month...date.end_of_month) }
   scope :upcoming, ->(limit=false){ where('start_at >= ?', Date.today).order('start_at asc').limit(limit) }
-  scope :in_month_of, ->(date){
-    first = date.beginning_of_month
-    range_start = Time.zone.local(first.year, first.month, first.day)
-    range_end = range_start.end_of_month
-    where(:start_at => range_start..range_end)
-  }
-  
+
   def start_date
     return start_at.to_date
   end

data/app/models/spud_calendar.rb

@@ -1,11 +1,27 @@
 class SpudCalendar < ActiveRecord::Base
   has_many :spud_calendar_events, :dependent => :destroy
-  validates_presence_of :title, :color
+  validates_presence_of :title
   validates :identifier, :presence => true, :uniqueness => true
 
   before_validation :set_identifier
 
-  scope :with_identifier, ->(identifier){ where(:identifier => identifier).first }
+  def self.with_identifier(identifier)
+    where(:identifier => identifier).first
+  end
+
+  def color
+    modulo = (self.id-1) % COLORS.length
+    return COLORS[modulo]
+  end
+
+  COLORS = [
+    '4D854B',
+    'f89406',
+    'b94a48',
+    '3a87ad',
+    '999999',
+    '333333'
+  ]
 
 private
 

data/app/views/admin/calendar_events/_calendar.html.erb

@@ -1,13 +1,19 @@
-<p><%= link_to_next_admin_calendar_month(@calendar_date, :class => "btn") %></p>
-<p><%= link_to_previous_admin_calendar_month(@calendar_date, :class => "btn") %></p>
+<%= link_to_next_admin_calendar_month @calendar_date %>
+<%= link_to_previous_admin_calendar_month @calendar_date %>
 
 <%= spud_calendar_for_events(@calendar_events, @calendar_date, :headers => ['S', 'M', 'T', 'W', 'T', 'F', 'S']) do |day, events| %>
   <span class="calendar-day">
     <%= day.day %>
   </span>
-  <ul class="calendar-events">
+  <ul class="calendar-events-list">
     <% events.each do |event| %>
-      <li><%= link_to truncate(event.title, :length => 25), edit_admin_calendar_event_path(event.id) %></li>
+      <li>
+        <%= link_to edit_admin_calendar_event_path(event.id) do %>
+          <span class="label" style="background-color: #<%= event.spud_calendar.color %>">
+            <%= truncate(event.title, :length => 25) %>
+          </span>
+        <% end %>
+      </li>
     <% end %>
   </ul>
 <% end %>

data/app/views/admin/calendar_events/_form.html.erb

@@ -1,103 +1,21 @@
-<%= form_for @calendar_event, :url => path, :html=>{:class=>"form-horizontal"} do |f| %>
-  <%= error_messages_for(f.object) %>
-    <fieldset>
-    <legend>Details</legend>
-    <div class="control-group">
-      <%= f.label :spud_calender_id, "Calendar",:class => "control-label" %>
-      <div class="controls">
-        <%= f.select(:spud_calendar_id, options_from_collection_for_select(SpudCalendar.all, :id, :title, @calendar_event.spud_calendar_id)) %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :title,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :title %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :description,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_area :description, :rows => 5 %>
-      </div>
-    </div>
-  </fieldset>
+<%= form_for @calendar_event, :url => path, :builder => TbCore::FormBuilder, :html => {:class => "form-horizontal"} do |f| %>
+  <%= tb_form_error_header(f.object) %>
 
-  <fieldset>
-    <legend>Event Time</legend>
+  <%= f.tb_select :spud_calendar_id, options_from_collection_for_select(SpudCalendar.all, :id, :title, @calendar_event.spud_calendar_id) %>
 
-    <div class="control-group">
-      <%= f.label :start_at, "Starts",:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :start_at,:value => f.object.start_at.blank? ? Time.now.strftime("%Y-%m-%d %H:%M") : f.object.start_at.strftime("%Y-%m-%d %H:%M")  , :class => 'spud_form_date_picker' %>
-        <span class="time_select">
-          <%= f.time_select :start_at, :ignore_date => true,:ampm => true%>
-        </span>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :end_at, "Ends",:class => "control-label" %>
+  <%= f.tb_text_field :title %>
+  <%= f.tb_text_area :description %>
 
-      <div class="controls">
-        <%= f.text_field :end_at,:value => f.object.end_at.blank? ? Time.now.strftime("%Y-%m-%d %H:%M") : f.object.end_at.strftime("%Y-%m-%d %H:%M")  , :class => 'spud_form_date_picker' %>
-        <span class="time_select">
-          <%= f.time_select :end_at, :ignore_date => true,:ampm => true%>
-        </span>
-      </div>
-   </div>
-  </fieldset>
-  <fieldset>
-    <legend>Location</legend>
-    <div class="control-group">
-      <%= f.label :location,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :location %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :address,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :address %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :address_2,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :address_2 %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :city,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :city %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :state,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :state %>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :zip,:class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :zip %>
-      </div>
-    </div>
-  </fieldset>
+  <%= f.tb_datetime_select :start_at, :ampm => true, :minute_step => 5 %>
+  <%= f.tb_datetime_select :end_at, :ampm => true, :minute_step => 5 %>
 
-   <div class="form-actions">
-      <%= f.submit "Save", :class=>"btn btn-primary"%> 
-      <%=link_to "cancel",admin_list_spud_calendar_events_path,:class => "btn"%>
-      <% if !@calendar_event.new_record? %>
-        or
-        <%= link_to "Delete", admin_calendar_event_path(@calendar_event), :method=>:delete,:class => "btn btn-danger", :data => {:confirm=>"Are you sure you want delete this event?"} %>
-      <% end %>
-  </div>
+  <%= f.tb_text_field :location %>
+  <%= f.tb_text_field :address %>
+  <%= f.tb_text_field :address_2 %>
+  <%= f.tb_text_field :city %>
+  <%= f.tb_text_field :state %>
+  <%= f.tb_text_field :zip %>
+
+  <%= f.tb_save_buttons 'Event', admin_list_spud_calendar_events_path %>
 
 <% end %>
-<br class="clear" />
-<script type="text/javascript">
-$(document).ready(function(){
-  spud.admin.date_picker.init();
-});
-</script>

data/app/views/admin/calendar_events/index.html.erb

@@ -1,21 +1,28 @@
+<% @page_name = "Events - #{@calendar_date.strftime('%B %Y')}" %>
+
 <%= content_for :data_controls do %>
-  <%= link_to "New Event", new_admin_calendar_event_path, :class => "btn right" %>
+  <%= link_to "New Calendar", new_admin_calendar_path, :class => "btn btn-default" %>
+  <%= link_to "New Event", new_admin_calendar_event_path, :class => "btn btn-primary" %>
 <% end %>
 
 <%= content_for :detail do %>
 
-  <h3>Calendar Events - <%=  @calendar_date.strftime('%B %Y') %></h3>
+  <div class="row">
+    <div id="spud_events_admin_calendar" class="col-md-8">
+      <%= render :partial => 'calendar' %>
+    </div>
 
-  <div id="spud_events_admin_calendar">
-    <%= render :partial => 'calendar' %>
+    <div class="col-md-4">
+      <ul id="spud_events_admin_calendar_legend">
+        <%= render :partial => 'admin/calendars/calendar_legend', :collection => @calendars, :as => :calendar %>
+      </ul>
+    </div>
   </div>
 
-  <ul id="spud_events_admin_calendar_legend">
-    <%= render :partial => 'admin/calendars/calendar_legend', :collection => @calendars, :as => :calendar %>
-    <li>
-      <%= link_to("New Calendar", new_admin_calendar_path, :class => "btn btn-primary btn-small pull-right") %>
-      <br style="clear:right;"/>
-    </li>
-  </ul>
+  <script>
+    $(document).ready(function() {
+      spud.admin.events.init();
+    });
+  </script>
 
 <% end %>