trusty-festivity-extension 2.3.28 → 2.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef40788fed9c3455b1d80ce79307b16feaf27795
-  data.tar.gz: 83854bbfa184a08bcec5905a422214682c06a4ab
+  metadata.gz: 15ed102f0aff037437686e7da24c8297865e06cc
+  data.tar.gz: 1c8d324e8bc6b08cc8756630993aa3d44c98aad0
 SHA512:
-  metadata.gz: ba1e1b25beb100219a6a3889fdd9316b62a8a67368504d3fdb8bea5f36a91dc6687d46d415c7eda1f3794cb515952292af9aa0467731d115543e6ae989985257
-  data.tar.gz: 4f2782b0fea71af40b43dfeab93cb271a7c934acae7af308d0753b6cdb9916be91a37652fc9c4e161060ad802f6d94cf48b5b0b41e19ae3f5486639e78e0bbcb
+  metadata.gz: 76cfb14062d0f83e433faaf9e25d5162b0d73cd2e35f7f20b5c295323d53a2d0f095897d02f22b905f0a163aaf5804729ae5ea601e9c09e89746d3b62a87a460
+  data.tar.gz: b5b4e266862e21d06887ec66fcfaee6f6682e23987d30ebbaa3400682c05d7dcb2912b4f65155c55019791104eea1164d24b1a7442ec4170f99626e2167f4cc0

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     geminabox (0.12.4)
       builder
@@ -10,7 +10,7 @@ GEM
       httpclient (>= 2.2.7)
       nesty
       sinatra (>= 1.2.7)
-    httpclient (2.6.0.1)
+    httpclient (2.7.0.1)
     multipart-post (2.0.0)
     nesty (1.0.2)
     rack (1.6.4)
@@ -31,3 +31,6 @@ PLATFORMS
 DEPENDENCIES
   geminabox
   trustygems (~> 0.1.0)
+
+BUNDLED WITH
+   1.10.6

data/app/assets/javascripts/festivity_app.js

@@ -17,5 +17,6 @@
 //= require responders
 //= require navigation
 //= require home-social
+//= require modal
 
 //= require modernizr/modernizr

data/app/assets/javascripts/modal.js

