trusty-festivity-extension 2.3.10 → 2.3.11g

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc684bbca1daf60494d469936f1052aa9be513c9
-  data.tar.gz: 8608b78d593da59473ee0548504d7805db27f06e
+  metadata.gz: 41410e300ec494f9320936b8875d2bd6fbce7c41
+  data.tar.gz: 4de5aca565adf82abb81952a19543b0904c3982e
 SHA512:
-  metadata.gz: 5595efad9e4ab46b8f1efd095cccf74bfe45657893327d50ad289f8e07a9b6ec6dff348ffd8b61833a26f754b4dd43c540dcc55fba85c7f2d390e4e9ccd06570
-  data.tar.gz: d8d82308a8074aa1e84d6b53d08f6ae9c9eebac85390f466c9313562d33df3f6fc74cc731bff122ba73817a71b5667f65a4e0d039d066096410213b64fa2048a
+  metadata.gz: 1c8ca30469f6a4a9d2d3d094bfd037dbe2da3b666678af72d279f6560b6bd96a18c12308947227625a8171863dff60cc3df6c9c1b435cfbaebcb76e6b7796c5b
+  data.tar.gz: 79a66463b069ba97ba5daa7c1ee5e0af821cb6f6b2d9576d2bd5f92e8348b70a49fd984b48428ce6260a665f186a79c7c6ef08bd4115fb6183f87f7a290d28fc

data/app/assets/javascripts/events/filters.js

@@ -47,8 +47,8 @@ Festivity.Filters = {
       Festivity.Filters.queryEvents();
     });
 
