trusty-festivity-extension 2.3.30 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 098a49fc04df7bc38d1e93865e35fc9f9d1e4896
-  data.tar.gz: 63bfdc0d8430928df930a025e94e423daad93a86
+  metadata.gz: 25cbd6ac174c98114c89ec39479ea0faa321ec3c
+  data.tar.gz: 46ffd1cb6a41bdbb55ce9479ab0b9984518f262f
 SHA512:
-  metadata.gz: 303c499f84765eeeb971adb2e8e697792d7e4c87b26dbbd0b382cf0db72d6d88a1034eb166ac9229d3e85d2899b839f0c5b46ee6a105c76af230bc9dbd5cc5ac
-  data.tar.gz: b88c4cb1c98489122c6f30ee82748c235b0f6a138bcc2a68cd48b15c3d1fbf9abd04d0db3f73591f7ffc59ccb6fdeb5ca931bae44dd9fc66c65779471ac9a0c8
+  metadata.gz: e18db3d404a06616b162a59ede39e2a1a042528d885735734f7fbdf1bf753025146b3be381ddaed90a2ac2c889b1dcb64763e151aed087336f203cee9496f65c
+  data.tar.gz: 25e9fd0d52df46944ff5f50b33a2228640f661773e607687cd1afdf96de2ec482983b5f6045aa6c0d4d6e992dea550138497dd198bbff8d697c01c233abf3564

data/app/assets/stylesheets/contexts/_location.scss

@@ -29,6 +29,7 @@
       .button {
         @include button-subtle-list;
         background-color: white;
+        margin-bottom: 1em;
       }
 
     }

data/app/assets/stylesheets/contexts/_subnav.scss

@@ -0,0 +1,53 @@
+.subnav {
+  @include divider-top;
+  @include pie-clearfix;
+  clear: both;
+
+  @include breakpoint($breakpoint-l) {
+    margin-top: 4em;
+    border-bottom: 0 none;
+    padding-bottom: 0;
+  }
+
+  .subnav-item {
+    @include divider-bottom;
+    }
+
+  .subnav-item-media {
+    margin-bottom: 1.5em;
+  }
+
+    .subnav-item-title {
+      @include heading-2;
+      margin-bottom:0.15em;
+    }
+
+    .subnav-item-tags {
+      list-style: none;
+      margin: 0;
+
+      li {
+        margin-bottom: 0.5em;
+        @include breakpoint($breakpoint-xxs) {
+          display: inline-block;
+          margin-right: 0.5em;
+          margin-bottom:0;
+        }
+
+        @include breakpoint($breakpoint-l) {
+          display: block;
+          margin-right: 0;
+        }
+
+        @include breakpoint($breakpoint-xl) {
+          display: inline-block;
+          margin-right: 1em;
+        }
+      }
+
+      a {
+        @include button-subtle-list;
+      }
+    }
+
+}

data/app/assets/stylesheets/contexts/_subnav_one_column.scss

@@ -0,0 +1,31 @@
+.subnav-one-column {
+
+  .subnav-item {
+
+    @include breakpoint($breakpoint-l) {
+      @include column(12);
+    }
+
+    .subnav-item-media {
+      @include breakpoint($breakpoint-l) {
+        @include column(3);
+        border-bottom: 0 none;
+        padding-bottom: 0;
+      }
+    }
+
+    .subnav-item-title {
+      padding-bottom: 1em;
+    }
+
+    .subnav-item-body {
+      @include breakpoint($breakpoint-l) {
+        @include column(8);
+        border-bottom: 0 none;
+        padding-bottom: 0;
+      }
+      margin-bottom: 1.5em;
+    }
+
+  }
+}

data/app/assets/stylesheets/contexts/_subnav_three_column.scss

