trusty-festivity-extension 2.5.3 → 2.5.4

data/app/assets/stylesheets/skins/traf/contexts/_social_feed.scss

@@ -50,36 +50,40 @@ h3.section-title {
   .grid-sizer {
     width: 3.25%;
   }
-  .instagram-post {
-    background: url('fn-instagram-bg.svg') no-repeat $text-color;
-    background-position: 90% 93%;
-    background-size: 35px auto;
-    .post-text {
-      color: #fff;
-      .user-account, time {
-        color: $background-color-alt;
+  .social-posts {
+    .instagram-post {
+      background: url('fn-instagram-bg.svg') no-repeat $text-color;
+      background-position: 90% 93%;
+      background-size: 35px auto;
+      .post-text {
+        color: #fff;
+        .user-account, time {
+          color: $background-color-alt;
+        }
+      }
+    }
+    .twitter-post {
+      background: url('fn-twitter-bg.svg') no-repeat $homepage-featured-background;
+      background-position: 90% 85%;
+      background-size: 38px 31px;
+      .post-text {
+        color: $text-color;
+        .user-account, time {
+          color: #fff;
+        }
       }
     }
-  }
-  .twitter-post {
-    background: url('fn-twitter-bg.svg') no-repeat $background-color-alt;
-    background-position: 90% 85%;
-    background-size: 38px 31px;
     .post-text {
-      color: $text-color;
+      overflow: hidden;
+      padding: 1.5em;
       .user-account, time {
-        color: #fff;
+        max-width: 85%;
+      }
+      .user-account {
+        display:block;
       }
     }
   }
-  .post-text {
-    overflow: hidden;
-    padding: 1.5em;
-    .user-account, time {
-      max-width: 85%;
-    }
-    .user-account {
-      display:block;
-    }
-  }
-}
+
+}
+

data/app/assets/stylesheets/skins/traf/skin.scss

@@ -20,8 +20,9 @@ $border-color: #cbcdc6;
 
 $background-color: #fff;
 $background-color-subtle: #cbcbcb;
-$background-color-alt: #8AD4DF;
+$background-color-alt: #92D3E1;
 
+$homepage-featured-background: #92D6ED;
 $footer-color: $text-color;
 $social-footer-color: $footer-color;
 

data/app/assets/stylesheets/traf.scss

@@ -25,6 +25,7 @@
 @import "contexts/subnav_one_column";
 @import "contexts/subnav_two_column";
 @import "contexts/subnav_three_column";
+@import "contexts/social-posts";
 
 @import "modules/navigation";
 @import "modules/filters";

data/app/controllers/errors_controller.rb

@@ -1,5 +1,5 @@
 class ErrorsController < ApplicationController
-  trusty_layout 'base'
+  include Concerns::FestivityCustomPage
 
   def internal_server_error
     render(:status => 500)

data/app/controllers/festivity_events_controller.rb

@@ -1,9 +1,9 @@
 class FestivityEventsController < ApplicationController
   include Concerns::FestivityCustomPage
   include Concerns::FestivitySearchCaching
+  before_action { expires_in 1.hour, :public => true }
 
   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/controllers/festivity_location_areas_controller.rb

@@ -1,5 +1,6 @@
 class FestivityLocationAreasController < ApplicationController
   include Concerns::FestivityCustomPage
+  before_action { expires_in 1.hour, :public => true }
 
   def show
     @area = FestivityLocationAreaPage.find_by_slug_for_site(params[:id]).first

data/app/controllers/festivity_locations_controller.rb

@@ -1,5 +1,6 @@
 class FestivityLocationsController < ApplicationController
   include Concerns::FestivityCustomPage
+  before_action { expires_in 1.hour, :public => true }
 
   def show
     @location = FestivityLocationPage.find_by_slug_for_site(params[:id]).first

data/app/controllers/festivity_markets_controller.rb

@@ -1,6 +1,7 @@
 class FestivityMarketsController < ApplicationController
   include Concerns::FestivityCustomPage
   include Concerns::FestivitySearchCaching
+  before_action { expires_in 1.hour, :public => true }
 
   def index
 

data/app/controllers/search_controller.rb

@@ -1,5 +1,6 @@
 class SearchController < ApplicationController
   include Concerns::FestivityCustomPage
+  before_action { expires_in 1.hour, :public => true }
 
   def show
     query = params[:q].to_s

data/app/helpers/festivity_events_helper.rb

@@ -26,12 +26,7 @@ module FestivityEventsHelper
   end
 
   def fest_hashtag
-    if @event.site_id == 3
-      "#TRAF"
-    elsif @event.site_id == 2
-      "#PGHkids"
-    end
-
+    current_site.social_media_tag
   end
 
 end

data/app/models/festivity_event_list.rb

@@ -29,6 +29,20 @@ class FestivityEventList
     )
   end
 
+  def self.hourly
+    current_site = Page.current_site
+    festival_date_times = FestivityEventList.collect_festival_dates(current_site)
+    festival_dates = festival_date_times.map! {|date| date.to_date}
+
+    if festival_dates.include?(DateTime.now.to_date)
+      FestivityPerformance.where(start_date: DateTime.now...DateTime.now + 1.day).includes(:festivity_event_page).where(pages: {status_id: 100, site_id: Page.current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.first(3)
+    elsif festival_dates.first > DateTime.now.to_date
+      FestivityPerformance.includes(:festivity_event_page).where(pages: {status_id: 100, site_id: current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.first(3)
+    else
+      FestivityPerformance.includes(:festivity_event_page).where(pages: {status_id: 100, site_id: current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.last(3)
+    end
+  end
+
   def self.find_by_location(location_id, site)
     begin
       where_clause = parse_criteria(dates: collect_festival_dates(site).join(","), filter_type: site.festivity_filter_type)

data/app/models/festivity_market_page.rb

@@ -7,4 +7,8 @@ class FestivityMarketPage < FestivityBasePage
     FestivityLocationAreaPage.find(area_id)
   end
 
+  def self.booth_number(market_id)
+    self.find_by_id(market_id).booth_number
+  end
+
 end

data/app/models/festivity_performance.rb

@@ -18,6 +18,16 @@ class FestivityPerformance < ActiveRecord::Base
     super(FestivityLocationPage.find(location[:id])) unless location[:id].blank?
   end
 
+  def location
+    FestivityLocationPage.find_by_id(self.location_page_id).title
+  end
+
+  def area
+    location = FestivityLocationPage.find_by_id(self.location_page_id).parent_id
+    FestivityLocationAreaPage.find_by_id(location).title
+  end
+
+
   private
 
   def parse_date(date)

data/app/views/admin/sites/_festivity_site_fields.html.haml

@@ -30,5 +30,9 @@
   %label{for: "site_festivity_google_api_key"}
     Google Search API Key
   = self.text_field(:site, :festivity_google_api_key, class: "textbox festivity-control")
+%p.festivity-third
+  %label{for: "social_media_tag"}
+    "Share This" Social Media Tag
+  = self.text_field(:site, :social_media_tag, class: "textbox festivity-control")
 
 = render partial: 'admin/sites/partials/category_section'

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

@@ -0,0 +1,35 @@
+- @hourly_events = FestivityEventList.hourly
+
+%article.up-next-bg
+  .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")}"
+%article.next-events
+  - @hourly_events.each_with_index do |performance, i|
+    - if i === 0
+      .up-next-event
+        .up-next-image
+          = link_to event_path(performance.event_page_id) do
+            .lead-image
+              = image_tag(performance.festivity_event_page.image)
+        .up-next-info
+          .title
+            = performance.festivity_event_page.title
+          .time
+            = "#{performance.start_date.strftime("%l")} - #{performance.end_date.strftime("%l %P")}"
+          .locations
+            = "#{performance.location} @ #{performance.area}"
+      %h2 PLUS
+    - else
+      .up-next-events
+        .event
+          .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")}"
+  %a.button{href: 'events'} See All Events
+
+

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

@@ -61,7 +61,8 @@
       %h3.callout-title
         Dates/Times
       %ul
-        - @event.performances.each do |perf|
+        - performances = @event.performances.take(4)
+        - performances.each do |perf|
           %li
             %span.day
               = perf.start_date.strftime("%A, %B %d")
@@ -69,11 +70,31 @@
               = perf.start_date.strftime("%I:%M%p").downcase
               = "-"
               = perf.end_date.strftime("%I:%M%p").downcase
+      - if @event.performances.count > 4
+        %span.toggler-root
+          %button.toggler-trigger{aria: {expanded: "false", controls: 'multiple-dates'}}
+            Show More
+          .toggler-content.multiple-dates{aria: {hidden: "true"}}
+            %ul
+              - @event.performances.drop(4).each do |perf|
+                %li
+                  %span.day
+                    = perf.start_date.strftime("%A, %B %d")
+                  %span.time
+                    = perf.start_date.strftime("%I:%M%p").downcase
+                    = "-"
+                    = perf.end_date.strftime("%I:%M%p").downcase
     - if @event.has_social?
       .callout.connect
         %h3.callout-title
           Connect with this artist
         %ul
+          - if @event.has_instagram?
+            %li
+              = link_to @event.artist_instagram, target: "_blank" do
+                %span.icon-instagram{:data => {'grunticon-embed' => true}}
+                %span.icon-text
+                  Instagram
           - if @event.has_twitter?
             %li
               = link_to @event.artist_twitter, target: "_blank" do

data/app/views/festivity_markets/_market.html.haml

@@ -19,6 +19,8 @@
     .event-location
       = link_to area_path(id: market.area_slug) do
         = market.area_title
+      .booth-number
+        = "Booth ##{FestivityMarketPage.booth_number(market.market_id)}"
 
     - if show_dates
       .event-date

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

@@ -25,6 +25,8 @@
       .location-links
         = link_to area_path(id: @market.area) do
           = @market.area.title
+      .booth-number
+        = "Booth ##{@market.booth_number}"
 
     .callout.dates
       %h3.callout-title

data/db/content/layouts/Crawl/base.html

@@ -0,0 +1,221 @@
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
+<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
+<!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!-->
+<html class='no-js' lang='en'>
+<!--<![endif]-->
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <meta content="IE=edge" http-equiv="X-UA-Compatible"/>
+    <r:festivity_meta />
+    <meta content='width=device-width, initial-scale=1' name='viewport'>
+    <link rel="stylesheet" media="all" href="/assets/skins/crawl/skin.css">
+    <script src="/assets/festivity_app.js"></script>
+    <script>
+        (function(d) {
+            var config = {
+                        kitId: 'uqf2ehu',
+                        scriptTimeout: 3000,
+                        async: true
+                    },
+                    h=d.documentElement,t=setTimeout(function(){h.className=h.className.replace(/\bwf-loading\b/g,"")+" wf-inactive";},config.scriptTimeout),tk=d.createElement("script"),f=false,s=d.getElementsByTagName("script")[0],a;h.className+=" wf-loading";tk.src='https://use.typekit.net/'+config.kitId+'.js';tk.async=true;tk.onload=tk.onreadystatechange=function(){a=this.readyState;if(f||a&&a!="complete"&&a!="loaded")return;f=true;clearTimeout(t);try{Typekit.load(config)}catch(e){}};s.parentNode.insertBefore(tk,s)
+        })(document);
+    </script>
+
+    <script>
+        /*! grunt-grunticon Stylesheet Loader - v2.1.6 | https://github.com/filamentgroup/grunticon | (c) 2015 Scott Jehl, Filament Group, Inc. | MIT license. */
+        !function(){function e(e,n,t){"use strict";var o=window.document.createElement("link"),r=n||window.document.getElementsByTagName("script")[0],a=window.document.styleSheets;return o.rel="stylesheet",o.href=e,o.media="only x",r.parentNode.insertBefore(o,r),o.onloadcssdefined=function(e){for(var n,t=0;t<a.length;t++)a[t].href&&a[t].href===o.href&&(n=!0);n?e():setTimeout(function(){o.onloadcssdefined(e)})},o.onloadcssdefined(function(){o.media=t||"all"}),o}function n(e,n){e.onload=function(){e.onload=null,n&&n.call(e)},"isApplicationInstalled"in navigator&&"onloadcssdefined"in e&&e.onloadcssdefined(n)}!function(t){var o=function(r,a){"use strict";if(r&&3===r.length){var i=t.navigator,c=t.document,s=t.Image,d=!(!c.createElementNS||!c.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect||!c.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1")||t.opera&&-1===i.userAgent.indexOf("Chrome")||-1!==i.userAgent.indexOf("Series40")),l=new s;l.onerror=function(){o.method="png",o.href=r[2],e(r[2])},l.onload=function(){var t=1===l.width&&1===l.height,i=r[t&&d?0:t?1:2];t&&d?o.method="svg":t?o.method="datapng":o.method="png",o.href=i,n(e(i),a)},l.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",c.documentElement.className+=" grunticon"}};o.loadCSS=e,o.onloadCSS=n,t.grunticon=o}(this),function(e,n){"use strict";var t=n.document,o="grunticon:",r=function(e){if(t.attachEvent?"complete"===t.readyState:"loading"!==t.readyState)e();else{var n=!1;t.addEventListener("readystatechange",function(){n||(n=!0,e())},!1)}},a=function(e){return n.document.querySelector('link[href$="'+e+'"]')},i=function(e){var n,t,r,a,i,c,s={};if(n=e.sheet,!n)return s;t=n.cssRules?n.cssRules:n.rules;for(var d=0;d<t.length;d++)r=t[d].cssText,a=o+t[d].selectorText,i=r.split(");")[0].match(/US\-ASCII\,([^"']+)/),i&&i[1]&&(c=decodeURIComponent(i[1]),s[a]=c);return s},c=function(e){var n,r,a,i;a="data-grunticon-embed";for(var c in e){i=c.slice(o.length);try{n=t.querySelectorAll(i)}catch(s){continue}r=[];for(var d=0;d<n.length;d++)null!==n[d].getAttribute(a)&&r.push(n[d]);if(r.length)for(d=0;d<r.length;d++)r[d].innerHTML=e[c],r[d].style.backgroundImage="none",r[d].removeAttribute(a)}return r},s=function(n){"svg"===e.method&&r(function(){c(i(a(e.href))),"function"==typeof n&&n()})};e.embedIcons=c,e.getCSS=a,e.getIcons=i,e.ready=r,e.svgLoadedCallback=s,e.embedSVG=s}(grunticon,this)}();
+        grunticon(["/production/assets/grunticon/production/icons.data.svg.css","/production/assets/grunticon/production/icons.data.png.css", "/production/assets/grunticon/production/icons.fallback.css"], grunticon.svgLoadedCallback);
+    </script>
+    <noscript>
+        <link href="/assets/grunticon/production/icons.fallback.css" rel="stylesheet"></link>
+    </noscript>
+</head>
+<body class="crawl <r:festivity_body_class />">
+<div class="overflow-wrapper">
+    <div class="menu-content-wrapper">
+        <r:festivity_mobile_menus />
+        <header class="site-header">
+            <div class="container">
+                <section class="crawl-mark">
+                    <a class="crawl-logo" href="/">
+                        <h1 class="site-name visually-hidden">Three Rivers Arts Festival</h1>
+                        <r:snippet name="crawl_logo" />
+                    </a>
+                </section>
+                <div class="mobile-navigation">
+                    <button class="menu-trigger">
+                        <div class="iconmenu-button x">
+                            <span class="iconmenu"></span>
+                        </div>
+                        <span class="trigger-text">Menu</span>
+                </div>
+                <div class="nav-wrapper">
+                    <form action="/search" class="site-search">
+                        <label for="site-search"><span class="visually-hidden">Search</span></label>
+                        <input id="site-search" name="q" placeholder="Search..." type="text"></input>
+                        <button class="search-submit" type="submit">
+                            <span class="icon-search" data-grunticon-embed="true"></span>
+    <span class="visually-hidden">
+      Search
+    </span>
+                        </button>
+                    </form>
+                    <nav class="utility-navigation" role="navigation">
+                        <ul>
+                            <li>
+                                <a href="/crawl_home/about/faq">FAQ</a>
+                            </li>
+                            <li>
+                                <a href="/crawl_home/visit/map">Map</a>
+                            </li>
+                            <li>
+                                <a href="/crawl_home/contact">Contact Us</a>
+                            </li>
+                            <li>
+                                <a href="/events">Schedule</a>
+                            </li>
+                        </ul>
+
+                    </nav>
+
+                    <nav class="primary-navigation" role="navigation">
+                        <ul>
+                            <li>
+                                <a href="/events">Events</a>
+                            </li>
+                            <li>
+                                <a href="/crawl_home/visit">Plan Your Visit</a>
+                            </li>
+                            <li>
+                                <a href="/crawl_home/get-involved">Get Involved</a>
+                            </li>
+
+                            <li>
+                                <a href="/crawl_home/about">About</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+            </div>
+        </header>
+
+        <main class="main-content" role="main">
+            <div class="container">
+                <r:content_for_layout/>
+            </div>
+        </main>
+        <footer class="social-footer">
+            <div class="container">
+                <h3 class="title">Connect with us:</h3>
+                <ul class="social-link-item-group">
+                    <li class="social-link-item">
+                        <a href="https://www.instagram.com/3RiversArtsFest/">
+                            <span class="icon-instagram" data-grunticon-embed="true"></span>
+      <span class="visually-hidden">
+        Follow the Three Rivers Arts Festival on Instagram
+      </span>
+                        </a>
+                    </li>
+                    <li class="social-link-item">
+                        <a href="https://www.facebook.com/3RiversArtsFest/">
+                            <span class="icon-facebook" data-grunticon-embed="true"></span>
+      <span class="visually-hidden">
+        Follow the Three Rivers Arts Festival on Facebook
+      </span>
+                        </a>
+                    </li>
+                    <li class="social-link-item">
+                        <a href="https://twitter.com/3RiversArtsFest">
+                            <span class="icon-twitter" data-grunticon-embed="true"></span>
+      <span class="visually-hidden">
+        Follow the Three Rivers Arts Festival on Twitter
+      </span>
+                        </a>
+                    </li>
+                    <li class="social-link-item">
+                        <a href="http://clicks.skem1.com/signup/?c=vNHhx&lid=43">
+                            <span class="icon-envelope" data-grunticon-embed="true"></span>
+      <span class="visually-hidden">
+        Sign up for the Three Rivers Arts Fesitval Email Newsletter
+      </span>
+                        </a>
+                    </li>
+                </ul>
+
+            </div>
+        </footer>
+        <footer class="site-footer">
+            <div class="container">
+                <nav class="footer-navigation" role="navigation">
+                    <ul class="general">
+                        <a class="cultural-trust-logo" href="http://www.trustarts.org">
+                            <h4 class="visually-hidden">Pittsburgh Cultural Trust</h4>
+                            <r:snippet name="crawl_footer_logo" />
+                        </a>
+                        <li>
+                            <a href="http://www.trustarts.org/about">About the Trust</a>
+                        </li>
+                        <li>
+                            <a href="http://pressroom.trustarts.org/">Press Room</a>
+                        </li>
+                        <li>
+                            <a href="http://www.trustarts.org/about/privacy-policy">Privacy Policy</a>
+                        </li>
+                        <li>
+                            <a href="http://www.trustarts.org/connect/contact_us/">Contact Us</a>
+                        </li>
+
+                    </ul>
+                    <ul class="attending">
+                        <h4>Attending</h4>
+                        <li>
+                            <a href="/crawl_home/visit/parking-transportation/">Parking and Transportation</a>
+                        </li>
+                        <li>
+                            <a href="/crawl_home/visit/food-drinks/">Food</a>
+                        </li>
+                        <li>
+                            <a href="/crawl_home/visit/accessibility/">Accessibility</a>
+                        </li>
+                    </ul>
+                    <ul class="artists">
+                        <h4>Get Involved					</h4>
+                        <li>
+                            <a href="/crawl_home/get-involved/sing-off/">Sing Off</a>
+                        </li>
+                        <li>
+                            <a href="/crawl_home/get-involved/parade-workshops/">Parade Workshops</a>
+                        </li>
+                        <li>
+                            <a href="/crawl_home/get-involved/volunteer/">Volunteer</a>
+                        </li>
+                        <li>
+                            <a href="/crawl_home/about/current-supporters">Current Supporters</a>
+                        </li>
+
+                    </ul>
+                    <ul class="Blog">
+                        <h4>Blog					</h4>
+                        <li>
+                            <a href="/crawl_home/blog/new-facebook-twitter-and-instagram">NEW Facebook, Twitter and Instagram</a>
+                        </li>
+                        <li>
+                            <a href="/crawl_home/blog/admission-buttons-now-on-sale">Admission buttons now on sale</a>
+                        </li>
+                    </ul>
+                </nav>
+                <p class="copyright">
+                    Copyright &copy;2016 Pittsburgh Cultural Trust. All rights reserved.
+                </p>
+            </div>
+        </footer>
+    </div>
+</div>
+<script src="https://s3.amazonaws.com/festivity-prod/omniture/firstnight/AppMeasurement.js" type="text/javascript"></script>
+<r:omniture_vars />
+</body>
+</html>