-    $(".sort-control").change(function(e){
-      $(".sort-control").val(e.currentTarget.value);
+    $("#sort").change(function(e){
+      $("#sort").val(e.currentTarget.value);
       Festivity.Filters.queryEvents();
     });
 

data/app/assets/javascripts/home-social.js

@@ -1,4 +1,4 @@
-(function(){
+$(document).ready(function() {
 	imagesLoaded('.home.first-night', function() {
 		$('.social-posts').masonry({
 			itemSelector: '.social-posts article',
@@ -6,4 +6,4 @@
 			percentPosition: true
 		});
 	});
-}());
+});

data/app/assets/javascripts/navigation.js

@@ -1,10 +1,9 @@
-var $menuTrigger = $('.menu-trigger'),
+
+function toggleNavWrapper() {
+  var $menuTrigger = $('.menu-trigger'),
     $navWrapper = $('.nav-wrapper'),
-    $primaryMenu = $('.primary-navigation'),
-    $utilityMenu = $('.utility-navigation'),
     $iconMenuButton = $('.iconmenu-button');
 
-function toggleNavWrapper() {
   $menuTrigger.on("click", function(e) {
     $menuTrigger.toggleClass('is-active');
     $iconMenuButton.toggleClass('open');
@@ -12,24 +11,32 @@ function toggleNavWrapper() {
   });
 };
 
+$(document).ready(function(){
+  var $menuTrigger = $('.menu-trigger'),
+    $navWrapper = $('.nav-wrapper'),
+    $primaryMenu = $('.primary-navigation'),
+    $utilityMenu = $('.utility-navigation'),
+    $iconMenuButton = $('.iconmenu-button');
 // Fixes broken navigation when changing states on mobile then expanding to desktop
-jRes.addFunc({
-  breakpoint: 'nav',
-  enter: function() {
-    $primaryClone = $primaryMenu.clone().addClass('clone');
-    $primaryMenu.hide();
-    $primaryClone.insertBefore($utilityMenu);
-  },
-  exit: function(){
-    $navWrapper.removeClass('is-visible').removeAttr('style');
-    $menuTrigger.removeClass('is-active');
-    $iconMenuButton.removeClass('open');
-    $primaryClone.remove();
+  jRes.addFunc({
+    breakpoint: 'nav',
+    enter: function() {
+      $primaryClone = $primaryMenu.clone().addClass('clone');
+      $primaryMenu.hide();
+      $primaryClone.insertBefore($utilityMenu);
+    },
+    exit: function(){
+      $navWrapper.removeClass('is-visible').removeAttr('style');
+      $menuTrigger.removeClass('is-active');
+      $iconMenuButton.removeClass('open');
+      $primaryClone.remove();
 
-    if (!$primaryMenu.is(':visible')) {
-      $primaryMenu.show();
+      if (!$primaryMenu.is(':visible')) {
+        $primaryMenu.show();
+      }
     }
-  }
+  });
+  toggleNavWrapper();
 });
 
-toggleNavWrapper();
+

data/app/assets/stylesheets/first-night-stylesheets/contexts/_first-night.scss

@@ -381,16 +381,17 @@
       width: 3.25%;
     }
     .instagram-post {
-      background: url(image-path('/fn-instagram-bg.svg')) no-repeat $link-color;
+      background: url(image-path('fn-instagram-bg.svg')) no-repeat $link-color;
       background-position: 90% 93%;
       background-size: 35px auto;
     }
     .twitter-post {
-      background: url(image-path('/fn-twitter-bg.svg')) no-repeat $homepage-featured-background;
+      background: url(image-path('fn-twitter-bg.svg')) no-repeat $homepage-featured-background;
       background-position: 90% 85%;
       background-size: 38px 31px;
     }
     .post-text {
+      overflow: hidden;
       padding: 1.5em;
       .user-account, time {
         max-width: 85%;

data/app/controllers/festivity_events_controller.rb

@@ -3,10 +3,11 @@ class FestivityEventsController < ApplicationController
   no_login_required
   trusty_layout 'base'
 
-  caches_action :index, cache_path: proc { |c| c.params.except(:_).merge(format: request.xhr?).merge(domain: current_site.base_domain)}
+  caches_action :index, cache_path: proc { |c| c.params.except(:_).merge(format: request.xhr?).merge(base_domain: current_site.base_domain)}
   caches_action :show
 
   def index
+
     order_by = params[:sort] ? params[:sort] : "start_date"
     @title = "#{current_site.festivity_festival_name}: Events"
     @filter_type = current_site.festivity_filter_type

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

@@ -1,5 +1,5 @@
 %section.events-group
-  - cache(@events) do
+  - cache(@events, base_domain: current_site.base_domain) do
     - @events.each do |event|
-      - cache(event) do
+      - cache(event, base_domain: current_site.base_domain) do
         = render partial: 'event', locals: {event: event, show_dates: true}

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

@@ -12,7 +12,7 @@
       .toggler-content.filters-list{aria: {hidden: "true"}}
         %ul.date-filters
           - current_site.festival_datetimes.each do |datetime|
-            - checked = @selected_dates.any? {|selected_date| selected_date == datetime}
+            - checked = selected_dates.any? {|selected_date| selected_date == datetime}
             %li
               %label{for: datetime.to_s}
                 %input.input-checkbox{type: "checkbox", id: datetime.to_s, value: datetime.to_s, checked: checked,  data: {filter: "Date", sort: datetime.to_s}}
@@ -32,7 +32,7 @@
         .toggler-content.filters-list{aria: {hidden: "true"}}
           %ul.category-filters
             - type.parent_categories.each do |parent|
-              - checked = @selected_categories.include? parent.id.to_s
+              - checked = selected_categories.include? parent.id.to_s
               %li
                 %label{for: parent.id}
                   %input.input-checkbox{type: "checkbox", id: parent.id, value: parent.id, data: {filter: type.name, sort: parent.name.downcase}, checked: checked}
@@ -41,8 +41,10 @@
                 - if parent.children.any?
                   %ul
                     - parent.children.each do |child|
-                      - checked = @selected_categories.include? child.id.to_s
+                      - checked = selected_categories.include? child.id.to_s
                       %li
                         %label{for: child.id}
                           %input.input-checkbox{type: "checkbox", id: child.id, value: child.id, data: {filter: type.name, sort: child.name.downcase}, checked: checked}
-                          = child.name
+                          = child.name
+    %a.cancel-filters Cancel
+    %a.submit-filters Filter

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

@@ -1,7 +1,7 @@
 %input#events-url{type: "hidden", value: "#{events_url}"}
 .content-wrapper
   %aside.secondary-content
-    = render partial: 'filters'
+    = render partial: 'filters', locals: {selected_dates: @selected_dates, selected_categories: @selected_categories}
 
   %section.primary-content
     %a.button.show-filters-trigger{href: '#'} Show Filters

data/app/views/festivity_location_areas/show.html.haml

@@ -1,29 +1,27 @@
 - cache(@area) do
-  .container
-    .row
-      .landing-page-header.col-xs-12.location-landing-page-header{style: "background-image: url('#{@area.image}')"}
-        %h1.landing-page-header__title
-          = @area.title
-
-    .row
-      .col-xs-12.col-md-12
-        %h2.landing-page-intro
-          = @area.body
-
+  %header.page-header
+    %h1.page-title
+      = @area.title
+  .content-wrapper
+    %section.primary-content
+      .event-media
+        %img{src: @area.image, alt: "Lead Image"}
+      .event-body
+        = @area.body
+    %section.related-events
       - @area.children.each do |location|
+        %article.event
+          - if location.image
+            .event-media
+              = image_tag location.image
 
-        .col-xs-12.col-md-4.landing-page-plug
-          .map-thumb
-            %a{href:location_path(location.slug)}
-              %img{src: location.image, alt: location.title}
-          %h3.strong
-            %a{href:location_path(location.slug)}
-              = location.title
-          %p
-            = location.festivity_address
-            %br
-            = "#{location.festivity_city}, #{location.festivity_state} #{location.festivity_zip}"
-          %p
-            = location.short_description
-          %a.btn.btn-default{href: location_path(location.slug) }
-            Events and Directions
+          .event-body
+            %h3.event-title
+              = link_to location_path(location.slug) do
+                = location.title
+            %h4.event-subtitle
+              = location.festivity_address
+              %br
+              = "#{location.festivity_city}, #{location.festivity_state} #{location.festivity_zip}"
+            %h4.event-subtitle
+              = link_to  "Events and Directions", location_path(location.slug), class: 'btn btn-default', target: '_blank'

data/app/views/festivity_locations/show.html.haml

@@ -1,66 +1,27 @@
-- cache(@location) do
-  .container
-    .row
-      .col-xs-12.location-landing-page-header{style: "background-image: url('#{@location.image}')"}
-        %h1
-          = @location.title
-        %p
-          =link_to area_path(id: @location.parent.slug) do
-            = @location.parent.title
+- cache(@location, base_domain: current_site.base_domain) do
+  %header.page-header
+    %h1.page-title
+      = @location.title
+    %h3.page-subtitle
+      =link_to area_path(id: @location.parent.slug) do
+        = @location.parent.title
+  .content-wrapper
+    %section.primary-content
+      %h4.tertiary-title
+        = @location.festivity_address
+        %br
+        = "#{@location.festivity_city}, #{@location.festivity_state} #{@location.festivity_zip}"
+      - unless @location.festivity_directions_url.blank?
         %p
-          = @location.festivity_address
-          %br
-          = "#{@location.festivity_city}, #{@location.festivity_state} #{@location.festivity_zip}"
-        - unless @location.festivity_directions_url.blank?
           = link_to  "Directions", "#{@location.festivity_directions_url}", class: 'btn btn-default', target: '_blank'
-      .col-xs-12
-      %h2
-        Events at
-        = @location.title
-    .event-list
-      - cache(@location_events) do
-        - @location_events.events.each do |event|
-          .row.event-list-item{data:{genre: event.categories.first.name.to_slug, date: event.performances.first.start_date, location: @location.slug}, class: event.title.to_slug}
-            %hr
-            .event-list-item__photo.col-xs-12.col-md-2
-              .photo
-                = link_to event_path(event.id) do
-                  %img.img-responsive{ src: "#{event.image}"}
-                - if event.featured_item
-                  .event_list-item__photo-featured-item
-                    Featured Event!
-            .event-list-item__info.col-xs-12.col-md-8
-              = link_to event_path(event.id) do
-                %h2
-                  = event.title
-              %h3
-                %span.strong
-                  = event.title
-                %span.light
-                  = event.header
-              - if event.performances.count > 1
-                %p
-                  Multiple dates and times 
-                  %button.btn.btn-sm.btn-default.btn-popover{type: "button", data: {content: date_time_popover(event.performances), html: "true",  placement:"top", toggle: "popover"}, title:"All Dates and Times"}
-                    Show all
-              - else
-                - event.performances.each do |perf|
-                  %p
-                    = perf.start_date.strftime("%A, %B %d")
-                    = ", "
-                    = perf.start_date.strftime("%I:%M%p").downcase
-                    = " - "
-                    = perf.end_date.strftime('%I:%M%p').downcase
-              -#- for c in e.event_categories do
-                p
-                  a.strong(href="#")= c
-              .more-dates.hidden
-                ul
-            / - e.event_dates_and_times.each do |date,index|
-            /   li = "#{date.date}, #{date.time}"
-            .event-list-item__button-group.col-xs-12.col-md-2
-              %p
-                = link_to  "Details", event_path(event.id), class: 'btn btn-default'
-              - unless event.buy_url.blank?
-                %p
-                  =link_to  "Tickets", "#{event.buy_url}", class: 'btn btn-default', target: '_blank'
+      .event-media
+        %img{src: @location.image, alt: "Lead Image"}
+
+    - if @location_events.events.any?
+      %section.related-events
+        %h3
+          Events at
+          = @location.title
+        - cache(@location_events.events, base_domain: current_site.base_domain) do
+          - @location_events.events.each do |event|
+            = render partial: 'festivity_events/event', locals: {event: event}

data/app/views/social/_instagram_posts.html.haml

@@ -1,4 +1,19 @@
-.social-posts
-  - posts.each do |post|
-    "BUTTS"
-    = post.text
+%section.social-feed
+  .section-wrapper
+    %h3.section-title
+      Photo Album
+      %a
+        FirstNightPGH
+    .social-posts
+      .grid-sizer
+      - posts.each do |post|
+        %article.instagram-post
+          = link_to post.url do
+            = image_tag post.standard_res_image_url, class: "insta-image", alt: "Lead Image"
+          .post-text
+            %p.post
+              = post.text
+            %span.user-account
+              = "@#{post.user_username}"
+            %time
+              = time_ago_in_words(post.created_time)

data/festivity_extension.rb

@@ -22,6 +22,7 @@ class FestivityExtension < TrustyCms::Extension
     SitesHelper.send :include, Festivity::Extensions::PagesHelperExtensions
     Page.send :include, Tags::NavigationTags
     Page.send :include, Tags::HeaderTags
+    Page.send :include, Tags::FilterAndMenuTags
     Page.send :include, Tags::SocialFeedTags
   end
 

data/lib/tags/filter_and_menu_tags.rb

@@ -0,0 +1,16 @@
+module Tags::FilterAndMenuTags
+  include TrustyCms::Taggable
+
+  desc "Meta Tags"
+  tag "festivity_mobile_menus" do |tag|
+    if request.env["action_controller.instance"].class == FestivityEventsController && request.env["action_controller.instance"].action_name == "index"
+      selected_dates = request.env["action_controller.instance"].params["dates"] ? FestivityDatetimeFilterPresenter.parse(request.env["action_controller.instance"].params["dates"].split(","), Page.current_site.festivity_filter_type) : []
+      selected_categories = request.env["action_controller.instance"].params["categories"] ? request.env["action_controller.instance"].params["categories"].split(",") : []
+      request.env["action_controller.instance"].render_to_string :partial => "festivity_events/filters",
+                                                               :locals => {:selected_dates => selected_dates,
+                                                                           :selected_categories => selected_categories}
+    end
+
+
+  end
+end

data/lib/tags/social_feed_tags.rb

@@ -6,8 +6,9 @@ module Tags::SocialFeedTags
         *Usage:*
 <pre><code><r:instagram_posts tag="culturaltrust">/code></pre>}
   tag "instagram_posts" do |tag|
-
-    posts = InstagramFeedService.new.get_feed_for_tag(tag.attr['tag'])
+    posts = Rails.cache.fetch("instagram_posts/#{tag.attr['tag']}", expires_in: 5.minutes) do
+      InstagramFeedService.new.get_feed_for_tag(tag.attr['tag'])
+    end
     request.env["action_controller.instance"].render_to_string :partial => "social/instagram_posts",
                                                                :locals => {:posts => posts}
 

data/lib/trusty-festivity-extension.rb

@@ -1,5 +1,5 @@
 module TrustyFestivityExtension
-  VERSION     = "2.3.10"
+  VERSION     = "2.3.11g"
   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.3.10
+  version: 2.3.11g
 platform: ruby
 authors:
 - Eric Sipple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms
@@ -616,6 +616,7 @@ files:
 - app/views/festivity_location_areas/show.html.haml
 - app/views/festivity_locations/show.html.haml
 - app/views/header/_meta_tags.html.haml
+- app/views/navigation/_mobile_menus.html.haml
 - app/views/navigation/_subnav_one_column.html.haml
 - app/views/navigation/_subnav_three_column.html.haml
 - app/views/navigation/_three_column_item.html.haml
@@ -658,6 +659,7 @@ files:
 - lib/festivity/extensions/paperclipped_extensions.rb
 - lib/festivity/extensions/site_extensions.rb
 - lib/festivity/mixins/not_found.rb
+- lib/tags/filter_and_menu_tags.rb
 - lib/tags/header_tags.rb
 - lib/tags/navigation_tags.rb
 - lib/tags/social_feed_tags.rb
@@ -4821,9 +4823,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8