tramway-conference 1.8.14.1 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0784bb7db064d62dce0b7ddd09b2df4d9213291a13131c4108284b9e1ae3db6
-  data.tar.gz: 4ba800e7f46504e0474d1ef6e9a4be48126e3d33b63003dcfbf3c9b5d61c54b3
+  metadata.gz: 2beb2a282e77105cb33153396363229a90413e699be4a6287fa092c464a1e781
+  data.tar.gz: 0b5ac36dde1cec6ad6fb214ec615c5be41baf9864f588edbce203bac3cc4ae57
 SHA512:
-  metadata.gz: 0d83cfe6bb83da29adc6897ba8da50ae4bee964ab7394a4abd028ddca7794692dfc2244b7578e2850dc69c29d1f67d1c89373d6c071a2ffa13a23d12662daf54
-  data.tar.gz: 7a216da66f7d5be4e6e6978c807a6b31d5dee14cdee3453aa6781e2bdfaec2e11946ccb2285bb458964d4473ea47bb4d15bbb3eefe0577458d71c17dec5e7d73
+  metadata.gz: f58d3cfb99da0c890c5b4c82a573c4712ec4226cd90340dce4a17827ae592b731279b00cebb77282807bb8491d143adcfeaeecfe84f300db159b87fb229eb591
+  data.tar.gz: a7a8592462e2a36274408af6cd387add76eb06d10eda544ed00b0319f35c7ef52fdd8d027ef47ba3bb7c4dc03123f747ec7413884c10e9864623b49d28e6014e

data/app/controllers/tramway/conference/web/welcome_controller.rb

@@ -12,6 +12,9 @@ class Tramway::Conference::Web::WelcomeController < ::Tramway::Conference::Appli
     actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.actual.order :begin_date
     @links = actual_events + past_events_links
     main_event = ::Tramway::Event::Event.main_event&.last
+    @close_events = ::Tramway::Event::Event.actual.map do |event|
+      ::Tramway::Event::EventAsPageWithButtonDecorator.decorate event 
+    end
     if main_event.present?
       @main_event = ::Tramway::Event::Events::Show::EventDecorator.decorate main_event
       @sections_as_features = main_event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }

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

@@ -0,0 +1,33 @@
+class Tramway::Event::EventAsPageWithButtonDecorator < Tramway::Event::EventDecorator
+  def anchor
+    "event_#{object.id}"
+  end
+
+  delegate :photo, to: :object
+  delegate :title, to: :object
+  alias background photo
+
+  def description
+    if object.short_description.present?
+      content_tag :div do
+        concat duration
+        concat content_tag :br
+        concat object.short_description
+      end
+    else
+      duration
+    end
+  end
+
+  def button
+    content_tag :div do
+      content_tag(
+        :a,
+        href: ::Tramway::Event::Engine.routes.url_helpers.event_path(object.id),
+        class: 'btn btn-primary'
+      ) do
+        'Регистрация'
+      end
+    end
+  end
+end

data/app/views/tramway/conference/web/welcome/index.html.haml

@@ -27,6 +27,16 @@
 
 - @collection_news = @news
 
+%br
+.container
+  .row-fluid
+    %h1.text-center
+      Ближайшие мероприятия
+- @close_events.each do |event|
+  .container
+    .row-fluid
+      = render 'tramway/landing/blocks/templates/section_with_image_and_text', block: event
+
 - if @main_event.present?
   - content_for :main_image do
     = request.protocol + request.host_with_port + @main_event.background.url

data/lib/tramway/conference/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Conference
-    VERSION = '1.8.14.1'
+    VERSION = '1.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-conference
 version: !ruby/object:Gem::Version
-  version: 1.8.14.1
+  version: '1.9'
 platform: ruby
 authors:
 - Dmitry Korotin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies: []
 description: Engine for Conference web sites
 email:
@@ -29,6 +29,7 @@ files:
 - app/controllers/tramway/conference/application_controller.rb
 - app/controllers/tramway/conference/web/welcome_controller.rb
 - app/decorators/tramway/conference/unity_decorator.rb
+- app/decorators/tramway/event/event_as_page_with_button_decorator.rb
 - app/forms/tramway/conference/unity_form.rb
 - app/helpers/tramway/conference/application_helper.rb
 - app/helpers/tramway/conference/web/welcome_helper.rb