tramway-conference 1.5.12 → 1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/tramway/conference/web/welcome_controller.rb +4 -1
  3. data/config/locales/ru.yml +6 -12
  4. data/lib/tramway/conference/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ff7127112e5d870161cfcac164c9190a63d1a2fcce5d95ee2d5cd148066c0416
4
- data.tar.gz: 822f877aaa243a2677c1d203c409f7d40f3ba9f6e3039131f4a6f02932846e46
3
+ metadata.gz: 2ef7379a28f56ad650e93895f87e45994e052ef12b3b5458ec12ab4f99ad1c91
4
+ data.tar.gz: 7d59361345a9e5c32cf4b1c26bfd0f8564250b42331f3b92d0eed7333e4479ce
5
5
  SHA512:
6
- metadata.gz: f1c70796a13011dbe8342d5f3d50da80e100eb2f6b87dce34d0e140c77d5600c5c468e474a6f926beb349736413f09c75dc1a32e7429eccfd10e50208e686a38
7
- data.tar.gz: c3e50971393f10b00a7b0fb4b1fc7cd746e33a538be7178f7bfd050732d84ca97ac605a3b362924defdfc95ff27c6327c37f9ad79ab23d44b39e30df5afd3700
6
+ metadata.gz: e6d4ab0b6207aa8547515f7e5f74282d920e8aff8a0d6fc10c72bd4ec1e51bcc53f6984cf36ffa8bc42f09d3bd5fbda94b1cb591de43f48732f85519b2148bf9
7
+ data.tar.gz: efc64410bfdeddd5272576fadbf038e1888e1377c7a3ffa56f4cada6c08ba36e1cb21e1506bc9226e45cdee1c9816c3b950bdc43095ab3cb905bc11603f887cb
data/app/controllers/tramway/conference/web/welcome_controller.rb CHANGED
@@ -5,7 +5,10 @@ class Tramway::Conference::Web::WelcomeController < ::Tramway::Conference::Appli
5
5
  @unity = ::Tramway::Conference::Unity.includes(:social_networks).first
6
6
  @blocks = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.on_main_page
7
7
  @news = ::Tramway::News::News.active.first(3).map { |t| ::Tramway::Landing::Cards::NewsDecorator.new t }
8
- @links = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.actual.order :begin_date
8
+ past_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.past.order begin_date: :desc
9
+ past_events_links = Tramway::Landing::NavbarDecorator.new [{ past_events: past_events }]
10
+ actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.actual.order :begin_date
11
+ @links = actual_events + past_events_links
9
12
  main_event = ::Tramway::Event::Event.main_event&.last
10
13
  if main_event.present?
11
14
  @main_event = ::Tramway::Event::Events::Show::EventDecorator.decorate main_event
data/config/locales/ru.yml CHANGED
@@ -2,15 +2,9 @@ ru:
2
2
  application:
3
3
  name: Конференция
4
4
  tagline: Главный слоган лендоса конференции
5
- blocks:
6
- navbar_links:
7
- parents: Для родителей
8
- schoolkids: Для школьников
9
- adults: Для взрослых
10
- contacts: Контакты
11
- header_buttons:
12
- parents: Я - родитель ребёнка
13
- schoolkids: Я - школьник
14
- adults: Я - взрослый
15
- contacts: Контакты
16
-
5
+ tramway:
6
+ landing:
7
+ blocks:
8
+ block_types:
9
+ header:
10
+ past_events: Прошедшие мероприятия
data/lib/tramway/conference/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Tramway
2
2
  module Conference
3
- VERSION = '1.5.12'
3
+ VERSION = '1.6'
4
4
  end
5
5
  end
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.5.12
4
+ version: '1.6'
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: 2018-10-30 00:00:00.000000000 Z
12
+ date: 2018-11-25 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: Engine for Conference web sites
15
15
  email: