refinerycms-sl-calendar 2.0.6.2 → 2.0.6.3

data/app/views/refinery/calendar/admin/events/_form.html.erb

@@ -19,12 +19,12 @@
 
   <div class='field'>
     <%= f.label :from -%>
-    <%= f.text_field :from, :class => 'datetime_range'  -%>
+    <%= text_field_tag "event[from]", l(@event.starts_at || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>
     <%= f.label :to -%>
-    <%= f.text_field :to, :class => 'datetime_range'  -%>
+    <%= text_field_tag "event[to]", l(@event.ends_at || Time.now, :format => "%Y-%m-%d %I:%M %p"), :class => 'datetime_range'  -%>
   </div>
 
   <div class='field'>

data/db/migrate/5_change_from_to_attributes_in_events.rb

@@ -4,22 +4,22 @@ class ChangeFromToAttributesInEvents < ActiveRecord::Migration
     add_column :refinery_calendar_events, :starts_at, :datetime
     add_column :refinery_calendar_events, :ends_at, :datetime
 
-    Refinery::Calendar::Event.update_all '"starts_at" = "from", "ends_at" = "to"'
+    Refinery::Calendar::Event.update_all '`starts_at` = `from`, `ends_at` = `to`'
 
-    remove_column :refinery_calendar_events, :from, :datetime
-    remove_column :refinery_calendar_events, :to, :datetime
+    remove_column :refinery_calendar_events, :from
+    remove_column :refinery_calendar_events, :to
 
   end
 
   def down
 
-    add_column :refinery_calendar_events, :starts_at, :datetime
-    add_column :refinery_calendar_events, :ends_at, :datetime
+    add_column :refinery_calendar_events, :from, :date
+    add_column :refinery_calendar_events, :to, :date
 
-    Refinery::Calendar::Event.update_all '"starts_at" = "from", "ends_at" = "to"'
+    Refinery::Calendar::Event.update_all '`from` = `starts_at`, `to` = `ends_at`'
 
-    remove_column :refinery_calendar_events, :from, :datetime
-    remove_column :refinery_calendar_events, :to, :datetime
+    remove_column :refinery_calendar_events, :starts_at
+    remove_column :refinery_calendar_events, :ends_at
 
   end
 end

data/readme.md

@@ -11,7 +11,7 @@ This is a calendar gem for refinery forked from (https://github.com/refinery/ref
 
 ```ruby
 # in Gemfile:
-gem 'refinerycms-sl-calendar', '~> 2.0.6.2'
+gem 'refinerycms-sl-calendar', '~> 2.0.6.3'
 ```
 
 ```

data/vendor/assets/javascripts/refinery/calendar.js.coffee

@@ -1,7 +1,8 @@
 jQuery ->
   datetimes = $(".datetime_range").datetimepicker
     ampm: true
-    dateFormat: 'M d, yy'
+    dateFormat: 'yy-mm-dd'
+    timeFormat: 'hh:mm tt'
     changeMonth: true
     changeYear: true
     numberOfMonths: 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-sl-calendar
 version: !ruby/object:Gem::Version
-  version: 2.0.6.2
+  version: 2.0.6.3
   prerelease: 
 platform: ruby
 authors: