trusty-festivity-extension 2.4.6 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f30ecb7c596c9f68d075213459d1ac56ef672862
-  data.tar.gz: eabd423568421400937021dc41efc3e724cd824c
+  metadata.gz: 0bf1679e53bf07b9e983c1a2b7513bf9c6b9a83b
+  data.tar.gz: 4d917522b54572e5a5168d14c678031fc4525b13
 SHA512:
-  metadata.gz: 4e5a6cb155bf4458e4ccb38122af57cf50212d59aa84511242f12516ba887693dcc5c0f71bb16f23c769896e44be8704b4ba329f1a1ea980594def59e64efb2c
-  data.tar.gz: ee528910a5c01720e1b8c9b0776a4a2d726d195c30b65c2bd8b3ff1e1ba3be908d2273096e52000e5511b8bf0babe4b08215e7c0ed56d2f5771b4868ef7f2002
+  metadata.gz: ad2194131c0a7bb0e2356caaa1f1409db5bf41bd34ba535aab3b743e42f3ef3ee7e827cd43a521b9706239e1d00d0304badf67c0a3114a69602fd0e947a4e301
+  data.tar.gz: ca6ba667cb67d97d5c08b6add31e14b245bcb25e258d703ed467762f8510e0d587eae3851383f9d602afbe468b52cb97cf0bd236e781e36e655e6f2b1caac252

data/app/assets/javascripts/modal.js

@@ -1,17 +1,18 @@
 $(document).ready(function(){
   function showModal() {
     $('.modal-link').on("click", function(e) {
-      $(this).next('.modal').addClass('is-visible');
+      e.preventDefault();
+      $('.modal').addClass('is-visible');
     });
-  };
+  }
 
   function hideModal() {
     $('.modal .close-btn, .modal .close-link, .modal .add-to-cart').on("click", function(e) {
       e.preventDefault();
       $('.modal').removeClass('is-visible');
-    })
+    });
   }
 
   showModal();
   hideModal();
-});
+});

data/app/assets/stylesheets/rad_social/rad_screen.scss

@@ -0,0 +1,154 @@
+.rad-icon {
+  display: inline-block;
+  .rad-facebook {
+   background-image: url('facebook.png');
+   background-repeat: no-repeat;
+   height: 25px;
+   width: 25px;
+  }
+  .rad-twitter {
+   background-image: url('twitter.png');
+   background-repeat: no-repeat;
+   height: 25px;
+   width: 25px;
+  }
+  .rad-email {
+   background-image: url('email.png');
+   background-repeat: no-repeat;
+   height: 25px;
+   width: 25px;
+  }
+  .rad-gplus {
+    visibility: hidden;
+  }
+}
+.rad-email-form {
+  position: relative;
+  padding: 15px;
+}
+
+.hidden {
+  display: none;
+}
+
+.rad-dialog-titlebar {
+  background: #EDEDED;
+  padding: .5em .3em .3em 1em;
+  height: 2em;
+}
+
+.rad-dialog-title {
+  float: left;
+  font-weight: bold;
+  margin: .3em 0 .2em;
+}
+
+#rad-social-email-form .form-row .form-fields {
+  width: 60%;
+  float: left;
+}
+
+#rad-social-email-form .form-row .input-textbox {
+  display: block;
+  font-size: 12px;
+}
+
+.rad-email-form #rad_email_submit {
+  float: right;
+}
+
+.rad-email-form .captcha-container {
+  padding: 10px 0;
+}
+
+.rad-email-form input.std_input {
+  margin-bottom: 10px;
+}
+
+.rad-email-form select {
+  margin-bottom: 10px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  font: 14px "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+  color: #6e6e6e;
+}
+
+#rad-social-email-form .form-label {
+  width: 15%;
+  float: left;
+  display: block;
+  text-align: left;
+  padding: 5px 10px 0 0;
+}
+
+#rad-social-email-form .form-row {
+  padding: 5px;
+  clear: both;
+  overflow: auto;
+}
+
+.rad-email-form input.std_input,
+.rad-email-form textarea {
+  border: 1px solid #ccc;
+  width: 97%;
+  font: 15px "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+  padding: 5px;
+  color: #6e6e6e;
+}
+
+.rad-email-form table {
+  width: 100%;
+}
+
+.rad-email-form table input.std_input {
+  width: 93%;
+}
+
+.rad-email-form table.three-col input.std_input {
+  width: 90%;
+}
+
+.rad-email-form input.form_but {
+  margin-top: 10px;
+  background-color: #93ba31;
+  border: 3px solid #afdd39;
+  color: #fff;
+  font: bold 15px "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  padding: 5px 10px;
+}
+
+input.error {
+  border: 1px solid #CD0A0A !important;
+  color: #CD0A0A !important;
+  font-family: Arial, Helvetica, sans-serif !important;
+}
+
+.rad-email-error, label.error {
+  padding: 5px 0 !important;
+  color: #CD0A0A !important;
+  font-family: Arial, Helvetica, sans-serif !important;
+  display: block;
+}
+
+#rad-confirmation {
+  font-weight: bold;
+  text-align: center;
+  padding-top: 25px;
+}
+
+body .ajax-loader {
+  background: transparent none no-repeat 50% 50%;
+  background-image: url('ajax-loader.gif');
+  height: 35px;
+}
+
+body #rad-social-email-form .primary-button {
+  background: transparent none repeat-x scroll 0 0;
+  background-image: url('bg_primary-btn.png');
+  color: white !important;
+  border: 1px solid #924900;
+}
+
+/* @end */

