trusty-festivity-extension 2.4.6 → 2.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/{traf-internalpage-bg-pattern.svg → skins/traf/traf-internalpage-bg-pattern.svg} +0 -0
  3. data/app/assets/images/{traf-internalpage-bg.svg → skins/traf/traf-internalpage-bg.svg} +0 -0
  4. data/app/assets/javascripts/modal.js +5 -4
  5. data/app/assets/stylesheets/rad_social/rad_screen.scss +154 -0
  6. data/app/assets/stylesheets/{traf-stylesheets → skins/traf}/contexts/_traf.scss +2 -2
  7. data/app/assets/stylesheets/{traf-stylesheets → skins/traf}/library/_general-mixins.scss +0 -0
  8. data/app/assets/stylesheets/{traf-stylesheets → skins/traf}/library/_icons.scss +0 -0
  9. data/app/assets/stylesheets/{traf-stylesheets → skins/traf}/library/_variables.scss +0 -0
  10. data/app/assets/stylesheets/skins/traf/skin.scss +36 -0
  11. data/app/assets/stylesheets/traf.scss +10 -5
  12. data/app/controllers/concerns/festivity_custom_page.rb +12 -0
  13. data/app/controllers/concerns/festivity_search_caching.rb +11 -0
  14. data/app/controllers/concerns/festivity_sql_builder.rb +25 -0
  15. data/app/controllers/festivity_events_controller.rb +4 -18
  16. data/app/controllers/festivity_location_areas_controller.rb +1 -3
  17. data/app/controllers/festivity_locations_controller.rb +2 -4
  18. data/app/controllers/festivity_markets_controller.rb +67 -0
  19. data/app/controllers/search_controller.rb +1 -2
  20. data/app/helpers/festivity_events_helper.rb +26 -1
  21. data/app/models/concerns/festivity_artist_methods.rb +28 -0
  22. data/app/models/festivity_event_list.rb +21 -15
  23. data/app/models/festivity_event_page.rb +3 -21
  24. data/app/models/festivity_market_list.rb +76 -0
  25. data/app/models/festivity_market_list/festivity_market_detail.rb +24 -0
  26. data/app/models/festivity_market_page.rb +7 -0
  27. data/app/views/admin/pages/_festivity_base_fields.html.haml +30 -7
  28. data/app/views/festivity_events/_filters.html.haml +1 -1
  29. data/app/views/festivity_events/show.html.haml +6 -4
  30. data/app/views/festivity_markets/_filters.html.haml +46 -0
  31. data/app/views/festivity_markets/_market.html.haml +40 -0
  32. data/app/views/festivity_markets/_market_filters.html.haml +0 -0
  33. data/app/views/festivity_markets/_market_list.html.haml +5 -0
  34. data/app/views/festivity_markets/index.html.haml +15 -0
  35. data/app/views/festivity_markets/show.html.haml +63 -0
  36. data/app/views/navigation/_subnav.html.haml +2 -1
  37. data/app/views/social/_share_modal.html.haml +10 -0
  38. data/config/routes.rb +1 -0
  39. data/db/content/layouts/base.html +178 -128
  40. data/db/migrate/201603212551012359_add_hide_from_subnav_to_pages.rb +9 -0
  41. data/db/migrate/201604025593337427_fix_typo_in_market_start.rb +13 -0
  42. data/db/migrate/201604031236563245_add_market_details_view.rb +22 -0
  43. data/db/migrate/201604031638542262_change_market_dates_to_datetime.rb +21 -0
  44. data/lib/festivity/engine.rb +1 -1
  45. data/lib/festivity/extensions/page_extensions.rb +8 -0
  46. data/lib/festivity/extensions/site_extensions.rb +5 -1
  47. data/lib/trusty-festivity-extension.rb +1 -1
  48. metadata +28 -8
