tramway-landing 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e26b32b7d13f6f68ec1e35bb141d6acd905f4c107752bf63dcd4b61de31f89f0
-  data.tar.gz: 784bdc4efdb3483e9e9140abf93f917aa34dff4172a9720932cc61f3f0fedf9e
+  metadata.gz: 3bfb761b8d76367640bf4a745402175dde2f503721ffe0d21cd9f6d4c2ea536e
+  data.tar.gz: 0ed2a239f80d86a38abc8d0888b2c800155e7603380ab3c0a73de8d4f99d16c5
 SHA512:
-  metadata.gz: 6273939bce92a54510c938d2ba94747beeb5f5fba8504c23bc34f452d4ba4767caab0609beeab45343c84e5b39319331e6bd3996fca28fbf5fe2355b91c58a80
-  data.tar.gz: e486c0327c24a39f2a8e96095800252786f50a6af6e7d704d69a2fc9ff3c93458b4868f05c3aaa86b9d17d8b1d5dbd0a788267f6d73a1e355a2676a0a3311a33
+  metadata.gz: 8957b32873343bbde6bced57e25a42d0f79340740f458a0372573ffffcfc48d99eb9eb5bb755c1552196926d37e71e3f79946bb0a7f4b55f4713bff8a4b2a33a
+  data.tar.gz: b9842b37545e55b23546d5f2e7af3a4f4ff6d1c9b16648c746f0450b39d4eede01133ec90498e8c4c2acccb9f33c30cbe1c0dc6b89303e51cc65f7f737a59ec9

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

@@ -5,12 +5,16 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     end
 
     def list_attributes
-      [ :position, :view_state ]
+      [ :position, :view_state, :block_type ]
     end
   end
 
   delegate :position, to: :object
 
+  def block_type
+    object.block_type_text
+  end
+
   def view_state
     object.human_view_state_name
   end

data/app/views/layouts/tramway/landing/application.html.haml

@@ -46,8 +46,9 @@
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.4.5/css/mdb.min.css'
     = javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.4.5/js/mdb.js'
     = javascript_include_tag 'https://cdn.rawgit.com/CezarLuiz0/anchor.js/master/dist/anchor.min.js'
-    - if @blocks&.any?
-      = render "tramway/landing/blocks/block_types/header", block: @blocks.header
+    - if @blocks.any?
+      -# FIXME
+      = render "tramway/landing/blocks/block_types/header", block: @blocks.on_main_page.where(block_type: :header).first
     %main{ class: ('mt-5' if @blocks&.any?) }
       .container
         - if @blocks&.any?
@@ -56,7 +57,5 @@
             = render "tramway/landing/blocks/block_types/#{block.block_type}", block: block
             - if index < array_of_blocks.count - 1
               %hr
-      .container-fluid
-        = yield
     - if @blocks&.any?
       = render "tramway/landing/blocks/block_types/footer", block: @blocks.footer

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

@@ -9,17 +9,18 @@
       %ul.navbar-nav.mr-auto
         - @blocks.with_navbar_link.each do |block|
           = menu_item block.title, "##{block.anchor}"
-  #intro.view.hm-black-strong{ style: "background-image: url('#{block.background.url}')" }
-    .container-fluid.full-bg-img.d-flex.align-items-center.justify-content-center
-      .row.d-flex.justify-content-center
-        .col-md-10.text-center
-          %h2.display-3.font-bold.white-text.mb-2
-            = yield(:application_name)
-          %hr.hr-light
-          %h4.white-text.my-4
-            = yield(:application_tagline)
-          - @blocks.with_navbar_link.each do |block|
-            %button.btn.btn-outline-white.waves-effect.waves-light.header-buttons{ type: :button, data: { anchor: "##{block.anchor}" } }
-              = block.title
+  - if block
+    #intro.view.hm-black-strong{ style: "background-image: url('#{block.background.url}')" }
+      .container-fluid.full-bg-img.d-flex.align-items-center.justify-content-center
+        .row.d-flex.justify-content-center
+          .col-md-10.text-center
+            %h2.display-3.font-bold.white-text.mb-2
+              = yield(:application_name)
+            %hr.hr-light
+            %h4.white-text.my-4
+              = yield(:application_tagline)
+            - @blocks.with_navbar_link.each do |block|
+              %button.btn.btn-outline-white.waves-effect.waves-light.header-buttons{ type: :button, data: { anchor: "##{block.anchor}" } }
+                = block.title
   %script
     var scroll = new SmoothScroll('a[href*="#"]');

data/lib/tramway/landing/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Landing
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -48,7 +48,6 @@ 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/index.html.haml
 - config/initializers/assets.rb
 - config/initializers/tramway.rb
 - config/locales/models.yml