@@ -1,51 +1,10 @@
 .subnav-three-column {
-  @include divider-top;
-  @include pie-clearfix;
-  clear: both;
-
-  @include breakpoint($breakpoint-l) {
-    margin-top: 4em;
-  }
 
   .subnav-item {
-    @include divider-bottom;
 
     @include breakpoint($breakpoint-l) {
       @include column(4);
       @include last-col3;
-      border-bottom: 0 none;
-      padding-bottom: 0;
-    }
-    .subnav-item-media {
-      margin-bottom: 1.5em;
-    }
-
-    .subnav-item-tags {
-      list-style: none;
-      margin: 0;
-
-      li {
-        margin-bottom: 0.5em;
-        @include breakpoint($breakpoint-xxs) {
-          display: inline-block;
-          margin-right: 0.5em;
-          margin-bottom:0;
-        }
-
-        @include breakpoint($breakpoint-l) {
-          display: block;
-          margin-right: 0;
-        }
-
-        @include breakpoint($breakpoint-xl) {
-          display: inline-block;
-          margin-right: 1em;
-        }
-      }
-
-      a {
-        @include button-subtle-list;
-      }
     }
 
   }

data/app/assets/stylesheets/contexts/_subnav_two_column.scss

@@ -0,0 +1,11 @@
+.subnav-two-column {
+
+  .subnav-item {
+
+    @include breakpoint($breakpoint-l) {
+      @include column(6);
+      @include last-col2;
+    }
+
+  }
+}

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

@@ -22,6 +22,9 @@
 @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";

data/app/assets/stylesheets/main.scss

@@ -20,6 +20,9 @@
 @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";

data/app/assets/stylesheets/modules/_event.scss

@@ -50,22 +50,27 @@
 }
 .event-tags {
 	li {
-		margin-bottom: 0.5em;
-		@include breakpoint($breakpoint-xxs) {
-			display: inline-block;
-			margin-right: 0.5em;
-			margin-bottom:0;
-		}
+      margin-bottom: 0.5em;
+      @include breakpoint($breakpoint-xxs) {
+        display: inline-block;
+        margin-right: 0.5em;
+        margin-bottom:0;
+      }
 
-		@include breakpoint($breakpoint-l) {
-			display: block;
-			margin-right: 0;
-		}
+      @include breakpoint($breakpoint-m) {
+        margin-top: 1em;
+      }
 
-		@include breakpoint($breakpoint-xl) {
-			display: inline-block;
-			margin-right: 1em;
-		}
+      @include breakpoint($breakpoint-l) {
+        display: block;
+        margin-right: 0;
+      }
+
+      @include breakpoint($breakpoint-xl) {
+        display: inline-block;
+        margin-right: 1em;
+        margin-top: 0;
+      }
 	}
 
 	a {

data/app/models/vanity_url_page.rb

@@ -0,0 +1,28 @@
+class VanityUrlPage < Page
+
+  def clean_target_url
+    (self.target_url.match('http://') || self.target_url.match('https://')) ? self.target_url : VanityUrlPage.clean_path(self.target_url)
+  end
+
+  class << self
+
+    def find_vanity_url_by_path(path, live = true)
+      vanity_url_page = Page.current_site.homepage.children.find_by_slug('vanity-urls')
+      vanity_pages = vanity_url_page.children.where("vanity_url like '%#{path}%'")
+      vanity_pages.each do |vanity_page|
+        return vanity_page if clean_comparison_path(path).downcase == clean_comparison_path(vanity_page.vanity_url).downcase
+      end
+      nil
+    end
+
+    def clean_comparison_path(path)
+      "#{clean_path(path)}/"
+    end
+
+    def clean_path(path)
+      "/#{path.to_s.strip}".gsub(%r{//+}, '/')
+    end
+
+  end
+
+end

data/app/views/admin/pages/_festivity_vanity_url_fields.html.haml

@@ -0,0 +1,23 @@
+- unless @page.is_a?(VanityUrlPage)
+  .fieldset#content
+    %label Page Redirect
+    %br
+    %em
+      If this page has expired and you would like all traffic redirected to a new page, please enter the new url below:
+    %br
+    = label :page, :redirect_url, "Redirect URL"
+    = text_field :page, :redirect_url, :size => 100
+    %br
+
+- if @page.is_a?(VanityUrlPage)
+  %br
+  %hr
+  .vanity_url
+    = label :page, :vanity_url, "Vanity URL"
+    = text_field :page, :vanity_url, :size => 100
+  %br
+  .target_url
+    = label :page, :target_url, "Target URL"
+    = text_field :page, :target_url, :size => 100
+  %br
+  %br

data/app/views/navigation/_subnav.html.haml

@@ -0,0 +1,3 @@
+%section{class: "subnav #{subnav_class}"}
+  - current_page.children.each_with_index do |page, index|
+    = render partial: 'navigation/subnav_item', locals: {page: page}

data/app/views/navigation/{_three_column_item.html.haml → _subnav_item.html.haml}

@@ -5,7 +5,7 @@
         = image_tag page.image, alt: page.title
 
   .subnav-item-body
-    %h3.event-title
+    %h3.subnav-item-title
       = link_to page.path do
         = page.title
 

data/db/migrate/201601231255101234_create_vanity_url_pages.rb

@@ -0,0 +1,11 @@
+class CreateVanityUrlPages < ActiveRecord::Migration
+  def self.up
+    add_column :pages, :vanity_url, :string
+    add_column :pages, :target_url, :string
+  end
+
+  def self.down
+    remove_column :pages, :vanity_url
+    remove_column :pages, :target_url
+  end
+end

data/festivity_extension.rb

@@ -14,10 +14,11 @@ class FestivityExtension < TrustyCms::Extension
     admin.page.edit.add(:form, "festivity_base_fields", :after => 'edit_page_parts')
     admin.page.edit.add(:form, "festivity_location_fields", :after => 'edit_page_parts')
     admin.site.edit.add(:form, "festivity_site_fields", :after => 'edit_homepage')
+    admin.page.edit.add(:form, "festivity_vanity_url_fields", :before => 'form_bottom')
 
     Admin::AssetsController.send :include, Festivity::Extensions::PaperclippedExtensions
     Site.send :include, Festivity::Extensions::SiteExtensions
-    Page.send :include, Festivity::Extensions::PageExtensions
+    #Page.send :include, Festivity::Extensions::PageExtensions
     Admin::PagesHelper.send :include, Festivity::Extensions::PagesHelperExtensions
     SitesHelper.send :include, Festivity::Extensions::PagesHelperExtensions
     Page.send :include, Tags::NavigationTags

data/lib/festivity/extensions/page_extensions.rb

@@ -15,6 +15,8 @@ module Festivity
           include ActsAsTree::InstanceMethods
           include Festivity::Extensions::PageExtensions::PageMethods
           include Festivity::Admin::AssetsHelper
+
+          alias_method_chain :find_by_path, :vanity_urls
         }
 
       end
@@ -47,6 +49,15 @@ module Festivity
           page_organization
         end
 
+        def find_by_path_with_vanity_urls(path, live = true, clean = true)
+          raise MissingRootPageError unless root
+          page = self.find_by_path_without_vanity_urls(path, live, clean)
+          if page.is_a?(FileNotFoundPage)
+            vanity_url = VanityUrlPage.find_vanity_url_by_path(path, live)
+          end
+          vanity_url ? vanity_url : page
+        end
+
         private
 
         def festivity_base_page?

data/lib/festivity/extensions/site_controller_extensions.rb

@@ -0,0 +1,27 @@
+module Festivity
+  module Extensions
+    module SiteControllerExtensions
+
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :process_page, :redirection
+        end
+      end
+
+
+      def process_page_with_redirection(page)
+        if page.is_a?(VanityUrlPage)
+          false if redirect_to page.clean_target_url
+
+        elsif !page.redirect_url.nil? && !page.redirect_url.empty?
+          false if redirect_to page.redirect_url
+        else
+          process_page_without_redirection(page)
+        end
+      end
+
+
+    end
+  end
+end
+

data/lib/tags/navigation_tags.rb

@@ -8,9 +8,11 @@ module Tags::NavigationTags
 <pre><r:subnav_one_column /></pre>
 }
   tag "subnav_one_column" do |tag|
-    request.env["action_controller.instance"].render_to_string :partial => "navigation/subnav_one_column",
-                                                               :locals => {:current_page => tag.locals.page,
-                                                                           :top_level_page => top_level_page(tag.locals.page)}
+    request.env["action_controller.instance"].render_to_string :partial => "navigation/subnav",
+                                                               :locals => {
+                                                                 :subnav_class => 'subnav-one-column',
+                                                                 :current_page => tag.locals.page,
+                                                                 :top_level_page => top_level_page(tag.locals.page)}
   end
 
   desc %{Two Column Subnavigation Tag
@@ -19,9 +21,11 @@ module Tags::NavigationTags
 <pre><r:subnav_two_column /></pre>
 }
   tag "subnav_two_column" do |tag|
-    request.env["action_controller.instance"].render_to_string :partial => "navigation/subnav_two_column",
-                                                               :locals => {:current_page => tag.locals.page,
-                                                                           :top_level_page => top_level_page(tag.locals.page)}
+    request.env["action_controller.instance"].render_to_string :partial => "navigation/subnav",
+                                                               :locals => {
+                                                                 :subnav_class => 'subnav-two-column',
+                                                                 :current_page => tag.locals.page,
+                                                                 :top_level_page => top_level_page(tag.locals.page)}
   end
 
   desc %{Three Column Subnavigation Tag
@@ -32,9 +36,11 @@ module Tags::NavigationTags
 }
   tag "subnav_three_column" do |tag|
 
-    request.env["action_controller.instance"].render_to_string :partial => "navigation/subnav_three_column",
-                                                               :locals => {:current_page => tag.locals.page,
-                                                                           :top_level_page => top_level_page(tag.locals.page)}
+    request.env["action_controller.instance"].render_to_string :partial => "navigation/subnav",
+                                                               :locals => {
+                                                                 :subnav_class => 'subnav-three-column',
+                                                                 :current_page => tag.locals.page,
+                                                                 :top_level_page => top_level_page(tag.locals.page)}
   end
 
 

data/lib/trusty-festivity-extension.rb

@@ -1,5 +1,5 @@
 module TrustyFestivityExtension
-  VERSION     = "2.3.30"
+  VERSION     = "2.4.0"
   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.30
+  version: 2.4.0
 platform: ruby
 authors:
 - Eric Sipple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms
@@ -477,7 +477,10 @@ files:
 - app/assets/stylesheets/contexts/_related-events.scss
 - app/assets/stylesheets/contexts/_site-footer.scss
 - app/assets/stylesheets/contexts/_site-header.scss
+- app/assets/stylesheets/contexts/_subnav.scss
+- app/assets/stylesheets/contexts/_subnav_one_column.scss
 - app/assets/stylesheets/contexts/_subnav_three_column.scss
+- app/assets/stylesheets/contexts/_subnav_two_column.scss
 - app/assets/stylesheets/events/_event-list-item.scss
 - app/assets/stylesheets/events/_event_template.scss
 - app/assets/stylesheets/events/_filter-bar.scss
@@ -586,6 +589,7 @@ files:
 - app/models/festivity_market_page.rb
 - app/models/festivity_page_category.rb
 - app/models/festivity_performance.rb
+- app/models/vanity_url_page.rb
 - app/presenters/festivity_date_presenter.rb
 - app/presenters/festivity_datetime_filter_presenter.rb
 - app/presenters/festivity_datetime_presenter.rb
@@ -598,6 +602,7 @@ files:
 - app/views/admin/pages/_festivity_featured_image_fields.html.haml
 - app/views/admin/pages/_festivity_includes.html.haml
 - app/views/admin/pages/_festivity_location_fields.html.haml
+- app/views/admin/pages/_festivity_vanity_url_fields.html.haml
 - app/views/admin/pages/partials/_categories.html.haml
 - app/views/admin/pages/partials/_category.html.haml
 - app/views/admin/pages/partials/_featured_image.html.haml
@@ -623,10 +628,8 @@ 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
+- app/views/navigation/_subnav.html.haml
+- app/views/navigation/_subnav_item.html.haml
 - app/views/search/_page.html.haml
 - app/views/search/_pagination_links.html.haml
 - app/views/search/_result_item.html.haml
@@ -658,12 +661,14 @@ files:
 - db/migrate/20150324135487799_add_indexes.rb
 - db/migrate/20151018190155_update_site_for_hourly_filters.rb
 - db/migrate/20151105155407_add_buy_ticket_text_to_site.rb
+- db/migrate/201601231255101234_create_vanity_url_pages.rb
 - festivity_extension.rb
 - lib/festivity/admin/assets_helper.rb
 - lib/festivity/engine.rb
 - lib/festivity/extensions/page_extensions.rb
 - lib/festivity/extensions/pages_helper_extensions.rb
 - lib/festivity/extensions/paperclipped_extensions.rb
+- lib/festivity/extensions/site_controller_extensions.rb
 - lib/festivity/extensions/site_extensions.rb
 - lib/festivity/mixins/not_found.rb
 - lib/tags/filter_and_menu_tags.rb

data/app/views/navigation/_subnav_one_column.html.haml

@@ -1,15 +0,0 @@
-.page-template
-  - current_page.children.each do |page|
-    .row.media-item
-      .col-xs-12.col-md-4
-        .map-thumb
-          %a{href: page.path}
-            %img{src: page.image, alt: page.title}
-        %h3.strong
-      .col-xs-12.col-md-8
-        %h3.strong
-          = page.title
-        %p
-          = page.short_description
-        %a.btn.btn-default{href: page.path}
-          Learn More

data/app/views/navigation/_subnav_three_column.html.haml

@@ -1,3 +0,0 @@
-%section.subnav-three-column
-  - current_page.children.each_with_index do |page, index|
-    = render partial: 'navigation/three_column_item', locals: {page: page}