tramway-landing 1.4.7.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69ff995f5f833554843602c28dd96c1d78f74816c70eb130e3597752828b2513
-  data.tar.gz: 3abbecfd51573e18988521296976343d770c99f5dcafea14fdb0a007ef11e958
+  metadata.gz: 728596237f98b5c68567721b2e37ed6014150023b82f041208a446528ea0a372
+  data.tar.gz: 4e53d54560da8393d353b19f0931747a4ae5a6094e446dd990915ca746c17bc3
 SHA512:
-  metadata.gz: ef588ed525178b82360dd36049de26be1c99e7ce36e41408fc3239cc86b3a2de4198c6de4d8dcc8c8bd38f6350a5658d1a0eec931b65eb16c04f58b8a601308c
-  data.tar.gz: 48e7d4037b25e5d6b099b4c8353fb38848f33cc54f06a0fe16ec4e7b23bbdbcf9fb3ef15ba62a9de072a33e0ee5f6c75278631783c9f35c62390198894fe0553
+  metadata.gz: c74dbb1c4e9421a610f541e6b585c5f0d15fcb88f34fb27b8cc3cbc18788a7e59ddec94933a08a3ed641de23fd3a29ce8d4977c6880f46f0f55bab716477a5f4
+  data.tar.gz: 3f268c7be830004cc47d0feb79c6a8e37d33635a5b14d140406ae855cc805c7282de9866308b83469ae1e504c9f5b5fc8272b2cdb76ce7da30e3152d5096dc74

data/app/assets/stylesheets/tramway/landing/application.sass

@@ -3,6 +3,7 @@
  *= require_self
  */
 
+@import 'bootstrap'
 @import "tramway/core/application"
 @import "tramway/landing/collage"
 @import "tramway/landing/justified"

data/app/decorators/tramway/landing/block_decorator.rb

@@ -17,7 +17,7 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   delegate :anchor, to: :object
   delegate :description, to: :object
   delegate :anchor, to: :object
-
+  
   def block_type
     object.block_type_text
   end

data/app/forms/tramway/landing/block_form.rb

@@ -1,5 +1,5 @@
 class Tramway::Landing::BlockForm < ::Tramway::Core::ApplicationForm
-  properties :title, :background, :view_state, :block_type, :position, :navbar_link, :anchor, :description, :link_object_type, :link_object_id
+  properties :title, :background, :view_state, :block_type, :position, :navbar_link, :anchor, :description, :link_object_type, :link_object_id, :button
 
   def initialize(object = nil)
     form_object = super object
@@ -11,7 +11,27 @@ class Tramway::Landing::BlockForm < ::Tramway::Core::ApplicationForm
                     anchor: :string,
                     description: :ckeditor,
                     link_object_type: :default,
-                    link_object_id: :numeric
+                    link_object_id: :numeric,
+                    button_title: :string,
+                    button_link: :string
     form_object
   end
+
+  def button_title
+    model.button&.require(:title) || ""
+  end
+
+  def button_link
+    model.button&.require(:link) || ""
+  end
+
+  def button_title=(value)
+    model.button[:title] = value
+    model.save
+  end
+
+  def button_link=(value)
+    model.button[:link] = value
+    model.save
+  end
 end

data/app/models/tramway/landing/block.rb

@@ -1,5 +1,5 @@
 class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
-  enumerize :block_type, in: [ :header, :footer, :page, :cards, :features, :contacts, :news, :link ]
+  enumerize :block_type, in: [ :header, :footer, :page, :cards, :features, :contacts, :news, :link, :page_with_button ]
   enumerize :navbar_link, in: [ :exist, :not_exist ], default: :not_exist
   enumerize :link_object_type, in: [ 'Tramway::SportSchool::Document', 'Tramway::Page::Page' ]
 

data/app/views/tramway/landing/blocks/block_types/_page_with_button.html.haml

@@ -0,0 +1 @@
+= render 'tramway/landing/blocks/templates/section_with_image_and_text', block: block

data/app/views/tramway/landing/blocks/templates/_section_with_image_and_text.html.haml

@@ -7,3 +7,5 @@
     %hr
     %p
       != block.description
+      - if block.try :button
+        = link_to block.button[:title], block.button[:link], class: 'btn btn-primary'

data/config/locales/models.yml

@@ -14,6 +14,8 @@ ru:
         description: Описание
         link_object_type: Тип объекта, на который делается ссылка
         link_object_id: ID объекта, на который делается ссылка
+        button_title: Наименование кнопки
+        button_link: Ссылка кнопки
   cases:
     tramway/landing/block:
       plural: Блоки
@@ -24,6 +26,7 @@ ru:
         header: Начальный (Header)
         footer: Подвал (Footer)
         page: Свободный блок (картинка + текст)
+        page_with_button: Свободный блок с кнопкой (картинка + текст + кнопка)
         cards: "Карточки (выводит определённый набор карточек): Программируется"
         features: "Список возможностей (выделяет возможности): Программируется"
         contacts: Блок с контактами

data/lib/tramway/landing/generates/install_generator.rb

@@ -18,7 +18,8 @@ module Tramway::Landing::Generators
         :add_anchor_to_tramway_landing_blocks,
         :add_description_to_tramway_landing_blocks,
         :add_link_object_id_to_tramway_landing_blocks,
-        :add_link_object_type_to_tramway_landing_blocks
+        :add_link_object_type_to_tramway_landing_blocks,
+        :add_button_to_tramway_landing_blocks
       ]
 
       migrations.each do |migration|

data/lib/tramway/landing/generates/templates/add_button_to_tramway_landing_blocks.rb

@@ -0,0 +1,5 @@
+class AddButtonToTramwayLandingBlocks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_landing_blocks, :button, :jsonb
+  end
+end

data/lib/tramway/landing/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Landing
-    VERSION = '1.4.7.4'
+    VERSION = '1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 1.4.7.4
+  version: '1.5'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -51,6 +51,7 @@ files:
 - app/views/tramway/landing/blocks/block_types/_header.html.haml
 - app/views/tramway/landing/blocks/block_types/_link.html.haml
 - app/views/tramway/landing/blocks/block_types/_page.html.haml
+- app/views/tramway/landing/blocks/block_types/_page_with_button.html.haml
 - app/views/tramway/landing/blocks/templates/_features_list.html.haml
 - app/views/tramway/landing/blocks/templates/_full_page.html.haml
 - app/views/tramway/landing/blocks/templates/_section_with_image_and_text.html.haml
@@ -64,6 +65,7 @@ files:
 - lib/tramway/landing/engine.rb
 - lib/tramway/landing/generates/install_generator.rb
 - lib/tramway/landing/generates/templates/add_anchor_to_tramway_landing_blocks.rb
+- lib/tramway/landing/generates/templates/add_button_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_description_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_link_object_id_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_link_object_type_to_tramway_landing_blocks.rb