trusty-festivity-extension 2.5.7 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ed4143d1ee3162b9d26ededac4b2ec217093f9
-  data.tar.gz: 21535a003f32a8b3734fabb7c91d74bdd022aed2
+  metadata.gz: cfcff2db6488fbeed6ba80a78f8b7064b10bd50d
+  data.tar.gz: af8bdf343d4eb70a0bec9e4eb0301fd20e6a3222
 SHA512:
-  metadata.gz: 597c7ab47fb36bee5f62833fcd0850df4c9ace1b3f1bc87dad5a4ae682ffb370cd5bb496c5350555114fed9e8917d390020538205c03ee8fbf33670238a21c7c
-  data.tar.gz: f98857de45e8e1e33e840044c47c2e18a3075d45f0e7a61968db8525cd96b528bbfdd82d08abb3e6a5e33e97b4c646c33909cd32831eff8f8805c390e83b59ca
+  metadata.gz: f7b6be99bb76fbf0455f933705be9314a1cc96698c2a0eb6f571249a950a06a116fb52d6077634d8fbbff705aad3a86f969188dfef9d35e73e2f416fec587ee6
+  data.tar.gz: 287b161abbe7af7bc15139816328b5a42f8ff9fddbcfa34d5c0c9cae9aaf8136e1241059c7617ee154c676e2fa94c54cd290ef999d2143c6e24d388dac073367

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-festivity-extension (2.5.7)
+    trusty-festivity-extension (2.5.8)
       actionpack-action_caching (~> 1.1.1)
       chronic (~> 0.10.2)
       dalli-elasticache (~> 0.1.2)

data/app/assets/javascripts/admin/festivity_admin.js

@@ -1,5 +1,5 @@
 // This is the Festivity admin javascript manifest
-
+//trying to shake da tree 9.7.2016
 // Base and external Javascript libraries
 //= require ../lodash.min
 //= require ../bootstrap.min

data/app/views/festivity_events/_hourly.html.haml

@@ -4,9 +4,9 @@
   .up-next-header
     %h1
       %span.light-text Coming up next:
-      - t = Time.now
-      - n = Time.now + 1.hour
-      = "#{t.strftime("%l")} - #{n.strftime("%l %P")}"
+      - t = DateTime.now.in_time_zone("Eastern Time (US & Canada)").strftime("%a, %b %e, %Y, %l:%M %p")
+      - n = DateTime.now.in_time_zone("Eastern Time (US & Canada)").strftime("%a, %b %e, %Y, %l:%M %p") + 1.hour
+      = "#{t.strftime("%l:%M")} - #{n.strftime("%l:%M %P")}"
 %article.next-events
   - @hourly_events.each_with_index do |performance, i|
     - if i === 0
@@ -19,7 +19,7 @@
           .title
             = performance.festivity_event_page.title
           .time
-            = "#{performance.start_date.strftime("%l")} - #{performance.end_date.strftime("%l %P")}"
+            = "#{performance.start_date.strftime("%l:%M")} - #{performance.end_date.strftime("%l:%M %P")}"
           .locations
             = "#{performance.location} @ #{performance.area}"
       %h2 PLUS
@@ -29,7 +29,7 @@
           .title
             = link_to performance.festivity_event_page.title, event_path(performance.event_page_id)
           .time
-            = "#{performance.start_date.strftime("%l")} - #{performance.end_date.strftime("%l %P")}"
+            = "#{performance.start_date.strftime("%l:%M")} - #{performance.end_date.strftime("%l:%M %P")}"
   %a.button{href: 'events'} See All Events
 
 

data/lib/trusty-festivity-extension.rb

@@ -1,5 +1,5 @@
 module TrustyFestivityExtension
-  VERSION     = "2.5.7"
+  VERSION     = "2.5.8"
   SUMMARY     = "Festival microsite engine for Trusty CMS"
   DESCRIPTION = "Event management for arts festivals."
   URL         = "http://github.com/pgharts/trusty-festivity-extension"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.5.7
+  version: 2.5.8
 platform: ruby
 authors:
 - Eric Sipple, Danielle Greaves, Brittany Martin, Patrick FitzGerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms