tramway-event 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 561ce6e60c09b2065aa0054c1203e7f8faafb38308dbb1ec01e55bfebf606a18
-  data.tar.gz: b2d52e2dac5e50dde7ed0099ad907c369d2ecc50ff6c087f1147cc6b587df220
+  metadata.gz: dcc54703252a31a5b2bc9195cbe54223b8ad244d28b7f33ae5fb46c220075fbb
+  data.tar.gz: 9bf2eca69564a9f8ce2879b151f8da58c5a90abda08f67b5324a1f12c5ec22c5
 SHA512:
-  metadata.gz: 7237e9582084934e3f564719199efa0f9587a0f999623e2bcdb1158f23e5f3e614094025f007d5c41bd7f5b7551c40eb790c0ba33598cacf72a6ea07b8c63e45
-  data.tar.gz: '09b550168725e0d6ee8e67a8e49fac7a5abedc621a605bc8a47a5b746c300cc53428d91491d1718f84666e163569d271731a23b00a86c234d4e6438ee841e1b6'
+  metadata.gz: ec11fd14671032bf0886beda4628ce47a33f29142435609efab56844bc349f1c7211a4974b079eba95e9f952f4d8d814525517f23caad25655b647324bf042b2
+  data.tar.gz: 1af2d5bfad864251ef6bbb9ec034d3cd92eacf4e9fe143e6df075067af41e2874c26580b6b11f9b2ea5084f3c72d2227e0829e2fc056532b9a6ada87ad86b633

data/app/controllers/tramway/event/application_controller.rb

@@ -1,6 +1,6 @@
 module Tramway
   module Event
-    class ApplicationController < ActionController::Base
+    class ApplicationController < ::Tramway::Core::ApplicationController
       protect_from_forgery with: :exception
     end
   end

data/app/controllers/tramway/event/events_controller.rb

@@ -6,5 +6,7 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, @event).new ::Tramway::Event::Participant.new
     @sections_as_features = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
     @sections = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
+    @footer = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.footer
+    @events = ::Tramway::Event::Event.active.map { |e| ::Tramway::Event::EventDecorator.decorate e }
   end
 end

data/app/decorators/tramway/event/event_decorator.rb

@@ -14,13 +14,15 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     object.photo
   end
 
-  def tagline
-    ''
-  end
-
   def duration
-    if object.begin_date.present? && object.end_date.present?
-      "#{I18n.t('date.from')} #{I18n.l(object.begin_date.to_date)} #{I18n.t('date.to')} #{I18n.l(object.end_date.to_date)}"
+    if object.begin_date.to_date == object.end_date.to_date
+      "#{I18n.l(object.begin_date, format: '%d %B %Y')}"
+    elsif object.begin_date.month == object.end_date.month
+      "#{I18n.t('date.from')} #{I18n.l(object.begin_date, format: '%d')} #{I18n.t('date.to')} #{I18n.l(object.end_date, format: '%d %B %Y')}"
+    else
+      "#{I18n.t('date.from')} #{I18n.l(object.begin_date, format: '%d %B %Y')} #{I18n.t('date.to')} #{I18n.l(object.end_date, format: '%d %B %Y')}"
     end
   end
+
+  alias tagline duration
 end

data/app/views/tramway/event/events/show.html.haml

@@ -1,4 +1,10 @@
 - content_for :title do
   = @event.title
+- content_for :footer_links do
+  %ul
+    - @events.each do |event|
+      %li
+        = link_to event.title, event_path(event)
 - content_for :body_content do
   = render 'tramway/event/events/show_page', event: @event, sections: @sections, sections_as_features: @sections_as_features
+  = render "tramway/landing/blocks/block_types/footer", block: @footer

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.3'
+    VERSION = '1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email: