tramway-page 1.5.3.1 → 1.5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a182227b590ad2a0a3cbc32e8d2487d522b5cd250eeff2d2c6c4237d584c00
-  data.tar.gz: cd218be36fab082a5785f9a995ea4c5ab672d3741c442245f88934a7edd3fd79
+  metadata.gz: 05c0a90c2649ccaf5926473179e912f386e20251a0ef8f9f3fab8fa61235b80a
+  data.tar.gz: bbdf97520c3d10ebe07a14f92f96d172cf9cee1977e1ad824bb2d1559968ff51
 SHA512:
-  metadata.gz: 04be16a8244e0d39d17e431d81452de1336eb1bebcf97807e9dc665a011dd82c59e2e687963e93952957ab27c73d53a703c9f71988b0a3ed5243dbbd0e68b378
-  data.tar.gz: 5b6be862e80d6fdb5c59afe9e6c54f97fd9a916de0d901ed2c28b2139da6c621308c26b47ac71581b95bd8016cb4154eb0c4db170e76c1fd1a2aaf718896f93e
+  metadata.gz: 6cba87a2205e172f23f9aa0c227cf0beeafe9790130c3697248048066f8b334ccc207d5a8aec8010013ee0b7fdb64bce8ab23544035302c34c9ad8bb68803593
+  data.tar.gz: b452c345e91605a2c81ff22e81331e257609c03ea142890c7d55f9ee9855cced8470c30696a9df4f82a2cc7394808ea41fa70e721a891b0fea068cc7a7206bff

data/app/controllers/tramway/page/pages_controller.rb

@@ -10,6 +10,9 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
         # FIXME: in future
         @header_with_form = block.form_to_render.new(Tramway::Auth.authenticable_models.first.new, page: @page.id)
       end
+      if block.block_type.in? [ :header, :header_with_form ]
+        @links = Tramway::Landing::BlockLinkDecorator.decorate @page.with_navbar_link.active
+      end
       ::Tramway::Landing::BlockDecorator.decorate block
     end
   end

data/app/decorators/tramway/page/page_decorator.rb

@@ -12,7 +12,7 @@ class Tramway::Page::PageDecorator < ::Tramway::Core::ApplicationDecorator
     delegate :human_view_state_event_name, to: :model_class
   end
 
-  delegate :title, to: :object
+  delegate_attributes :title, :page_type, :body
 
   decorate_association :blocks, state_machines: [:view_state]
 

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

@@ -3,6 +3,7 @@
 module Tramway
   module Page
     module ApplicationHelper
+      include Tramway::Landing::ApplicationHelper
     end
   end
 end

data/config/locales/models.yml

@@ -5,6 +5,18 @@ ru:
     attributes:
       tramway/page/page:
         blocks: Блоки
+        name: Название
+        title: Название
+        body: Контент
+        slug: Идентификатор (slug)
+        view: Представление
+        page_type: Тип страницы
+        view_state: Видимость на сайте
+  enumerize:
+    tramway/page/page:
+      page_type:
+        main: Главная Страница
+        other: Другое
   cases:
     tramway/page/page:
       plural: страницы

data/config/locales/ru.state_machines.yml

@@ -0,0 +1,11 @@
+ru:
+  activerecord:
+    state_machines:
+      tramway/page/page:
+        view_state:
+          states:
+            published: Видена
+            unpublished: Скрыта
+          events:
+            publish: Показать на сайте
+            hide: Скрыть с сайта

data/lib/tramway/page/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Page
-    VERSION = '1.5.3.1'
+    VERSION = '1.5.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.5.3.1
+  version: 1.5.3.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies: []
 description: Description of Tramway::Page.
 email:
@@ -38,6 +38,7 @@ files:
 - app/views/tramway/page/shared/_main_page_view.html.haml
 - config/initializers/tramway.rb
 - config/locales/models.yml
+- config/locales/ru.state_machines.yml
 - config/routes.rb
 - lib/tasks/tramway/page_tasks.rake
 - lib/tramway/page.rb