tramway-landing 3.1.0.4 → 3.1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 848e46b999c43e6b0676bee3686da04f3ddfcda22b43fe3d790ce940068e2378
-  data.tar.gz: 30bf6c2c2b47b98fcea363232788e84f5e07b0c79f6314da0cc125f1e564b67f
+  metadata.gz: 57f2d1b3f419bb1bb445ddbdaaeddfaff7e36ff793996ebdf01ee8ee02af12eb
+  data.tar.gz: a6b60de0abf7774981099ae62a6a6a9deea359ffc2a78df092eef19647d2ab1b
 SHA512:
-  metadata.gz: 75a1806b94151a21e1054aa122880744972166d744bf96e062d0a3890f33262a9699c6a98c9a0821925e2789f36a5dbe8e2060e96a2cdac9c5ce4fea18504dde
-  data.tar.gz: ae3a63381cf2848da74cf8eabb563f4409f813dc68e86209a07d73b8d7d4c99d7a5cfe14c771addc3a70a9ee41261b3677dd4da783dda557119eb8fcfb72cd86
+  metadata.gz: a344b8c9013efd19eb212656411ba9a28551fba244886328fd515ebc32d832a90ad2a713ff71af926323ad2f8d3804286baebf772f88d6e91a9c6aab4ac54d29
+  data.tar.gz: 6125433fabb4a07aece199dd5b6c14ffe67c03e97a008fbbb8980a990e01bd6b2c1e21afdd545e74606aea648430cacb0033bf8fe4a636addb1b1acfabc44bdf

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

@@ -18,6 +18,7 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   decorate_association :forms
+  decorate_association :page
 
   delegate_attributes :position, :title, :background, :anchor, :description, :view_name
 
@@ -57,9 +58,9 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def button
-    if object.button.present? && object.button['title'].present? && object.button['link'].present?
-      content_tag :a, href: object.button['link'], target: '_blank', class: 'btn btn-primary' do
-        object.button['title']
+    if object.button.present? && object.button['button_title'].present? && object.button['button_link'].present?
+      content_tag :a, href: object.button['button_link'], target: '_blank', class: 'btn btn-primary' do
+        object.button['button_title']
       end
     end
   end

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

@@ -11,6 +11,22 @@ module Tramway
         forms = forms.select { |f| f.form_name != 'user_sign_in' } if @signed_in
         forms
       end
+      
+      def block_title(block)
+        if block.page.page_type.main?
+          (content_for?(:application_name) && yield(:application_name).present?) ? yield(:application_name) : @application.public_name
+        else
+          block.page.title
+        end
+      end
+
+      def block_tagline(block)
+        if block.page.page_type.main?
+          (content_for?(:application_tagline) && yield(:application_tagline).present?) ? yield(:application_tagline) : @application.tagline
+        else
+          raw block.page.body
+        end
+      end
     end
   end
 end

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

@@ -4,9 +4,9 @@
     .row
       .col-md-6
         %h5.title
-          = @application.title
+          = block_title(block)
         %p
-          = @application.tagline
+          = block_tagline(block)
         .logo_collage.effect-parent
           = yield :footer_logos
       .col-md-6

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

@@ -1,4 +1,4 @@
 = javascript_include_tag 'tramway/landing/smooth-scroll'
-= render 'tramway/landing/templates/full_page', block: OpenStruct.new(title: yield(:application_name).present? ? yield(:application_name) : @application.public_name, tagline: yield(:application_tagline).present? ? yield(:application_tagline) : @application.tagline, background: block.background), buttons: @links&.select { |link| !link.is_a? Hash }
+= render 'tramway/landing/templates/full_page', block: OpenStruct.new(title: block_title(block), tagline: block_tagline(block), background: block.background), buttons: @links&.select { |link| !link.is_a? Hash }
 %script
   var scroll = new SmoothScroll('a[href*="#"]');

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.0.4'
+    VERSION = '3.1.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.0.4
+  version: 3.1.0.5
 platform: ruby
 authors:
 - moshinaan