tramway-landing 1.8.1 → 1.8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3212d34d48f9939cf2ec801429d8fe85b00f09dac5e8216e307dc998704941
-  data.tar.gz: cc2367afc4f7ad7829c7fd8202a33acd297e7cfaefd558c9ae8c6ef639d0ad91
+  metadata.gz: 960b1900395fe32d4f852b98a4f4422061aa3dc96c3b4e2e58f101a305b49409
+  data.tar.gz: 685673f79894feb98a5a4df039a858b579ca9707db17e71fcc631be3447d1282
 SHA512:
-  metadata.gz: 6ae5bbaaa6cb943b25cf37e96b468012c9c8405040f1bedb31f4ad0b32c96b3ebf573e62136a4fbea19faf5fb9a0309b000d2845e51ad1d39b3ec1e62229e446
-  data.tar.gz: 2ebbb863f7ffbdd5698d9d2b12130544cb0a73d5a77a16458a09e2088c6ae5644fa6611de2462f8b030917528094151d6b61391aeb42da82e840d7999cca7c57
+  metadata.gz: 8e8acf2851295fd2866b931d76d94af04fdd9a586f1d0a0608dc46cb943924b2b738ad19741d0247d00d7cbbcf2893947514aa14c23e7c2ec82bf3f0ad76bd4a
+  data.tar.gz: 8f2afe97bf62b59d5acaa0b684478429c0be5c9677911c2f3594df9496b4d3abec17a2c7ba68b261db080863cce6101d41e9d89d155380758b88e319f68257e5

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

@@ -5,10 +5,6 @@ module Tramway
     module ApplicationHelper
       include Tramway::Admin::RussianCasesHelper
       include Tramway::Profiles::LinksHelper
-
-      def header_block(block, title:, tagline:)
-        OpenStruct.new title: title, tagline: tagline, background: block.background
-      end
     end
   end
 end

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

@@ -5,17 +5,18 @@
     %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
       = fa_icon :bars
     .collapse.navbar-collapse#navbarSupportedContent
-      %ul.navbar-nav.mr-auto
-        - @links.each do |link|
-          - if link.is_a? Hash
-            .nav-item.dropdown
-              %a.nav-link.dropdown-toggle{ id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
-                = t(".#{link.keys.first}")
-              .dropdown-menu.dropdown-primary{ aria: { labelledby: "dropdown_menu_button_#{link.keys.first}" } }
-                - link.values.first.each do |menu_item|
-                  = link_to menu_item.title, menu_item.link, class: 'dropdown-item'
-          - else
-            = menu_item link.title, link.link
-= render 'tramway/landing/blocks/templates/full_page', block: header_block(block, title: yield(:application_name), tagline: yield(:application_tagline)), buttons: @links.select { |link| !link.is_a? Hash }
+      - if @links&.any?
+        %ul.navbar-nav.mr-auto
+          - @links.each do |link|
+            - if link.is_a? Hash
+              .nav-item.dropdown
+                %a.nav-link.dropdown-toggle{ id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
+                  = t(".#{link.keys.first}")
+                .dropdown-menu.dropdown-primary{ aria: { labelledby: "dropdown_menu_button_#{link.keys.first}" } }
+                  - link.values.first.each do |menu_item|
+                    = link_to menu_item.title, menu_item.link, class: 'dropdown-item'
+            - else
+              = menu_item link.title, link.link
+= render 'tramway/landing/blocks/templates/full_page', block: OpenStruct.new(title: yield(:application_name), tagline: yield(:application_tagline), background: block.background), buttons: @links&.select { |link| !link.is_a? Hash }
 %script
   var scroll = new SmoothScroll('a[href*="#"]');

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

@@ -9,7 +9,7 @@
           %hr.hr-light
           %h4.white-text.my-4
             = block.tagline
-          - if defined?(buttons)
+          - if defined?(buttons) && buttons&.any?
             - buttons.each do |button|
               - data_obj = {}
               - data_obj = data_obj.merge(href: button.link) if button.try :link

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '1.8.1'
+    VERSION = '1.8.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Landing Engine for your Rails projects