tramway-landing 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 501a71dcbc71727af3cb1d409abe13b27ea31d884c40b6733e9e6e0ef2d0a409
-  data.tar.gz: 6a1b90dc4b3ddaa58ec8237dc65ebcc307e88e81c92edd8674734b683cd21129
+  metadata.gz: e8de38280949a53e0ef7437452cf1f2daed516eae051fa09280de23582a1c1fc
+  data.tar.gz: e124f80e17a87f9936c1bac4d44f491f3c5489c1f60d66d3a42233f61e4cd50e
 SHA512:
-  metadata.gz: '08fd152cbb5e28c11bd7a0e736bba90d944473144ec1fac3661600f1309f0a2da3af84e3b4af0f030c266bd0a917f9bb03e747c8fdb9717f5fe2350299e842ff'
-  data.tar.gz: e811456823d985f25ab0320ad3d475b3326a359c2ec4d4e7a12cb48195abb6504a5075cdd960a8fe4e0ca103c11022ad08fdac6d7ba719b79b853d3249b2eedd
+  metadata.gz: 77b94f9ab3775c9b82da7fa20ec5f11d40e6a147e439a7a74908724029b23302e9161ed435700a215b3cc574e381a59da80cce5e58d2963f39d7d84f54bb9008
+  data.tar.gz: 4e6ea88b50439ac715b6b8a25c522a14f5dea8a8a583eba06e53befee1603d992b7405fe87b570936bc0545ab134c424b6b823ab05ec214dc816da84ec909781

data/app/assets/stylesheets/tramway/landing/justified.css

@@ -1,4 +1,3 @@
-
 .image-container{
     position: relative;
 }

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

@@ -3,6 +3,10 @@ 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/layouts/tramway/landing/application.html.haml

@@ -13,7 +13,7 @@
     = yield :head_content
     -#= render 'layouts/tramway/landing/yandex_metrika'
     / Yandex.Metrika counter
-    :javascript
+    -#:javascript
       (function (d, w, c) {
           (w[c] = w[c] || []).push(function() {
               try {
@@ -38,7 +38,7 @@
               d.addEventListener("DOMContentLoaded", f, false);
           } else { f(); }
       })(document, window, "yandex_metrika_callbacks");
-    %noscript
+    -#%noscript
       %div
         %img{alt: "", src: "https://mc.yandex.ru/watch/49054148", style: "position:absolute; left:-9999px;"}/
     / /Yandex.Metrika counter
@@ -46,18 +46,17 @@
     = 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'
+    = yield :body_content
     - if @blocks&.any?
       -# FIXME
       = 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?
+      %main{ class: ('mt-5' if @blocks&.any?) }
+        .container
           - @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?
+        .container-fluid
+          = yield
       = 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

@@ -1,26 +1,13 @@
 = javascript_include_tag 'tramway/landing/smooth-scroll'
-%header
+- content_for(:navbar) do
   %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
     = link_to yield(:application_name), '#', class: 'navbar-brand'
-
     %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|
           = 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
-        .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)
-            - @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*="#"]');
+= render 'tramway/landing/blocks/templates/full_page', block: header_block(block, title: yield(:application_name), tagline: yield(:application_tagline)), buttons: @links
+%script
+  var scroll = new SmoothScroll('a[href*="#"]');

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

@@ -0,0 +1,17 @@
+%header
+  = yield :navbar
+  #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
+            = block.title
+          %hr.hr-light
+          %h4.white-text.my-4
+            = block.tagline
+          - if defined?(buttons)
+            - buttons.each do |button|
+              %button.btn.btn-outline-white.waves-effect.waves-light.header-buttons{ type: :button, data: { anchor: "##{button.link}" } }
+                = button.title
+          - else
+            = yield

data/lib/tramway/landing/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Landing
-    VERSION = '1.2.8'
+    VERSION = '1.2.9'
   end
 end

metadata

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