tramway-landing 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7fea3e7b5b22978f266be26c504f87a6b5910a5b293e3dc6925e726ca999847
-  data.tar.gz: 1adb65923086c06bfcc6f5226fd2266bb720dc46a488ceb2cf4a3ea721ccd2e6
+  metadata.gz: 501a71dcbc71727af3cb1d409abe13b27ea31d884c40b6733e9e6e0ef2d0a409
+  data.tar.gz: 6a1b90dc4b3ddaa58ec8237dc65ebcc307e88e81c92edd8674734b683cd21129
 SHA512:
-  metadata.gz: e4c8265c9a4a9f6ccf1722870ec42579050b773b62934f9351959e36fef43ee452417c7f9e25f849ac78f177ef267bbb92d70276f767a85b7e1ab95c826a6cbb
-  data.tar.gz: 1fccec0fbe57b970ecfe2ce3adc0ae863f3f1cdbd922fce76e3654114c96b8370ccd55e0f74cda9b66a4484d464e5ecb0c7c43004f406b5b53bb0cbdfcb60a91
+  metadata.gz: '08fd152cbb5e28c11bd7a0e736bba90d944473144ec1fac3661600f1309f0a2da3af84e3b4af0f030c266bd0a917f9bb03e747c8fdb9717f5fe2350299e842ff'
+  data.tar.gz: e811456823d985f25ab0320ad3d475b3326a359c2ec4d4e7a12cb48195abb6504a5075cdd960a8fe4e0ca103c11022ad08fdac6d7ba719b79b853d3249b2eedd

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

@@ -10,6 +10,8 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   delegate :position, to: :object
+  delegate :title, to: :object
+  delegate :background, to: :object
 
   def block_type
     object.block_type_text
@@ -19,6 +21,10 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     object.human_view_state_name
   end
 
+  def link
+    "##{object.anchor}"
+  end
+
   def view_state_button_color(event)
     case event
     when :publish

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

@@ -48,16 +48,16 @@
     = javascript_include_tag 'https://cdn.rawgit.com/CezarLuiz0/anchor.js/master/dist/anchor.min.js'
     - if @blocks&.any?
       -# FIXME
-      = render "tramway/landing/blocks/block_types/header", block: @blocks.on_main_page.where(block_type: :header).first
+      = render "tramway/landing/blocks/block_types/header", block: @blocks.select { |block| block.model.block_type.header? }.first
     %main{ class: ('mt-5' if @blocks&.any?) }
       .container
         - if @blocks&.any?
-          - array_of_blocks = (@blocks - [@blocks.header] - [@blocks.footer]) 
-          - array_of_blocks.each_with_index do |block, index|
-            = render "tramway/landing/blocks/block_types/#{block.block_type}", block: block
-            - if index < array_of_blocks.count - 1
-              %hr
+          - @blocks.each_with_index do |block, index|
+            - if !block.model.block_type.header? && !block.model.block_type.footer?
+              = 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
+      = render "tramway/landing/blocks/block_types/footer", block: @blocks.select { |block| block.model.block_type.footer? }.first

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

@@ -7,8 +7,8 @@
       = fa_icon :bars
     .collapse.navbar-collapse#navbarSupportedContent
       %ul.navbar-nav.mr-auto
-        - @blocks.with_navbar_link.each do |block|
-          = menu_item block.title, "##{block.anchor}"
+        - @links.each do |link|
+          = menu_item link.title, link.link
   - 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
@@ -19,8 +19,8 @@
             %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
+            - @links.each do |link|
+              %button.btn.btn-outline-white.waves-effect.waves-light.header-buttons{ type: :button, data: { anchor: "##{link.link}" } }
+                = link.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.7'
+    VERSION = '1.2.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-21 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email: