tramway-event 1.11.5.1 → 1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afaee769dfd67ef2fd5df5f12a1415b47c9f33a33ddda58cd533b5ac1e9d6ce4
-  data.tar.gz: 6f761a13347db57f972e0783b8b50e232116ea3c9d398919e6629a36fdd2d3ac
+  metadata.gz: c4346908bef28bd8fc02c3e3ffa5eadc70c3c984fa777bfdcac1b5bbb2dd083e
+  data.tar.gz: 95ff1569b4efa5bb3db915652cc1f1e469ba55fac9b1b680f15bafa95c41028a
 SHA512:
-  metadata.gz: 9614904b698ce7e34ecf51e7dfd9256e27ac55a41d0bdf6e1ae6a21b7014b1ceb2e94a3aec2abda05866ca6675ef153d64476edd322586fb097a47a955640bff
-  data.tar.gz: 590f609d44efeb81ae5eb41a4b4f61e480126adc58866aa076cee7b1a0ba8002678a39ee8f6a99b543f924efb8ef6ea5dca80f4d3b3406bc42f04c7623b695e9
+  metadata.gz: 1cc8ff84f9168eed351be3fb5ec9a4407057186aeaedd6feae3230d78c5bbcd7ff78db31382bdebddfb4acf46972731cac78abd1dd710d1099e307df1be29918
+  data.tar.gz: 0627d80603bfcb547bcbf2fa4e5121db895426f439a49e6f14e1db03a966c44b5b64f5acb35bcca64b38f625b2c2b06d7cf90155209db8e3b0e6377711826a26

data/app/assets/stylesheets/tramway/event/events/show.css.sass

@@ -13,7 +13,3 @@ body
   &.form
     h1
       margin-bottom: 100px
-
-main.event.show
-  .row.description
-    margin-top: 150px

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

@@ -46,7 +46,8 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   def responsible_person
     {
       phone: (object.creator.phone if object.creator&.phone&.present?),
-      email: (object.creator.email if object.creator&.email&.present?)
+      email: (object.creator.email if object.creator&.email&.present?),
+      social_networks: (object.creator.social_networks.active if object.creator.respond_to?(:social_networks))
     }
   end
 end

data/app/helpers/tramway/event/application_helper.rb

@@ -7,6 +7,7 @@ module Tramway
     module ApplicationHelper
       include ::FontAwesome5::Rails::IconHelper
       include ::Tramway::Collections::Helper
+      include ::Tramway::Profiles::LinksHelper
     end
   end
 end

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

@@ -0,0 +1,11 @@
+.alert.alert-danger{ role: "alert" }
+  %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
+    %span{"aria-hidden" => "true"} ×
+  %h4.alert-heading Ошибка при отправлении заявки!
+  %p Подробности ошибки описаны ниже в форме приёма заявок
+  %hr/
+  %p.mb-0
+    Если ошибка повторяется или не отображается, обращайтесь по телефону
+    = tel_tag @event.responsible_person[:phone] || @application.phone
+    или пишите на email
+    = mail_to @event.responsible_person[:email] || @application.email

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

@@ -1,32 +1,15 @@
 = stylesheet_link_tag 'tramway/event/events/show'
 - if params[:flash] == 'success'
-  .alert.alert-success{role: "alert"}
-    %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
-      %span{"aria-hidden" => "true"} ×
-    %h4.alert-heading Заявка успешно отправлена!
-    %hr/
-    %p.mb-0
-      По всем вопросам обращайтесь по телефону
-      = tel_tag @event.responsible_person[:phone] || @application.phone
-      или пишите на email
-      = mail_to @event.responsible_person[:email] || @application.email
+  = render 'tramway/event/events/success'
 - if params[:flash] == 'error'
-  .alert.alert-danger{ role: "alert" }
-    %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
-      %span{"aria-hidden" => "true"} ×
-    %h4.alert-heading Ошибка при отправлении заявки!
-    %p Подробности ошибки описаны ниже в форме приёма заявок
-    %hr/
-    %p.mb-0
-      Если ошибка повторяется или не отображается, обращайтесь по телефону
-      = tel_tag @event.responsible_person[:phone] || @application.phone
-      или пишите на email
-      = mail_to @event.responsible_person[:email] || @application.email
+  = render 'tramway/event/events/error'
 = render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
 - content_for :main_image do
   = request.protocol + request.host_with_port + event.background.url
 %main.event.show
   .container
+    - if @event.responsible_person[:social_networks]&.any? || @event.responsible_person[:phone].present? || @event.responsible_person[:email].present?
+      = render 'tramway/landing/blocks/block_types/contacts', block: OpenStruct.new(title: 'Контакты'), social_networks: @event.responsible_person[:social_networks], email: @event.responsible_person[:email], phone: @event.responsible_person[:phone]
     - if defined? sections_as_features
       = render 'tramway/landing/blocks/templates/features_list', collection: sections_as_features
     .row.description

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

@@ -0,0 +1,10 @@
+.alert.alert-success{role: "alert"}
+  %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
+    %span{"aria-hidden" => "true"} ×
+  %h4.alert-heading Заявка успешно отправлена!
+  %hr/
+  %p.mb-0
+    По всем вопросам обращайтесь по телефону
+    = tel_tag @event.responsible_person[:phone] || @application.phone
+    или пишите на email
+    = mail_to @event.responsible_person[:email] || @application.email

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.11.5.1'
+    VERSION = '1.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.11.5.1
+  version: '1.12'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus
@@ -76,7 +76,9 @@ files:
 - app/models/tramway/event/person.rb
 - app/models/tramway/event/place.rb
 - app/models/tramway/event/section.rb
+- app/views/tramway/event/events/_error.html.haml
 - app/views/tramway/event/events/_show_page.html.haml
+- app/views/tramway/event/events/_success.html.haml
 - app/views/tramway/event/events/show.html.haml
 - app/views/tramway/event/participants/_form.html.haml
 - app/views/tramway/event/sections/_show_page.html.haml
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails engine for events