caboose-cms 0.4.109 → 0.4.110

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJlYTVjNGY4Y2I2NjgwMDA0MDAwOTZhMTJlM2RlNGJlYzEyZjJiNw==
+    YTBjODNmMjE5YzM2OTc1YzdlNzQwNGUzYmFmN2RkYzdjNTk1MTRhMA==
   data.tar.gz: !binary |-
-    OTgwYmYzMGYwY2MyMDJmNWFkNzI0MTgzNjNlZTA5MjFlYjM4MGJjYg==
+    NDc1ZGI2MmNlZTA1NTkxYWExYTEyYzEzMmE1M2Y5NjZiMDk2ZDBhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzUyMGIyNmU0M2U0MjkxMTY4MTU5ZDRiYzk1ZmM1N2YzZGMyZDUxYjE3ZWYy
-    ZGU4NmU2OTAxZmFlMWQxNjVlZmViODgwMmI0MThiOWY1MGRkYTU3ZjUwNWRi
-    YjFhZGU2ZDUwZTcwMzVlZGNkZTU4YTliNGMzNDljOTgyMDBlOTA=
+    NWM4YzA4ZmE0ZmI4NzczMWI1NWEzY2NlODVlMjQ5ZmYxMjA4MWEwMzE3MDE2
+    YTU5ODgyNzk3NTc5YjU2NTdjNzNhZDkyOGVmODBmZmZjYWNiYzM1N2Q4MGVj
+    NGM5ZWUyMzRhNjM3NTFiMTg2YmFiYzI3MTk2YmY2MDk4ZmMwMjA=
   data.tar.gz: !binary |-
-    Yzg2Nzk0NTUyNDU1NzY1MjUzNmM2MzE4MDMzZjBkNmQwMjI1NGU3NmRjNTM5
-    MjJkZDMwOGRjYTc2YWZhM2ViZGRmY2Y5NjdkYmQwNzMzZjljMmMwMTMxYzY3
-    Y2U2YjQzOTZjYzY2MjEzNzFhYjM4YTUwYjZhOTM0Y2M1YjEzZGM=
+    NDMzMzQ4OTk1ZTViYzYxZDQ4ZmVhNGNlZmFkZmViYjE3NjczZWVhOWZlNzEx
+    OTM3ZjAxNDc2ZWFlYzAyY2MyZWRiMzRhMjI0OTY2ZmZhYWI0MTljZDk5MTAy
+    NWM2ZGNlNTVjYTljNmQ1ZjBkNjhkODAyOTExYWJhZTU1Zjc4NzA=

data/app/assets/stylesheets/caboose/model_binder.css