@@ -0,0 +1,9 @@
1
+ class AddHideFromSubnavToPages < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :pages, :hide_from_subnav, :boolean, :default => false
4
+ end
5
+
6
+ def self.down
7
+ remove_column :pages, :hide_from_subnav
8
+ end
9
+ end
@@ -0,0 +1,13 @@
1
+ class FixTypoInMarketStart < ActiveRecord::Migration
2
+ def up
3
+
4
+ rename_column :pages, :maket_start_date, :market_start_date
5
+
6
+ end
7
+
8
+ def down
9
+
10
+ rename_column :pages, :market_start_date, :maket_start_date
11
+
12
+ end
13
+ end
@@ -0,0 +1,22 @@
1
+ class AddMarketDetailsView < ActiveRecord::Migration
2
+ def up
3
+ execute <<-SQL
4
+ CREATE OR REPLACE VIEW festivity_market_details AS
5
+ SELECT
6
+ market.id AS market_id, market.title AS market_title, market.short_description,
7
+ market.header, market.sub_header, market.site_id,
8
+ market.market_start_date as start_date, market.market_end_date as end_date,
9
+ area.id AS area_id, area.slug as area_slug, area.title AS area_title
10
+ FROM pages market
11
+ INNER JOIN pages area
12
+ ON area.id = market.area_id
13
+ SQL
14
+
15
+ end
16
+
17
+ def down
18
+ execute 'DROP VIEW festivity_market_details'
19
+ end
20
+ end
21
+
22
+
@@ -0,0 +1,21 @@
1
+ class ChangeMarketDatesToDatetime < ActiveRecord::Migration
2
+ def up
3
+
4
+ remove_column :pages, :market_start_date
5
+ remove_column :pages, :market_end_date
6
+ add_column :pages, :market_start_date, :datetime
7
+ add_column :pages, :market_end_date, :datetime
8
+
9
+ end
10
+
11
+ def down
12
+
13
+ remove_column :pages, :market_start_date
14
+ remove_column :pages, :market_end_date
15
+ add_column :pages, :market_start_date, :date
16
+ add_column :pages, :market_end_date, :date
17
+
18
+ end
19
+ end
20
+
21
+
@@ -6,7 +6,7 @@ module Festivity
6
6
  app.config.assets.precompile += %w(
7
7
  main.css
8
8
  first-night.css
9
- traf.css
9
+ skins/traf/skin.css
10
10
  skins/pghkids/skin.css
11
11
  admin/festivity_admin.css
12
12
  admin/festivity_admin.js
@@ -39,6 +39,14 @@ module Festivity
39
39
  page_image_url('featured_image')
40
40
  end
41
41
 
42
+ def market_start_date=(value)
43
+ super(Chronic.parse(value))
44
+ end
45
+
46
+ def market_end_date=(value)
47
+ super(Chronic.parse(value))
48
+ end
49
+
42
50
  def organization
43
51
  page_organization = nil
44
52
  page_parent = self.parent
@@ -19,10 +19,14 @@ module Festivity
19
19
  super(Chronic.parse(value))
20
20
  end
21
21
 
22
- def festivity_active_category_types
22
+ def festivity_active_category_types()
23
23
  self.festivity_category_types.where(["inactive = false"])
24
24
  end
25
25
 
26
+ def festivity_active_category_types_for(page_class)
27
+ self.festivity_category_types.where(["inactive = false AND page_class = '#{page_class}'"])
28
+ end
29
+
26
30
  def date_during_festival?(date)
27
31
  self.festival_datetimes.any? {|festival_date| festival_date.datetime == date}
28
32
  end
@@ -1,5 +1,5 @@
1
1
  module TrustyFestivityExtension
2
- VERSION = "2.4.6"
2
+ VERSION = "2.5.0"
3
3
  SUMMARY = "Festival microsite engine for Trusty CMS"
4
4
  DESCRIPTION = "Event management for arts festivals."
5
5
  URL = "http://github.com/pgharts/trusty-festivity-extension"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-festivity-extension
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.6
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eric Sipple
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-01 00:00:00.000000000 Z
11
+ date: 2016-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: trusty-cms
@@ -309,8 +309,8 @@ files:
309
309
  - app/assets/images/skins/pghkids/header.png
310
310
  - app/assets/images/skins/pghkids/header_mobile.png
311
311
  - app/assets/images/skins/pghkids/seafoam.jpg
312
- - app/assets/images/traf-internalpage-bg-pattern.svg
313
- - app/assets/images/traf-internalpage-bg.svg
312
+ - app/assets/images/skins/traf/traf-internalpage-bg-pattern.svg
313
+ - app/assets/images/skins/traf/traf-internalpage-bg.svg
314
314
  - app/assets/javascripts/admin/festivity_admin.js
315
315
  - app/assets/javascripts/admin/pages/ajax_image_uploader.js
316
316
  - app/assets/javascripts/admin/pages/page_bindings.js
@@ -553,6 +553,7 @@ files:
553
553
  - app/assets/stylesheets/modules/_navigation.scss
554
554
  - app/assets/stylesheets/modules/_toggler.scss
555
555
  - app/assets/stylesheets/pghkids.scss
556
+ - app/assets/stylesheets/rad_social/rad_screen.scss
556
557
  - app/assets/stylesheets/skins/pghkids/_events.scss
557
558
  - app/assets/stylesheets/skins/pghkids/_footer.scss
558
559
  - app/assets/stylesheets/skins/pghkids/_global.scss
@@ -564,10 +565,11 @@ files:
564
565
  - app/assets/stylesheets/skins/pghkids/library/_general-mixins.scss
565
566
  - app/assets/stylesheets/skins/pghkids/library/_icons.scss
566
567
  - app/assets/stylesheets/skins/pghkids/skin.scss
567
- - app/assets/stylesheets/traf-stylesheets/contexts/_traf.scss
568
- - app/assets/stylesheets/traf-stylesheets/library/_general-mixins.scss
569
- - app/assets/stylesheets/traf-stylesheets/library/_icons.scss
570
- - app/assets/stylesheets/traf-stylesheets/library/_variables.scss
568
+ - app/assets/stylesheets/skins/traf/contexts/_traf.scss
569
+ - app/assets/stylesheets/skins/traf/library/_general-mixins.scss
570
+ - app/assets/stylesheets/skins/traf/library/_icons.scss
571
+ - app/assets/stylesheets/skins/traf/library/_variables.scss
572
+ - app/assets/stylesheets/skins/traf/skin.scss
571
573
  - app/assets/stylesheets/traf.scss
572
574
  - app/assets/stylesheets/vars/_vars_color.scss
573
575
  - app/assets/stylesheets/vars/_vars_media-queries.scss
@@ -575,15 +577,20 @@ files:
575
577
  - app/controllers/admin/festivity_categories_controller.rb
576
578
  - app/controllers/admin/festivity_category_types_controller.rb
577
579
  - app/controllers/admin/festivity_performances_controller.rb
580
+ - app/controllers/concerns/festivity_custom_page.rb
581
+ - app/controllers/concerns/festivity_search_caching.rb
582
+ - app/controllers/concerns/festivity_sql_builder.rb
578
583
  - app/controllers/errors_controller.rb
579
584
  - app/controllers/festivity_events_controller.rb
580
585
  - app/controllers/festivity_location_areas_controller.rb
581
586
  - app/controllers/festivity_locations_controller.rb
587
+ - app/controllers/festivity_markets_controller.rb
582
588
  - app/controllers/search_controller.rb
583
589
  - app/helpers/admin/festivity_performances_helper.rb
584
590
  - app/helpers/admin/snippets_helper.rb
585
591
  - app/helpers/festivity_events_helper.rb
586
592
  - app/helpers/festivity_locations_helper.rb
593
+ - app/models/concerns/festivity_artist_methods.rb
587
594
  - app/models/festivity_base_page.rb
588
595
  - app/models/festivity_category.rb
589
596
  - app/models/festivity_category_type.rb
@@ -594,6 +601,8 @@ files:
594
601
  - app/models/festivity_event_page.rb
595
602
  - app/models/festivity_location_area_page.rb
596
603
  - app/models/festivity_location_page.rb
604
+ - app/models/festivity_market_list.rb
605
+ - app/models/festivity_market_list/festivity_market_detail.rb
597
606
  - app/models/festivity_market_page.rb
598
607
  - app/models/festivity_page_category.rb
599
608
  - app/models/festivity_performance.rb
@@ -636,6 +645,12 @@ files:
636
645
  - app/views/festivity_events/show.html.haml
637
646
  - app/views/festivity_location_areas/show.html.haml
638
647
  - app/views/festivity_locations/show.html.haml
648
+ - app/views/festivity_markets/_filters.html.haml
649
+ - app/views/festivity_markets/_market.html.haml
650
+ - app/views/festivity_markets/_market_filters.html.haml
651
+ - app/views/festivity_markets/_market_list.html.haml
652
+ - app/views/festivity_markets/index.html.haml
653
+ - app/views/festivity_markets/show.html.haml
639
654
  - app/views/header/_meta_tags.html.haml
640
655
  - app/views/navigation/_subnav.html.haml
641
656
  - app/views/navigation/_subnav_item.html.haml
@@ -644,6 +659,7 @@ files:
644
659
  - app/views/search/_result_item.html.haml
645
660
  - app/views/search/show.html.haml
646
661
  - app/views/social/_instagram_posts.html.haml
662
+ - app/views/social/_share_modal.html.haml
647
663
  - bower.json
648
664
  - config/initializers/pluralizations.rb
649
665
  - config/initializers/radiant_config.rb
@@ -671,6 +687,10 @@ files:
671
687
  - db/migrate/20151018190155_update_site_for_hourly_filters.rb
672
688
  - db/migrate/20151105155407_add_buy_ticket_text_to_site.rb
673
689
  - db/migrate/201601231255101234_create_vanity_url_pages.rb
690
+ - db/migrate/201603212551012359_add_hide_from_subnav_to_pages.rb
691
+ - db/migrate/201604025593337427_fix_typo_in_market_start.rb
692
+ - db/migrate/201604031236563245_add_market_details_view.rb
693
+ - db/migrate/201604031638542262_change_market_dates_to_datetime.rb
674
694
  - festivity_extension.rb
675
695
  - lib/festivity/admin/assets_helper.rb
676
696
  - lib/festivity/engine.rb