data/app/assets/stylesheets/{traf-stylesheets → skins/traf}/contexts/_traf.scss

@@ -214,7 +214,7 @@ button.search-submit {
 
 .internal {
   .site-header {
-    background: url('/traf-internalpage-bg.svg') no-repeat $background-color-alt;
+    background: url(traf-internalpage-bg.svg) no-repeat $background-color-alt;
     @include breakpoint($breakpoint-s) {
       background: $background-color-alt;
     }
@@ -222,7 +222,7 @@ button.search-submit {
     .container {
       @include pie-clearfix;
       @include breakpoint($breakpoint-s) {
-        background: url('/traf-internalpage-bg.svg') no-repeat $background-color-alt;
+        background: url(traf-internalpage-bg.svg) no-repeat $background-color-alt;
       }
     }
   }

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

@@ -0,0 +1,36 @@
+$text-color: #00525b; //dark green
+//$heading-color: #404242;
+$heading-color: $text-color;
+$text-color-subtle: tint($text-color, 30%);
+$text-highlight-color: #fdcb36;//yellow
+
+$link-color: #f06a33; //orange
+$link-color-hover: darken($link-color, 15%);
+
+$highlight-color: #d7df23; //light green
+$highlight-color-hover: shade($highlight-color, 10%);
+
+$link-color-reverse: #08B7BF; //light Blue
+$link-color-reverse-hover: lighten($link-color-reverse, 10%);
+$link-color-reverse-alt: $text-color;
+
+$heading-highlight-color: #00afaa; //turquoise
+
+$border-color: #cbcdc6;
+
+$background-color: #fff;
+$background-color-subtle: #cbcbcb;
+$background-color-alt: #92d5e1;
+
+$footer-color: $text-color;
+$social-footer-color: $footer-color;
+
+$search-placeholder-color: $link-color;
+
+// icon color variations - overrides original value with this theme's contextual value
+
+$icon-primary-color: #D7DF23;
+$icon-secondary-color: #F06A33;
+$icon-search-color: $highlight-color;
+
+@import "../../traf"

data/app/assets/stylesheets/traf.scss

@@ -1,15 +1,15 @@
 // from bower_components
-@import "breakpoint-sass/stylesheets/breakpoint";
+@import "breakpoint";
 
 @import "library/reset";
 @import "library/grid";
-@import "traf-stylesheets/library/variables";
 @import "library/mediaqueries";
 @import "library/typographic-mixins";
 @import "library/general-mixins";
-@import "traf-stylesheets/library/general-mixins";
+@import "skins/traf/library/general-mixins";
 @import "library/icons";
-@import "traf-stylesheets/library/icons";
+@import "skins/traf/library/icons";
+@import "library/modal";
 
 @import "globals/forms.scss";
 @import "globals/general.scss";
@@ -18,8 +18,13 @@
 @import "contexts/site-footer";
 @import "contexts/events-list";
 @import "contexts/event-detail";
+@import "contexts/location";
 @import "contexts/related-events";
 @import "contexts/callouts";
+@import "contexts/subnav";
+@import "contexts/subnav_one_column";
+@import "contexts/subnav_two_column";
+@import "contexts/subnav_three_column";
 
 @import "modules/navigation";
 @import "modules/filters";
@@ -28,4 +33,4 @@
 @import "modules/callout";
 
 ///// This is an override file for the TRAF theme
-@import "traf-stylesheets/contexts/traf";
+@import "skins/traf/contexts/traf";

data/app/controllers/concerns/festivity_custom_page.rb

@@ -0,0 +1,12 @@
+module Concerns
+  module FestivityCustomPage
+
+    extend ActiveSupport::Concern
+
+    included do
+      include Festivity::Mixins::NotFound
+      no_login_required
+      trusty_layout 'base'
+    end
+  end
+end

data/app/controllers/concerns/festivity_search_caching.rb

@@ -0,0 +1,11 @@
+module Concerns
+  module FestivitySearchCaching
+
+    extend ActiveSupport::Concern
+
+    included do
+      caches_action :index, cache_path: proc { |c| c.params.except(:_).merge(format: request.xhr?, base_domain: "#{request.subdomain}.#{request.domain}")}
+      caches_action :show
+    end
+  end
+end

data/app/controllers/concerns/festivity_sql_builder.rb

@@ -0,0 +1,25 @@
+module Concerns
+  module FestivitySqlBuilder
+
+    extend ActiveSupport::Concern
+
+    included do
+
+      def self.advance_by(filter_type)
+        advance_by_hash = {minutes: 59}
+        advance_by_hash[:hours] = 23 if filter_type == "date"
+        advance_by_hash
+      end
+
+      def self.parse_categories(category_ids)
+        grouped_ids = FestivityCategory.find(category_ids).group_by {|category| category.festivity_category_type}
+        category_clauses = grouped_ids.map do |categories|
+          "page_id IN (SELECT page_id FROM festivity_page_categories WHERE festivity_category_id IN (#{categories[1].map {|category| category.id}.join(",")}))"
+        end
+        "(#{category_clauses.join(" AND ")})"
+
+      end
+
+    end
+  end
+end

data/app/controllers/festivity_events_controller.rb

@@ -1,10 +1,6 @@
 class FestivityEventsController < ApplicationController
-  include Festivity::Mixins::NotFound
-  no_login_required
-  trusty_layout 'base'
-
-  caches_action :index, cache_path: proc { |c| c.params.except(:_).merge(format: request.xhr?, base_domain: "#{request.subdomain}.#{request.domain}")}
-  caches_action :show
+  include Concerns::FestivityCustomPage
+  include Concerns::FestivitySearchCaching
 
   def index
 
@@ -49,26 +45,16 @@ class FestivityEventsController < ApplicationController
   private
 
   def cache_key
-    "#{params[:categories.to_s]}-#{params[:dates].to_s}-#{params[:sort].to_s}-#{request.xhr?}-#{request.subdomain}.#{request.domain}"
+    "events-#{params[:categories.to_s]}-#{params[:dates].to_s}-#{params[:sort].to_s}-#{request.xhr?}-#{request.subdomain}.#{request.domain}"
   end
 
   def search_dates
     if params[:dates]
       params[:dates].split(",")
     else
-      collect_festival_dates
-    end
-
-  end
-
-  def collect_festival_dates
-    festival_dates = current_site.festival_datetimes
-    if current_site.date_during_festival?(Time.now)
-      festival_dates = festival_dates.select{ |date| date.datetime == Time.now }
+      FestivityEventList.collect_festival_dates(current_site)
     end
 
-    festival_dates.map{ |date| date.to_s }
-
   end
 
 

data/app/controllers/festivity_location_areas_controller.rb

@@ -1,7 +1,5 @@
 class FestivityLocationAreasController < ApplicationController
-  include Festivity::Mixins::NotFound
-  no_login_required
-  trusty_layout "normal"
+  include Concerns::FestivityCustomPage
 
   def show
     @area = FestivityLocationAreaPage.find_by_slug_for_site(params[:id]).first

data/app/controllers/festivity_locations_controller.rb

@@ -1,13 +1,11 @@
 class FestivityLocationsController < ApplicationController
-  include Festivity::Mixins::NotFound
-  no_login_required
-  trusty_layout "base"
+  include Concerns::FestivityCustomPage
 
   def show
     @location = FestivityLocationPage.find_by_slug_for_site(params[:id]).first
     if @location
       @location_events = @title = Rails.cache.fetch("location-#{@location.slug}", expires_in: 2.hours) do
-        FestivityEventList.find_by_location(@location.id)
+        FestivityEventList.find_by_location(@location.id, current_site)
       end
       @title = "#{current_site.festivity_festival_name}: #{@location.title}"
     else

data/app/controllers/festivity_markets_controller.rb

@@ -0,0 +1,67 @@
+class FestivityMarketsController < ApplicationController
+  include Concerns::FestivityCustomPage
+  include Concerns::FestivitySearchCaching
+
+  def index
+
+    order_by = params[:sort] ? params[:sort] : "start_date"
+    @title = "#{current_site.festivity_festival_name}: Artist's Market"
+    @filter_type = current_site.festivity_filter_type
+    @markets =  Rails.cache.fetch("#{cache_key}", expires_in: 2.hours) do
+      FestivityMarketList.search(
+        {dates: search_dates.join(","),
+         categories: params[:categories],
+         filter_type: current_site.festivity_filter_type}, order_by
+      ).markets
+    end
+
+
+    @selected_dates = params[:dates] ? FestivityDatetimeFilterPresenter.parse(params[:dates].split(","), current_site.festivity_filter_type) : []
+    @selected_categories = params[:categories] ? params[:categories].split(",") : []
+    @selected_sort = order_by
+    # If the request is AJAX, only return the market list itself, not the full page
+    if request.xhr?
+      render partial: "market_list"
+    else
+      render 'index'
+    end
+
+  end
+
+  def show
+    @market = FestivityMarketPage.find_by_slug_and_status_id(params[:id], Status[:published].id)
+    if @market
+      @page = @market
+      @title = "#{current_site.festivity_festival_name}: #{@market.title}"
+    else
+      file_not_found_for_site
+    end
+
+  end
+
+  private
+
+  def cache_key
+    "markets-#{params[:categories.to_s]}-#{params[:dates].to_s}-#{params[:sort].to_s}-#{request.xhr?}-#{request.subdomain}.#{request.domain}"
+  end
+
+  def search_dates
+    if params[:dates]
+      params[:dates].split(",")
+    else
+      collect_festival_dates
+    end
+
+  end
+
+  def collect_festival_dates
+    festival_dates = current_site.festival_datetimes
+    if current_site.date_during_festival?(Time.now)
+      festival_dates = festival_dates.select{ |date| date.datetime == Time.now }
+    end
+
+    festival_dates.map{ |date| date.to_s }
+
+  end
+
+end