@@ -103,7 +103,7 @@ div.mb_container form.mb_file_form div.mb_placeholder span {
 }
   
 .mb_container input[type='checkbox'] {
-  /*position: absolute;*/
+  position: absolute;
   top: 4px;
   left: 0;
   z-index: 19;

data/app/controllers/caboose/calendars_controller.rb

@@ -0,0 +1,77 @@
+
+module Caboose
+  class CalendarsController < ApplicationController
+    
+    helper :application
+    
+    def before_action
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
+    end    
+    
+    # GET /admin/calendars
+    def admin_index
+      return if !user_is_allowed('calendars', 'view')
+      render :file => 'caboose/extras/error_invalid_site' and return if @site.nil?
+                  
+      @calendars = Calendar.reorder(:name).all
+      render :layout => 'caboose/admin'      
+    end
+
+    # GET /admin/calendars/:id
+    def admin_edit
+      return unless user_is_allowed('calendars', 'edit')
+      @calendar = Calendar.find(params[:id])
+      
+      @d = params[:d] ? DateTime.iso8601(params[:d]) : DateTime.now
+      @d = @d - (@d.strftime('%-d').to_i-1)      
+      
+      render :layout => 'caboose/admin'
+    end
+            
+    # PUT /admin/calendars/:id
+    def admin_update
+      return unless user_is_allowed('calendars', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      calendar = Calendar.find(params[:id])
+      
+      save = true      
+      params.each do |name, value|
+        case name
+          when 'name'         then calendar.name         = value
+          when 'description'  then calendar.description  = value          
+        end
+      end
+    
+      resp.success = save && calendar.save
+      render :json => resp
+    end
+    
+    # POST /admin/calendars
+    def admin_add
+      return unless user_is_allowed('calendars', 'edit')
+      
+      resp = StdClass.new      
+      calendar = Calendar.new
+      calendar.name = params[:name]
+      calendar.site_id = @site.id
+      
+      if calendar.name.nil? || calendar.name.strip.length == 0
+        resp.error = "Please enter a calendar name."
+      else
+        calendar.save
+        resp.redirect = "/admin/calendars/#{calendar.id}"
+      end
+      render :json => resp
+    end
+    
+    # DELETE /admin/calendars/:id
+    def admin_delete
+      return unless user_is_allowed('calendars', 'delete')
+      Calendar.find(params[:id]).destroy      
+      resp = StdClass.new({ 'redirect' => "/admin/calendars" })                  
+      render :json => resp
+    end       
+		
+  end
+end

data/app/controllers/caboose/event_groups_controller.rb

@@ -0,0 +1,95 @@
+
+module Caboose
+  class EventGroupsController < ApplicationController
+    
+    helper :application
+    
+    # GET /admin/calendars/:calendar_id/events/:id
+    def admin_edit
+      return unless user_is_allowed('calendars', 'edit')
+      @event = CalendarEvent.find(params[:id])      
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /admin/calendars/:calendar_id/events/new
+    def admin_new
+      return unless user_is_allowed('calendars', 'edit')
+      @calendar = Calendar.find(params[:calendar_id])
+      @begin_date = DateTime.iso8601(params[:begin_date])
+      render :layout => 'caboose/modal'
+    end
+    
+    # PUT /admin/calendars/:calendar_id/events/:id
+    def admin_update
+      return unless user_is_allowed('calendars', 'edit')
+      
+      resp = StdClass.new
+      event = CalendarEvent.find(params[:id])
+      
+      save = true      
+      params.each do |name, value|
+        case name
+          when 'name'         then event.name         = value
+          when 'description'  then event.description  = value          
+        end
+      end
+    
+      resp.success = save && event.save
+      render :json => resp
+    end
+    
+    # POST /admin/calendars/:calendar_id/events
+    def admin_add
+      return unless user_is_allowed('calendars', 'edit')
+      
+      resp = StdClass.new      
+      event = CalendarEvent.new
+      event.calendar_id = params[:calendar_id]
+      event.name = params[:name]
+      event.begin_date = DateTime.iso8601("#{params[:begin_date]}T10:00:00-05:00") 
+      event.end_date   = DateTime.iso8601("#{params[:begin_date]}T10:00:00-05:00")      
+      event.all_day = true
+            
+      if event.name.nil? || event.name.strip.length == 0
+        resp.error = "Please enter an event name."
+      else
+        event.save
+        resp.redirect = "/admin/calendars/#{event.calendar_id}/events/#{event.id}"
+      end
+      render :json => resp
+    end
+    
+    # DELETE /admin/calendars/:id
+    def admin_delete
+      return unless user_is_allowed('calendars', 'delete')
+      Calendar.find(params[:id]).destroy      
+      resp = StdClass.new({ 'redirect' => "/admin/calendars" })                  
+      render :json => resp
+    end
+    
+    # GET /admin/event-groups/period-options
+    def admin_period_options
+      render :json => [
+        { 'value' => CalendarEventGroup::PERIOD_DAY   , 'text' => CalendarEventGroup::PERIOD_DAY   },
+        { 'value' => CalendarEventGroup::PERIOD_WEEK  , 'text' => CalendarEventGroup::PERIOD_WEEK  },
+        { 'value' => CalendarEventGroup::PERIOD_MONTH , 'text' => CalendarEventGroup::PERIOD_MONTH },
+        { 'value' => CalendarEventGroup::PERIOD_YEAR  , 'text' => CalendarEventGroup::PERIOD_YEAR  },
+      ]
+    end
+    
+    # GET /admin/event-groups/frequency-options
+    def admin_frequency_options
+      arr = (1..30).collect{ |i| { 'value' => i, 'text' => i }}
+      render :json => arr        
+    end
+    
+    # GET /admin/event-groups/repeat-by-options
+    def admin_repeat_by_options
+      render :json => [        
+        { 'value' => CalendarEventGroup::REPEAT_BY_DAY_OF_MONTH , 'text' => 'same day of the month' },
+        { 'value' => CalendarEventGroup::REPEAT_BY_DAY_OF_WEEK  , 'text' => 'same day of the week' },        
+      ]
+    end
+    
+  end
+end

data/app/controllers/caboose/events_controller.rb

@@ -0,0 +1,99 @@
+
+module Caboose
+  class EventsController < ApplicationController
+    
+    helper :application
+    
+    # GET /admin/calendars/:calendar_id/events/:id
+    def admin_edit
+      return unless user_is_allowed('calendars', 'edit')
+      @event = CalendarEvent.find(params[:id])
+      if @event.calendar_event_group_id.nil?
+        g = CalendarEventGroup.create
+        @event.calendar_event_group_id = g.id
+        @event.save
+      end
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /admin/calendars/:calendar_id/events/new
+    def admin_new
+      return unless user_is_allowed('calendars', 'edit')
+      @calendar = Calendar.find(params[:calendar_id])
+      @begin_date = DateTime.iso8601(params[:begin_date])
+      render :layout => 'caboose/modal'
+    end
+    
+    # POST /admin/calendars/:calendar_id/events
+    def admin_add
+      return unless user_is_allowed('calendars', 'edit')
+      
+      resp = StdClass.new      
+      event = CalendarEvent.new
+      event.calendar_id = params[:calendar_id]
+      event.name = params[:name]
+      event.begin_date = DateTime.iso8601("#{params[:begin_date]}T10:00:00-05:00") 
+      event.end_date   = DateTime.iso8601("#{params[:begin_date]}T10:00:00-05:00")      
+      event.all_day = true
+            
+      if event.name.nil? || event.name.strip.length == 0
+        resp.error = "Please enter an event name."
+      else
+        event.save
+        resp.redirect = "/admin/calendars/#{event.calendar_id}/events/#{event.id}"
+      end
+      render :json => resp
+    end
+    
+    # PUT /admin/calendars/:calendar_id/events/:id
+    def admin_update
+      return unless user_is_allowed('calendars', 'edit')
+      
+      resp = StdClass.new({ 'attributes' => {} })
+      event = CalendarEvent.find(params[:id])
+      
+      save = true      
+      params.each do |name, value|
+        case name
+          when 'name'         then event.name         = value
+          when 'location'     then event.location     = value
+          when 'description'  then event.description  = value
+          when 'all_day'      then event.all_day      = value
+          when 'begin_date'              
+            t = event.begin_date ? event.begin_date.strftime('%H:%M %z') : '10:00 -0500'
+            event.begin_date = DateTime.strptime("#{value} #{t}", '%m/%d/%Y %H:%M %z')                        
+          when 'begin_time'
+            d = event.begin_date ? event.begin_date.strftime('%Y-%m-%d') : DateTime.now.strftime('%Y-%m-%d')
+            event.begin_date = DateTime.strptime("#{d} #{value}", '%Y-%m-%d %H:%M %z')
+          when 'end_date'
+            t = event.end_date ? event.end_date.strftime('%H:%M %z') : '10:00 -0500'
+            event.end_date = DateTime.strptime("#{value} #{t}", '%m/%d/%Y %H:%M %z')
+          when 'end_time'
+            d = event.end_date ? event.end_date.strftime('%Y-%m-%d') : DateTime.now.strftime('%Y-%m-%d')
+            event.end_date = DateTime.strptime("#{d} #{value}", '%Y-%m-%d %H:%M %z')
+          when 'repeats'
+            g = event.calendar_event_group
+            if value == true || value.to_i == 1
+              g.date_start = event.begin_date.to_date if g.date_start.nil?
+              g.date_end   = event.end_date.to_date   if g.date_end.nil?
+              g.save              
+            end
+            event.repeats = value              
+          
+        end
+      end
+    
+      resp.success = save && event.save
+      render :json => resp
+    end        
+    
+    # DELETE /admin/calendars/:calendar_id/events/:id
+    def admin_delete
+      return unless user_is_allowed('calendars', 'delete')
+      CalendarEvent.find(params[:id]).destroy      
+      resp = StdClass.new({ 'redirect' => "/admin/calendars" })                  
+      render :json => resp
+    end       
+		
+  end
+end

data/app/models/caboose/calendar.rb

@@ -0,0 +1,7 @@
+module Caboose
+  class Calendar < ActiveRecord::Base
+    self.table_name = "calendars"
+    has_many :calendar_events, :dependent => :destroy  
+    attr_accessible :id, :site_id, :name, :description
+  end
+end

data/app/models/caboose/calendar_event.rb

@@ -0,0 +1,26 @@
+module Caboose
+  class CalendarEvent < ActiveRecord::Base    
+    self.table_name = "calendar_events"
+    
+    belongs_to :calendar
+    belongs_to :calendar_event_group
+    attr_accessible :id        ,
+      :calendar_id             ,
+      :calendar_event_group_id , 
+      :name                    ,
+      :description             ,
+      :location                ,
+      :begin_date              ,
+      :end_date                ,
+      :all_day        
+
+    def self.events_for_day(calendar_id, d)
+      q = ["calendar_id = ? 
+        and concat(date_part('year', begin_date),date_part('month', begin_date),date_part('day', begin_date)) <= ?
+        and concat(date_part('year', end_date  ),date_part('month', end_date  ),date_part('day', end_date  )) >= ?",
+        calendar_id, d.strftime('%Y%m%d'), d.strftime('%Y%m%d')]
+      self.where(q).reorder(:begin_date).all
+    end
+
+  end
+end

data/app/models/caboose/calendar_event_group.rb

@@ -0,0 +1,30 @@
+module Caboose
+  class CalendarEventGroup < ActiveRecord::Base    
+    self.table_name = "calendar_event_groups"
+    
+    has_many :calendar_events      
+    attr_accessible :id ,
+      :period        , # Daily, weekly, monthly, or yearly
+      :frequency     , 
+      :repeat_by     , # Used for monthly repeats
+      :sun           ,
+      :mon           ,
+      :tue           ,
+      :wed           ,
+      :thu           ,
+      :fri           ,
+      :sat           ,
+      :date_start    ,
+      :repeat_count  , # How many times the repeat occurs
+      :date_end
+     
+    PERIOD_DAY   = 'Day'
+    PERIOD_WEEK  = 'Week'
+    PERIOD_MONTH = 'Month'
+    PERIOD_YEAR  = 'Year'
+
+    REPEAT_BY_DAY_OF_MONTH = 'Day of month'
+    REPEAT_BY_DAY_OF_WEEK  = 'Day of week'
+    
+  end
+end

data/app/models/caboose/schema.rb

@@ -30,7 +30,19 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::AbOption => [:text],
       Caboose::User => [:timezone],
       #Caboose::Field => [:child_block_id],
-      Caboose::BlockType => [:layout_function]
+      Caboose::BlockType => [:layout_function],
+      Caboose::CalendarEventGroup => [
+        :repeat_period , 
+        :repeat_sun    , 
+        :repeat_mon    , 
+        :repeat_tue    , 
+        :repeat_wed    , 
+        :repeat_thu    , 
+        :repeat_fri    , 
+        :repeat_sat    , 
+        :repeat_start  , 
+        :repeat_end    
+      ] 
     }
   end
 
@@ -119,6 +131,37 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name                 , :string  ],
         [ :description          , :string  ]
       ],