@@ -0,0 +1,17 @@
+$(document).ready(function(){
+  function showModal() {
+    $('.modal-link').on("click", function(e) {
+      $(this).next('.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/first-night.scss

@@ -9,6 +9,7 @@
 @import "library/general-mixins";
 @import "first-night-stylesheets/library/general-mixins";
 @import "library/icons";
+@import "library/modal";
 @import "first-night-stylesheets/library/icons";
 
 @import "globals/forms.scss";

data/app/assets/stylesheets/grunticon/close.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#888888" d="M8,1.219c3.738,0,6.781,3.043,6.781,6.782c0,3.738-3.043,6.78-6.781,6.78c-3.739,0-6.781-3.042-6.781-6.78
+	C1.219,4.262,4.261,1.219,8,1.219 M8,0C3.582,0,0,3.582,0,8.001C0,12.418,3.582,16,8,16s8-3.582,8-7.999C16,3.582,12.418,0,8,0L8,0z
+	"/>
+<polygon fill="#888888" points="11.907,5.814 10.185,4.091 8,6.276 5.815,4.091 4.092,5.814 6.277,7.999 4.092,10.185 5.815,11.907
+	8,9.723 10.185,11.907 11.907,10.185 9.723,7.999 "/>
+</svg>

data/app/assets/stylesheets/grunticon/production/icons.data.png.css

@@ -6,6 +6,9 @@
 
 .icon-chevron-up { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAANhJREFUKJHVzzFqw0AQBdC/M3LjOimCSRUMyQG2SxEfIu5VSIuONOgWyQFUGJJqT2ACgditwbXYmVSCRazKFPnlzrz5LPD/U9f1bdu2N0tzKj12XXfPzJ+q+hFC2JR2XAmN4zgQ0QMAqOqRmXcicl6EczSlhN0SUtUzABDRpoRpoelkZi/MvMsObFNKw/Rn1zTNnZkd5qjv+y8ACCFsU0pD3lxV1TM551YA1gBgZj85AgAROebNANZmtuIY49V7/2ZmjwBeczQlxnjx3r8DeCKivYh8z3f+Pr/LNIAe3l5aQgAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
 
+.icon-close { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAjRJREFUOI19U0FLVGEUPecOOL5/IAWJm1qGbUTDzYA4RVOu27WoNoKawfc+XchsvvdmMRi5aLB9655EIKm0CCNwE+0sRHDVD8hmBubeFr4nL7Hu6uNyzuHcc+9HXKgkScbN7CmAmoiM5u1jAHtm1vHefy3jWTza7XbU7/c3SD4ys/cAMhH5DgBmdh3AHIC6qr7u9XqLzWazey6Qk7fNbKRSqTx0zh1cdAYAIYQJEXljZifdbrfebDa7AgD9fn/DzEbM7Pa/yACwsrLyZTAYTAG4FkXROgAwSZJxkgckJ5xzB2bGNE1fktyK4/gDAKRpOgvgjnNuiaSFECZF5JOZ3WIIoUPyqve+kYe4QXJeVX+LyANVpYhkAIYBrMdx/CwX3TazHwKgBiArOc1ycqSqWYl8amZb5+mTGcmaiMhokTYAeO93SN4DcCoiEYBhVf1F8q73/mOBU9VDVR2Ty8IysyFVrZRaYmZDl2EFwHG+52JVdQBvRaQK4LQ8TpqmMyXuDQBHAmAPZ0dypihSL8hm1qhUKo1CBMBsKYM5krtiZh0A9RDCBAA455bM7IWZNbz3e865XZL3AbTjOH4OAK1WazoPf5O57Y6IzAwGg6nV1dWfl81aVKvVuqKq+yTfxXE8LwDQ6/UWzexERD6HECb/Q55W1X0AR1EULQOlz7S2tjZcrVZfiMhjADskM1U9LAIjOZfbfhVF0fLCwkLvL4GikiS5CeAJyZqqjuXtI5K7ADa999/K+D9wSRQuxMpuuAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
+
+
 .icon-email-connect { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAPBJREFUKJGNz7FKxEAQBuB/JtsZ4gOocHhinSKBxEew8QXOt/AF7BXf4R4mCZsUwUo0ooitZSwCO2NzWc5jldtml+Gb/WfIWnuhqmtmXuKfIyIDM694HwwAzHwGYG12sPvDR5v73Hjp3ElRFJ8hXdf1whjzBgC8FXkZwqpKURRdebfVMFhr76qqOpprTdMcd133QESPc43atlUAyPOc+r4/mKbphoi+Np8dEtF9lmXfs/M7AECapiOAW2vtqXNOyrJ83x3RJ6jqchzHj9AeSZIsROTlVwIRvcZxHPIQEf9mERmCKtz4xMy8AvC8DwZw/QOEl2KLMl8IHQAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
 
 .icon-envelope-square { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAkBJREFUSInVls+LEnEYxp/3O2N5MJpjwrJ06KJX6VZBUP/AwhRsHcKZfQUPQQt12hILgi26BKvDoJQkRXgMOnfcWthICoIg2ENSXfRgKsw43y4K4rjqrIywn+PLy/OZZ34DS4bGB7quK8lk0jefl3w+784UptPpU6qqPvA876YQ4sxRZQDged5vInoViUQeFgqFtk+YzWZjrut+AJBaRDSBvU6nc7larf4bHQrXde+HIAOA89FodGt8KACshyAb4ssWAFbCsgkhVicJl4o6PpBSbrZaree1Wq0fJEjXdUXTtDtE9HTanq9hNBotBJUBQK1W68disZ1Zez5hr9e7FlQ2pN1u3wgslFI+YebrAV1kmuYtItqetei7hqqqXnVd9y0zr/X7/dvlcvnPtADTNFeEEEUp5VkhxBXP8/an7fsaWpb11XGcFIAfiqJ8yWQyBia8cwEQM7MQYh/Ax1arlbIs6/P0fhMaAkClUukB2DJN840QosTM64qibBSLxZ8AYBjGOSKyAZwEcMm27e+zRIc2HKVUKn1rNpsXpJTvHcf5xMwvmPklEe0S0bt4PH4xiAw4pOEog0fkmWEYVSnlGhFJVVXvWZb1N4hobuGQwc1TPIpkFN8pzeVycx/EOLqunwgsbDQam8wcCSpj5oimaXdn7fnaDB7ebWYO6gTR7D+TpX8thOd5v0LMP/AJiagaotCXLbrd7iMAeyHIdgE8Hh8q9XrdSSQSrxVFEVLKVSI6vaDoAMAOgA3btjsLZh1D/gNzacIItl+lvAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }

data/app/assets/stylesheets/grunticon/production/icons.data.svg.css

@@ -6,6 +6,8 @@
 
 .icon-chevron-up { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2214%22%20height%3D%2214%22%20viewBox%3D%220%200%2014%2014%22%3E%3Cpath%20fill%3D%22%23666%22%20d%3D%22M13.148%2010.398l-1.297%201.29q-.146.147-.35.147t-.352-.148L7%207.54l-4.15%204.147q-.147.148-.35.148t-.353-.148L.85%2010.397q-.148-.147-.148-.354t.148-.355l5.797-5.79Q6.795%203.75%207%203.75t.35.15l5.797%205.79q.148.147.148.354t-.148.355z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
 
+.icon-close { background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11.dtd%22%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2216px%22%20height%3D%2216px%22%20viewBox%3D%220%200%2016%2016%22%20enable-background%3D%22new%200%200%2016%2016%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23888888%22%20d%3D%22M8%2C1.219c3.738%2C0%2C6.781%2C3.043%2C6.781%2C6.782c0%2C3.738-3.043%2C6.78-6.781%2C6.78c-3.739%2C0-6.781-3.042-6.781-6.78%20C1.219%2C4.262%2C4.261%2C1.219%2C8%2C1.219%20M8%2C0C3.582%2C0%2C0%2C3.582%2C0%2C8.001C0%2C12.418%2C3.582%2C16%2C8%2C16s8-3.582%2C8-7.999C16%2C3.582%2C12.418%2C0%2C8%2C0L8%2C0z%20%22%2F%3E%3Cpolygon%20fill%3D%22%23888888%22%20points%3D%2211.907%2C5.814%2010.185%2C4.091%208%2C6.276%205.815%2C4.091%204.092%2C5.814%206.277%2C7.999%204.092%2C10.185%205.815%2C11.907%20%208%2C9.723%2010.185%2C11.907%2011.907%2C10.185%209.723%2C7.999%20%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
+
 .icon-envelope { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2214%22%20height%3D%2214%22%20viewBox%3D%220%200%2014%2014%22%3E%3Cpath%20fill%3D%22%23ccc%22%20d%3D%22M14%205.547v6.203q0%20.516-.367.883T12.75%2013H1.25q-.516%200-.883-.367T0%2011.75V5.547q.344.383.79.68Q3.616%208.15%204.67%208.922q.445.328.723.512t.738.375.86.19h.016q.398%200%20.86-.19t.737-.377.723-.512q1.328-.96%203.89-2.694.446-.305.782-.68zm0-2.297q0%20.617-.383%201.18t-.953.96L9.008%207.93q-.078.055-.332.238t-.422.297-.406.254-.45.21-.39.07h-.016q-.18%200-.39-.07t-.45-.21-.406-.256-.422-.297-.332-.238q-.71-.5-2.047-1.427T1.343%205.39Q.86%205.064.43%204.49T0%203.422q0-.61.323-1.016T1.25%202h11.5q.507%200%20.878.368t.37.883z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
 
 .icon-external-link { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2212%22%20height%3D%2214%22%20viewBox%3D%220%200%2012%2014%22%3E%3Cpath%20fill%3D%22%23ccc%22%20d%3D%22M10%207.25V3.5q0-.203-.148-.352T9.5%203H5.75q-.328%200-.46.305-.134.32.108.547l1.125%201.125L2.35%209.15q-.147.147-.147.35t.148.353l.8.797q.147.148.35.148t.353-.148l4.172-4.172L9.15%207.603q.14.148.35.148.095%200%20.196-.037.305-.133.305-.46zm2-4v7.5q0%20.93-.66%201.59T9.75%2013h-7.5q-.93%200-1.59-.66T0%2010.75v-7.5q0-.93.66-1.59T2.25%201h7.5q.93%200%201.59.66T12%203.25z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }

data/app/assets/stylesheets/grunticon/production/icons.fallback.css

@@ -52,3 +52,5 @@
 
 .icon-twitter { background-image: url('png/twitter.png'); background-repeat: no-repeat; }
 
+.icon-close { background-image: url('png/close.png'); background-repeat: no-repeat; }
+

data/app/assets/stylesheets/library/_icons.scss

@@ -10,7 +10,7 @@
   @include icon-base;
 }
 
-$icons: menu search instagram twitter facebook envelope external-link chevron-down chevron-up chevron-right chevron-left;
+$icons: menu search instagram twitter facebook envelope external-link chevron-down chevron-up chevron-right chevron-left close;
 
 @each $icon in $icons {
 	.icon-#{$icon} {
@@ -22,7 +22,8 @@ $icons: menu search instagram twitter facebook envelope external-link chevron-do
 .icon-facebook,
 .icon-instagram,
 .icon-external-link,
-.icon-envelope {
+.icon-envelope ,
+.icon-close {
   svg {
     width: 1.25em;
     height: 1.25em;

data/app/assets/stylesheets/library/_modal.scss

@@ -0,0 +1,77 @@
+.modal {
+  display: none;
+  background-color: $background-color;
+  height: 100%;
+  top: 0;
+  left: 0;
+  overflow-y: hidden;
+  padding: 1em;
+  position: fixed;
+  width: 100%;
+  z-index: 13;
+
+  @include breakpoint($breakpoint-m) {
+    background-color: rgba(0,0,0, 0.5);
+  }
+
+  &.is-visible {
+    display: block;
+  }
+
+  &.short-modal {
+    text-align: center;
+  }
+}
+
+.modal-wrapper {
+  margin: 0 auto;
+  background-color: $background-color;
+
+  @include breakpoint($breakpoint-m) {
+    max-width: 700px;
+    margin-top: 4em;
+  }
+}
+
+.modal-content {
+  padding: 1em;
+
+  @include breakpoint($breakpoint-m) {
+    max-width: 80%;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 2.5em 1em;
+  }
+
+}
+
+.close-btn {
+  border: none;
+  background: none;
+  position: fixed;
+  right: 1em;
+  top: 1em;
+
+  @include breakpoint($breakpoint-m) {
+    position: static;
+    float: right;
+  }
+}
+
+.close-link {
+  @include button-subtle;
+
+  @include breakpoint($breakpoint-s) {
+    margin-right: 1.5em;
+  }
+}
+
+.modal-actions {
+  @include pie-clearfix;
+  @include divider-top;
+  text-align: center;
+
+  @include breakpoint($breakpoint-m) {
+    border-top: 0 none;
+  }
+}

data/app/assets/stylesheets/main.scss

@@ -8,6 +8,7 @@
 @import "library/typographic-mixins";
 @import "library/general-mixins";
 @import "library/icons";
+@import "library/modal";
 
 @import "globals/forms.scss";
 @import "globals/general.scss";

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

@@ -20,9 +20,15 @@
 
       %ul.event-tools
         - if @event.video?
-          %li
+          %li.modal-link
             %a{href: "#", data: {toggle: "modal", target: "#video-modal"}}
-            Watch Video
+              Watch Video
+          .videos-modal.modal
+            .modal-wrapper
+              .modal-content
+                %button.close-btn
+                  %span.icon-close{:data => {'grunticon-embed' => true}}
+                = @event.video.html_safe
         - if @event.single_location?
           %li
             %a{target: "_blank", href: "#{@event.locations.first.festivity_directions_url}"}

data/lib/trusty-festivity-extension.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.3.28
+  version: 2.3.29
 platform: ruby
 authors:
 - Eric Sipple
@@ -349,6 +349,7 @@ files:
 - app/assets/javascripts/jrespond/jRespond.js
 - app/assets/javascripts/lodash.min.js
 - app/assets/javascripts/masonry/dist/masonry.pkgd.js
+- app/assets/javascripts/modal.js
 - app/assets/javascripts/navigation.js
 - app/assets/javascripts/readmore.min.js
 - app/assets/javascripts/responders.js
@@ -491,6 +492,7 @@ files:
 - app/assets/stylesheets/grunticon/chevron-left.svg
 - app/assets/stylesheets/grunticon/chevron-right.svg
 - app/assets/stylesheets/grunticon/chevron-up.svg
+- app/assets/stylesheets/grunticon/close.svg
 - app/assets/stylesheets/grunticon/envelope.svg
 - app/assets/stylesheets/grunticon/external-link.svg
 - app/assets/stylesheets/grunticon/facebook.svg
@@ -504,6 +506,7 @@ files:
 - app/assets/stylesheets/grunticon/production/png/chevron-left.png
 - app/assets/stylesheets/grunticon/production/png/chevron-right.png
 - app/assets/stylesheets/grunticon/production/png/chevron-up.png
+- app/assets/stylesheets/grunticon/production/png/close.png
 - app/assets/stylesheets/grunticon/production/png/email-connect.png
 - app/assets/stylesheets/grunticon/production/png/envelope-square.png
 - app/assets/stylesheets/grunticon/production/png/envelope.png
@@ -534,6 +537,7 @@ files:
 - app/assets/stylesheets/library/_grid.scss
 - app/assets/stylesheets/library/_icons.scss
 - app/assets/stylesheets/library/_mediaqueries.scss
+- app/assets/stylesheets/library/_modal.scss
 - app/assets/stylesheets/library/_reset.scss
 - app/assets/stylesheets/library/_typographic-mixins.scss
 - app/assets/stylesheets/library/_variables.scss