tramway-conference 1.9.4.3 → 1.9.5.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/tramway/conference/web/welcome_controller.rb +4 -4
- data/app/decorators/tramway/conference/unity_decorator.rb +2 -2
- data/app/forms/admin/tramway/conference/unity_form.rb +5 -2
- data/app/models/tramway/conference/unity.rb +2 -0
- data/app/views/tramway/conference/web/welcome/index.html.haml +7 -6
- data/config/locales/ru.yml +3 -6
- data/lib/tramway/conference/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 12b943edd9bc36fff87d53a2b178a778b7b9b11088b137f62d2a7d294d9f831e
|
4
|
+
data.tar.gz: a4fd4804b2904759d58a53ede5fac20ab00ecf87729eede7e736d3000b8f20f5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d8386dd5ab0c0305e2a14e3d2c021902cf99fbe7cc307d8b34a5632bd7606418293e403e18ca032edbbdd649bc73a70fccc366bf910cb6ae6f38af239de89859
|
7
|
+
data.tar.gz: 1c10b6ee6d374c029516f179a5cefc70be738f27915b9e042ba647380deb23ec03d5abed773cb504a13a81b9526ef4521b8f6bbb66355c26804c55fe32ca81d0
|
@@ -6,16 +6,16 @@ class Tramway::Conference::Web::WelcomeController < ::Tramway::Conference::Appli
|
|
6
6
|
def index
|
7
7
|
@unity = ::Tramway::Conference::Unity.includes(:social_networks).first
|
8
8
|
@blocks = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.on_main_page
|
9
|
-
@news = ::Tramway::News::News.
|
10
|
-
past_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.
|
9
|
+
@news = ::Tramway::News::News.first(3).map { |t| ::Tramway::Landing::Cards::NewsDecorator.new t }
|
10
|
+
past_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.past.open.order begin_date: :desc
|
11
11
|
past_events_links = Tramway::Landing::NavbarDecorator.new [{ past_events: past_events }]
|
12
|
-
actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.
|
12
|
+
actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.actual.open.order :begin_date
|
13
13
|
@links = actual_events + past_events_links
|
14
14
|
@close_events = ::Tramway::Event::Event.actual.open.map do |event|
|
15
15
|
::Tramway::Event::EventAsPageWithButtonDecorator.decorate event
|
16
16
|
end
|
17
17
|
@partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
|
18
|
-
hash.merge! partnership_type => (@unity.send(partnership_type.to_s.pluralize).
|
18
|
+
hash.merge! partnership_type => (@unity.send(partnership_type.to_s.pluralize).map do |partner|
|
19
19
|
Tramway::Partner::OrganizationFeatureDecorator.decorate partner
|
20
20
|
end)
|
21
21
|
end
|
@@ -7,7 +7,7 @@ class Tramway::Conference::UnityDecorator < ::Tramway::Core::ApplicationDecorato
|
|
7
7
|
end
|
8
8
|
|
9
9
|
def show_attributes
|
10
|
-
%i[title tagline logo address phone latitude longtitude url found_date email]
|
10
|
+
%i[title tagline logo address phone latitude longtitude url found_date email favicon]
|
11
11
|
end
|
12
12
|
|
13
13
|
def show_associations
|
@@ -15,7 +15,7 @@ class Tramway::Conference::UnityDecorator < ::Tramway::Core::ApplicationDecorato
|
|
15
15
|
end
|
16
16
|
end
|
17
17
|
|
18
|
-
delegate_attributes :title, :logo, :tagline, :address, :phone, :latitude, :longtitude, :url, :found_date, :email
|
18
|
+
delegate_attributes :title, :logo, :tagline, :address, :phone, :latitude, :longtitude, :url, :found_date, :email, :favicon
|
19
19
|
|
20
20
|
decorate_association :social_networks
|
21
21
|
end
|
@@ -1,7 +1,8 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class Admin::Tramway::Conference::UnityForm < ::Tramway::Core::ApplicationForm
|
4
|
-
properties :title, :tagline, :logo, :state, :phone, :address, :longtitude, :latitude, :url, :found_date, :email
|
4
|
+
properties :title, :tagline, :logo, :state, :phone, :address, :longtitude, :latitude, :url, :found_date, :email,
|
5
|
+
:favicon, :public_name
|
5
6
|
|
6
7
|
def initialize(object)
|
7
8
|
super(object).tap do
|
@@ -13,7 +14,9 @@ class Admin::Tramway::Conference::UnityForm < ::Tramway::Core::ApplicationForm
|
|
13
14
|
longtitude: :string,
|
14
15
|
url: :string,
|
15
16
|
found_date: :date_picker,
|
16
|
-
email: :string
|
17
|
+
email: :string,
|
18
|
+
favicon: :file,
|
19
|
+
public_name: :string
|
17
20
|
end
|
18
21
|
end
|
19
22
|
end
|
@@ -28,14 +28,15 @@
|
|
28
28
|
- @collection_news = @news
|
29
29
|
|
30
30
|
%br
|
31
|
-
.
|
32
|
-
.row-fluid
|
33
|
-
%h1.text-center
|
34
|
-
Ближайшие мероприятия
|
35
|
-
- @close_events.each do |event|
|
31
|
+
- if @close_events.any?
|
36
32
|
.container
|
37
33
|
.row-fluid
|
38
|
-
|
34
|
+
%h1.text-center
|
35
|
+
Ближайшие мероприятия
|
36
|
+
- @close_events.each do |event|
|
37
|
+
.container
|
38
|
+
.row-fluid
|
39
|
+
= render 'tramway/landing/templates/section_with_image_and_text', block: event
|
39
40
|
|
40
41
|
- content_for :main_image do
|
41
42
|
= request.protocol + request.host_with_port + @blocks.select { |block| block.model.block_type.header? }.first.background.url
|
data/config/locales/ru.yml
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tramway-conference
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.9.4
|
4
|
+
version: 1.9.5.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dmitry Korotin
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2021-12-19 00:00:00.000000000 Z
|
13
13
|
dependencies: []
|
14
14
|
description: Engine for Conference web sites
|
15
15
|
email:
|
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
76
76
|
- !ruby/object:Gem::Version
|
77
77
|
version: '0'
|
78
78
|
requirements: []
|
79
|
-
rubygems_version: 3.1
|
79
|
+
rubygems_version: 3.0.3.1
|
80
80
|
signing_key:
|
81
81
|
specification_version: 4
|
82
82
|
summary: Engine for Conference web sites
|