+      Caboose::Calendar => [
+        [ :site_id      , :integer  ],
+        [ :name         , :string   ],
+        [ :description  , :text     ]  
+      ],
+      Caboose::CalendarEvent => [
+        [ :calendar_id              , :integer  ],
+        [ :calendar_event_group_id  , :integer  ],
+        [ :name                     , :string   ],
+        [ :description              , :text     ],
+        [ :location                 , :string   ],
+        [ :begin_date               , :datetime ],
+        [ :end_date                 , :datetime ],
+        [ :all_day                  , :boolean  , { :default => false }],        
+        [ :repeats                  , :boolean  , { :default => false }]
+      ],
+      Caboose::CalendarEventGroup => [
+        [ :frequency    , :integer  , { :default => 1 }],
+        [ :period       , :string   , { :default => 'Week' }],        
+        [ :repeat_by    , :string   ],
+        [ :sun          , :boolean  , { :default => false }],
+        [ :mon          , :boolean  , { :default => false }],
+        [ :tue          , :boolean  , { :default => false }],
+        [ :wed          , :boolean  , { :default => false }],
+        [ :thu          , :boolean  , { :default => false }],
+        [ :fri          , :boolean  , { :default => false }],
+        [ :sat          , :boolean  , { :default => false }],
+        [ :date_start   , :date     ],
+        [ :repeat_count , :integer  ],
+        [ :date_end     , :date     ]
+      ],
       Caboose::DatabaseSession => [
         [ :session_id  , :string   , :null => false ],
         [ :data        , :text                      ],

data/app/views/caboose/calendars/admin_edit.html.erb

@@ -0,0 +1,123 @@
+
+<h1>Edit Calendar</h1>
+<p><div id='calendar_<%= @calendar.id %>_name'        ></div></p>
+<p><div id='calendar_<%= @calendar.id %>_description' ></div></p>
+
+<div id='calendar'>
+  <h2><%= @d.strftime('%B %Y') %></h2>
+  <p>
+    <input type='button' value='< Previous Month' onclick="window.location='/admin/calendars/<%= @calendar.id %>?d=<%= (@d - 1.month).strftime('%Y-%m-%d') %>';" />
+    <input type='button' value='Current Month'    onclick="window.location='/admin/calendars/<%= @calendar.id %>?d=<%= DateTime.now.strftime('%Y-%m-%d')   %>';" />
+    <input type='button' value='Next Month >'     onclick="window.location='/admin/calendars/<%= @calendar.id %>?d=<%= (@d + 1.month).strftime('%Y-%m-%d') %>';" />
+  </p>    
+  <p><a href='/admin/calendars/<%= @calendar.id %>/events/new' id='new_event'>New Event</a></p>    
+  <table>
+    <tr>
+      <th>Sun</th>
+      <th>Mon</th>
+      <th>Tue</th>
+      <th>Wed</th>
+      <th>Thu</th>
+      <th>Fri</th>
+      <th>Sat</th>
+    </tr>
+    <%    
+    days_in_previous_month = (@d - (@d - 1.month)).to_f.ceil.to_i
+    days_in_month          = ((@d + 1.month) - @d).to_f.ceil.to_i  
+    start_day = @d.strftime('%w').to_i
+    %>
+    <tr>
+    <% (0...start_day).each do |i| %><td class='blank'><span class='day'><%= days_in_previous_month - (start_day - i) %></span></td><% end %>
+    <% day = 1 %>
+    <% while day <= days_in_month %>
+      <% d = @d + (day-1).days %>
+      <% if (day + start_day-1) % 7 == 0 %></tr><% if day < days_in_month %><tr><% end %><% end %>
+      <td id='day_<%= d.strftime('%Y-%m-%d') %>'>
+        <span class='day'><%= day %></span>
+        <% events = Caboose::CalendarEvent.events_for_day(@calendar.id, d) %>
+        <% if events.count > 0 %>
+          <ul>
+            <% events.each do |ev| %><li><%= ev.name %></li><% end %>
+          </ul>
+        <% end %>      
+      </td>
+      <% day = day + 1 %>
+    <% end %>
+    <% last_day = (start_day + days_in_month) % 7 %>
+    <% remaining_days = 7 - last_day %>    
+    <% if last_day > 0 %><% (0...remaining_days).each do |i| %><td class='blank'><span class='day'><%= (i + 1) %></span></td><% end %><% end %>
+    <% if (start_day + days_in_month) != 0 %></tr><% end %>
+  </table><br />
+</div>
+
+<div id='message'></div>
+<div id='controls'>
+<input type='button' value='Back'            onclick="window.location='/admin/calendars';" />
+<input type='button' value='Delete Calendar' onclick="delete_calendar(<%= @calendar.id %>);" />
+</div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'Calendar',
+    id: <%= @calendar.id %>,
+    update_url: '/admin/calendars/<%= @calendar.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'        , nice_name: 'Name'        , type: 'text'    , value: <%= raw Caboose.json(@calendar.name        ) %>, width: 400 },
+      { name: 'description' , nice_name: 'Description' , type: 'textarea', value: <%= raw Caboose.json(@calendar.description ) %>, width: 400, height: 100 }      
+    ]    
+  });  
+  $('#calendar td')
+    .mouseover(function(e) { $(this).addClass('over'); })
+    .mouseout(function(e) { $(this).removeClass('over'); })
+    .click(function(e) {
+      e.preventDefault();
+      if (!$(this).hasClass('blank'))
+      {        
+        var d = $(this).attr('id').replace('day_', '');        
+        caboose_modal_url('/admin/calendars/<%= @calendar.id %>/events/new?begin_date=' + d);
+      }
+    });
+});
+
+function delete_calendar(calendar_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the calendar? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_calendar(calendar_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Deleting calendar...</p>");
+  $.ajax({
+    url: '/admin/calendars/' + calendar_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+      
+#calendar table { border-collapse: collapse; width: 95%; }
+#calendar th { border: #666 1px solid; background: #666; color: #fff; margin: 0; padding: 4px 8px; }
+#calendar td { border: #666 1px solid; position: relative; margin: 0; padding: 0; height: 100px; vertical-align: top; }
+#calendar td.blank { background: #efefef; border: #666 1px solid; }
+#calendar td.over { background: #ffcc99; }
+#calendar td span.day { display: block; float: left; border-right: #666 1px solid; border-bottom: #666 1px solid; width: 20px; text-align: center; }
+
+</style>
+<% end %>

data/app/views/caboose/calendars/admin_index.html.erb

@@ -0,0 +1,63 @@
+<h1>Calendars</h1>
+
+<form action='/admin/calendars' method='get' class='search_form'>
+<input type='text' name='name_like' placeholder='Name' />
+<input type='submit' value='Search' />
+</form>
+
+<p><a href='/admin/calendars/new' id='new_calendar'>New Calendar</a></p>
+
+<form action='/admin/calendars' method='post' id='new_calendar_form'>
+  <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>'>  
+  <p><input type='text' name='name' id='name' placeholder='Name' style='width: 500px;'></p>  
+  <div id='new_message'></div>
+  <p>
+    <input type='button' value='Cancel' onclick="$('#new_calendar_form').slideToggle();">
+    <input type='submit' value='Add New Calendar' onclick="add_calendar(); return false;">
+  </p>
+</form>
+
+<% if @calendars.count > 0 %>
+  <table class='data'>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>      
+    </tr>
+    <% @calendars.each do |calendar| %>
+      <tr onclick="window.location='/admin/calendars/<%= calendar.id %>';">
+        <td><%= calendar.name %></td>
+        <td><%= calendar.description %></td>    
+      </tr>
+    <% end %>
+  </table>  
+<% else %>
+  <p>There are no calendars right now.</p>
+<% end %>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  $('#new_calendar_form').hide();
+  $('#new_calendar').click(function(e) {
+    e.preventDefault();
+    $('#new_calendar_form').slideToggle();
+  });
+});
+
+function add_calendar() 
+{
+  $('#new_message').html("<p class='loading'>Adding calendar...</p>");
+  $.ajax({
+    url: '/admin/calendars',
+    type: 'post',
+    data: $('#new_calendar_form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#new_message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

data/app/views/caboose/events/admin_edit.html.erb

@@ -0,0 +1,195 @@
+<%
+e = @event
+c = @event.calendar
+g = @event.calendar_event_group
+%>
+<h1>Edit Event</h1> 
+<p><div id='calendarevent_<%= e.id %>_name'        ></div></p>
+<p><div id='calendarevent_<%= e.id %>_location'    ></div></p>
+<p><div id='calendarevent_<%= @event.id %>_description' ></div></p>
+<div id='datetime_container' class='<%= @event.all_day ? 'all_day' : 'non_all_day' %>'>
+  <div id='calendarevent_<%= e.id %>_begin_date'  ></div>
+  <div id='calendarevent_<%= e.id %>_begin_time'  ></div>
+  <div id='calendarevent_<%= e.id %>_end_date'    ></div>
+  <div id='calendarevent_<%= e.id %>_end_time'    ></div>
+  <div class='spacer'></div>
+</div>
+<p id='all_day_repeats_container'>
+  <div id='calendarevent_<%= e.id %>_all_day'     ></div>
+  <div id='calendarevent_<%= e.id %>_repeats'     ></div>
+</p>
+<div id='repeat_container' <% if !e.repeats %>style='display: none;'<% end %>>      
+  <p id='repeat_every'>Repeat every:</p> 
+  <div id='calendareventgroup_<%= g.id %>_frequency'    ></div>
+  <div id='calendareventgroup_<%= g.id %>_period'       ></div>
+  <div id='repeat_by_container' <% if g.repeat_by != Caboose::CalendarEventGroup::PERIOD_MONTH %>style='display: none;'<% end %>>    
+    <div id='calendareventgroup_<%= g.id %>_repeat_by'    ></div>
+  </div>
+  <div id='week_container' <% if g.repeat_by != Caboose::CalendarEventGroup::PERIOD_WEEK %>style='display: none;'<% end %>>
+    <table class='data'>
+      <tr><th>S</th><th>M</th><th>T</th><th>W</th><th>R</th><th>F</th><th>S</th></tr>
+      <tr>
+        <td><div id='calendareventgroup_<%= g.id %>_sun'></div></td>
+        <td><div id='calendareventgroup_<%= g.id %>_mon'></div></td>
+        <td><div id='calendareventgroup_<%= g.id %>_tue'></div></td>
+        <td><div id='calendareventgroup_<%= g.id %>_wed'></div></td>
+        <td><div id='calendareventgroup_<%= g.id %>_thu'></div></td>
+        <td><div id='calendareventgroup_<%= g.id %>_fri'></div></td>
+        <td><div id='calendareventgroup_<%= g.id %>_sat'></div></td>
+      </tr>
+    </table>
+  </div>
+  <p id='repeat_dates_container'>
+    <div id='calendareventgroup_<%= g.id %>_date_start'   ></div> 
+    <div id='calendareventgroup_<%= g.id %>_date_end'     ></div>
+  </p>
+</div>
+
+
+<div id='message'></div>
+<p>
+<input type='button' value='Close'        onclick="modal.close();" />
+<input type='button' value='Delete Event' onclick="delete_event(<%= @event.id %>);" />
+</p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag "jquery-ui/datepicker" %>
+<script type="text/javascript">
+
+var modal = false;
+$(window).ready(function() {
+  modal = new CabooseModal(600);
+});
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'CalendarEvent',
+    id: <%= @event.id %>,
+    update_url: '/admin/calendars/<%= c.id %>/events/<%= e.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'name'        , nice_name: 'Name'         , type: 'text'     , value: <%= raw Caboose.json(e.name        ) %>, width: 430 },        
+      { name: 'description' , nice_name: 'Description'  , type: 'textarea' , value: <%= raw Caboose.json(e.description ) %>, width: 430, height: 100 },
+      { name: 'location'    , nice_name: 'Location'     , type: 'text'     , value: <%= raw Caboose.json(e.location    ) %>, width: 430 },
+      { name: 'begin_date'  , nice_name: 'Begin date'   , type: 'date'     , value: <%= raw Caboose.json(e.begin_date.strftime('%m/%d/%Y') ) %>, width: 200 },
+      { name: 'begin_time'  , nice_name: 'Begin time'   , type: 'time'     , value: <%= raw Caboose.json(e.begin_date.strftime('%I:%M %P') ) %>, width: 200 , fixed_placeholder: false },
+      { name: 'end_date'    , nice_name: 'End date'     , type: 'date'     , value: <%= raw Caboose.json(e.end_date.strftime('%m/%d/%Y')   ) %>, width: 200 },
+      { name: 'end_time'    , nice_name: 'End time'     , type: 'time'     , value: <%= raw Caboose.json(e.end_date.strftime('%I:%M %P')   ) %>, width: 200 , fixed_placeholder: false },
+      { name: 'all_day'     , nice_name: 'All day'      , type: 'checkbox' , value: <%= raw e.all_day ? 1 : 0 %>, width: 100, after_update: after_all_day_update },
+      { name: 'repeats'     , nice_name: 'Repeats'      , type: 'checkbox' , value: <%= raw e.repeats ? 1 : 0 %>, width: 100, after_update: after_repeats_update }      
+    ],
+    on_load: function() { modal.autosize(); }    
+  });  
+  new ModelBinder({
+    name: 'CalendarEventGroup',
+    id: <%= g.id %>,
+    update_url: '/admin/calendars/<%= c.id %>/event-groups/<%= g.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'frequency'    , nice_name: 'Repeat every'  , type: 'select'   , value: <%= raw Caboose.json(g.frequency    ) %>, width: 40  , fixed_placeholder: false, options_url: '/admin/event-groups/frequency-options' },
+      { name: 'period'       , nice_name: 'Repeats'       , type: 'select'   , value: <%= raw Caboose.json(g.period       ) %>, width: 80  , fixed_placeholder: false, options_url: '/admin/event-groups/period-options', after_update: after_period_update },      
+      { name: 'repeat_by'    , nice_name: 'Repeat by'     , type: 'select'   , value: <%= raw Caboose.json(g.repeat_by    ) %>, width: 140 , fixed_placeholder: false, options_url: '/admin/event-groups/repeat-by-options' },
+      { name: 'date_start'   , nice_name: 'Start'         , type: 'date'     , value: <%= raw Caboose.json(g.date_start ? g.date_start.strftime('%m/%d/%Y') : '') %>, width: 200, align: 'right' },
+      { name: 'date_end'     , nice_name: 'End'           , type: 'date'     , value: <%= raw Caboose.json(g.date_end   ? g.date_end.strftime(  '%m/%d/%Y') : '') %>, width: 200, align: 'right' },      
+      { name: 'sun'          , nice_name: 'sun'           , type: 'checkbox' , value: <%= raw g.sun ? 1 : 0 %>, width: 21 , fixed_placeholder: false },
+      { name: 'mon'          , nice_name: 'mon'           , type: 'checkbox' , value: <%= raw g.mon ? 1 : 0 %>, width: 21 , fixed_placeholder: false },
+      { name: 'tue'          , nice_name: 'tue'           , type: 'checkbox' , value: <%= raw g.tue ? 1 : 0 %>, width: 21 , fixed_placeholder: false },
+      { name: 'wed'          , nice_name: 'wed'           , type: 'checkbox' , value: <%= raw g.wed ? 1 : 0 %>, width: 21 , fixed_placeholder: false },
+      { name: 'thu'          , nice_name: 'thu'           , type: 'checkbox' , value: <%= raw g.thu ? 1 : 0 %>, width: 21 , fixed_placeholder: false },
+      { name: 'fri'          , nice_name: 'fri'           , type: 'checkbox' , value: <%= raw g.fri ? 1 : 0 %>, width: 21 , fixed_placeholder: false },
+      { name: 'sat'          , nice_name: 'sat'           , type: 'checkbox' , value: <%= raw g.sat ? 1 : 0 %>, width: 21 , fixed_placeholder: false }        
+    ],
+    on_load: function() { modal.autosize(); }    
+  });  
+});
+            
+function delete_event(event_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the event? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_event(event_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));    
+    modal.autosize(p);
+    return;
+  }
+  modal.autosize("<p class='loading'>Deleting event...</p>");
+  $.ajax({
+    url: '/admin/calendars/<%= c.id %>/events/' + event_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+function after_all_day_update()
+{
+  var el = $('#datetime_container');
+  if (el.hasClass('all_day'))
+    el.removeClass('all_day').addClass('non_all_day');
+  else
+    el.removeClass('non_all_day').addClass('all_day');
+  modal.autosize();
+}
+
+function after_repeats_update()
+{
+  var el = $('#repeat_container');
+  el.slideToggle(function() { modal.autosize(); });  
+}
+
+function after_period_update()
+{
+  var period = $('#calendareventgroup_<%= g.id %>_period').val();
+  if (period == 'Week')
+    $('#week_container').show();
+  else
+    $('#week_container').hide();
+  if (period == 'Month')
+    $('#repeat_by_container').show();
+  else
+    $('#repeat_by_container').hide();
+  modal.autosize();    
+}
+
+</script>
+<% end %>
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag "jquery-ui/datepicker" %>
+<style type='text/css'>
+
+#datetime_container { }
+
+#calendarevent_<%= e.id %>_all_day_container  { float: left; width: 130px; }
+#calendarevent_<%= e.id %>_repeats_container  { width: 200px; }
+
+div.all_day #calendarevent_<%= e.id %>_begin_date_container  { float: left; width: 230px; }
+div.all_day #calendarevent_<%= e.id %>_begin_time_container  { display: none; }
+div.all_day #calendarevent_<%= e.id %>_end_date_container    { width: 230px; }
+div.all_day #calendarevent_<%= e.id %>_end_time_container    { display: none; }
+div.all_day .spacer { clear: left; }
+
+div.non_all_day #calendarevent_<%= e.id %>_begin_date_container  { float: left; width: 230px; margin-bottom: 10px; }
+div.non_all_day #calendarevent_<%= e.id %>_begin_time_container  {              width: 230px; margin-bottom: 10px; }
+div.non_all_day #calendarevent_<%= e.id %>_end_date_container    { float: left; width: 230px; clear: left; }
+div.non_all_day #calendarevent_<%= e.id %>_end_time_container    { float: left; width: 230px; }
+div.non_all_day .spacer { clear: left; }
+
+#repeat_every { float: left; width: 110px; }
+#calendareventgroup_<%= g.id %>_frequency_container { float: left; width: 70px; }
+#calendareventgroup_<%= g.id %>_period_container    { float: left; width: 110px; }
+#calendareventgroup_<%= g.id %>_repeat_by           { float: left; width: 100px; }
+
+#repeat_dates_container { clear: left; }
+#calendareventgroup_<%= g.id %>_date_start_container { float: left; width: 230px; }
+#calendareventgroup_<%= g.id %>_date_end_container   { width: 230px; }
+
+#week_container { clear: left; padding-top: 10px; }
+
+</style>
+<% end %>

data/app/views/caboose/events/admin_index.html.erb

@@ -0,0 +1,67 @@
+<h1>Calendars</h1>
+
+<form action='/admin/calendars' method='get' class='search_form'>
+<input type='text' name='name_like' placeholder='Name' />
+<input type='submit' value='Search' />
+</form>
+
+<p><a href='/admin/calendars/new' id='new_calendar'>New Calendar</a></p>
+
+<form action='/admin/calendars' method='post' id='new_calendar_form'>
+  <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>'>  
+  <p><input type='text' name='name' id='name' placeholder='Name' style='width: 500px;'></p>  
+  <div id='new_message'></div>
+  <p>
+    <input type='button' value='Cancel' onclick="$('#new_calendar_form').slideToggle();">
+    <input type='submit' value='Add New Calendar' onclick="add_calendar(); return false;">
+  </p>
+</form>
+
+<% if @calendars.count > 0 %>
+  <table class='data'>
+    <tr>
+      <%= raw @gen.sortable_table_headings({
+  				'name'        => 'Name',
+  				'description'	=> 'Description'
+  			})
+  		%>
+    </tr>
+    <% @calendars.each do |calendar| %>
+      <tr onclick="window.location='/admin/calendars/<%= calendar.id %>';">
+        <td><%= calendar.name %></td>
+        <td><%= calendar.description %></td>    
+      </tr>
+    <% end %>
+  </table>
+  <p><%= raw @gen.generate %></p>
+<% else %>
+  <p>There are no calendars right now.</p>
+<% end %>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  $('#new_calendar_form').hide();
+  $('#new_calendar').click(function(e) {
+    e.preventDefault();
+    $('#new_calendar_form').slideToggle();
+  });
+});
+
+function add_calendar() 
+{
+  $('#new_message').html("<p class='loading'>Adding calendar...</p>");
+  $.ajax({
+    url: '/admin/calendars',
+    type: 'post',
+    data: $('#new_calendar_form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#new_message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

data/app/views/caboose/events/admin_new.html.erb

@@ -0,0 +1,38 @@
+
+<h1>New Event</h1>       
+
+<form action='/admin/calendars/<%= @calendar.id %>' method='post' id='new_event_form'>
+  <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>'>
+  <input type='hidden' name='begin_date' value='<%= @begin_date.strftime('%Y-%m-%d') %>'>
+  <p><input type='text' name='name' id='name'       placeholder='Name' style='width: 500px;'></p>    
+  <div id='message'></div>
+  <p>
+    <input type='button' value='Cancel' onclick="modal.close();" />
+    <input type='submit' value='Add New Event' onclick="add_event(); return false;" />
+  </p>
+</form>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(window).load(function() {
+  modal = new CabooseModal(600);
+});
+
+function add_event()
+{  
+  $('#message').html("<p class='loading'>Adding event...</p>");
+  $.ajax({
+    url: '/admin/calendars/<%= @calendar.id %>/events',
+    type: 'post',
+    data: $('#new_event_form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

data/app/views/layouts/caboose/application.html.erb

@@ -39,7 +39,14 @@
     :logged_in_user => @logged_in_user,
     :site => @site
   })       
-  str.gsub!('|CABOOSE_CSS|'        , yield(:css))
+  
+  protocol = request.protocol
+  css = yield(:css)
+  css.gsub!("<link href=\"//", "<link href=\"#{protocol}")
+  css.gsub!("<link href='//" , "<link href='#{protocol}")
+  
+  str.gsub!('|CABOOSE_CSS|'        , css)
+  str.gsub!('|CABOOSE_PROTOCOL|'   , protocol)  
   str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  
   str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)  
   

data/config/routes.rb

@@ -208,6 +208,23 @@ Caboose::Engine.routes.draw do
   get     "admin/posts"                           => "posts#admin_index"
   post    "admin/posts"                           => "posts#admin_add"  
   delete  "admin/posts/:id"                       => "posts#admin_delete"
+  
+  get     "admin/calendars"                         => "calendars#admin_index"
+  get     "admin/calendars/:id"                     => "calendars#admin_edit"
+  put     "admin/calendars/:id"                     => "calendars#admin_update"
+  post    "admin/calendars"                         => "calendars#admin_add"
+  delete  "admin/calendars"                         => "calendars#admin_delete"
+  
+  get     "admin/calendars/:calendar_id/events"     => "events#admin_index"
+  get     "admin/calendars/:calendar_id/events/new" => "events#admin_new"
+  get     "admin/calendars/:calendar_id/events/:id" => "events#admin_edit"
+  put     "admin/calendars/:calendar_id/events/:id" => "events#admin_update"
+  post    "admin/calendars/:calendar_id/events"     => "events#admin_add"
+  delete  "admin/calendars/:calendar_id/events"     => "events#admin_delete"
+  
+  get     "admin/event-groups/period-options"     => "event_groups#admin_period_options"
+  get     "admin/event-groups/frequency-options"  => "event_groups#admin_frequency_options"
+  get     "admin/event-groups/repeat-by-options"  => "event_groups#admin_repeat_by_options"
 
   get     "admin/ab-variants"                     => "ab_variants#admin_index"
   get     "admin/ab-variants/new"                 => "ab_variants#admin_new"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.109'
+  VERSION = '0.4.110'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.109
+  version: 0.4.110
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,6 +268,9 @@ files:
 - app/controllers/caboose/block_type_store_controller.rb
 - app/controllers/caboose/block_types_controller.rb
 - app/controllers/caboose/blocks_controller.rb
+- app/controllers/caboose/calendars_controller.rb
+- app/controllers/caboose/event_groups_controller.rb
+- app/controllers/caboose/events_controller.rb
 - app/controllers/caboose/images_controller.rb
 - app/controllers/caboose/login_controller.rb
 - app/controllers/caboose/logout_controller.rb
@@ -303,6 +306,9 @@ files:
 - app/models/caboose/block_type_source.rb
 - app/models/caboose/block_type_summary.rb
 - app/models/caboose/caboose_plugin.rb
+- app/models/caboose/calendar.rb
+- app/models/caboose/calendar_event.rb
+- app/models/caboose/calendar_event_group.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/crumbtrail.rb
 - app/models/caboose/database_session.rb
@@ -388,6 +394,11 @@ files:
 - app/views/caboose/blocks/admin_edit_richtext.html.erb
 - app/views/caboose/blocks/admin_new.html.erb
 - app/views/caboose/blocks/admin_render_second_level.json.erb
+- app/views/caboose/calendars/admin_edit.html.erb
+- app/views/caboose/calendars/admin_index.html.erb
+- app/views/caboose/events/admin_edit.html.erb
+- app/views/caboose/events/admin_index.html.erb
+- app/views/caboose/events/admin_new.html.erb
 - app/views/caboose/extras/error.html.erb
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/extras/error_invalid_site.html.erb