tramway-landing 3.1.1.9 → 3.2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44989414fa9ea2683c413dab6d7c4754827c59b6521bdbd7d904d8322a6d125
-  data.tar.gz: 07e739b85750986aca9c90fb7b1ff53341c800fd4939db4236045c66e4d0ec49
+  metadata.gz: 3f1d39d83c76954bd7017c0fe486c14abfe80196382dd09e7ea98bf5e876ca3c
+  data.tar.gz: 643f56984b540a39fa2ef99e7860bbd2512b5e8867af569ec9af87dd24cb2361
 SHA512:
-  metadata.gz: f1086cb5b3b878f65a8042e19763b8483984461cb04321135f21cb3a61b084fbec7ade774dcb52e8bcfa52901590fd1e726df337f5fee8950cedf5049f612b15
-  data.tar.gz: ac552528b5ec8cfe5c8fdc6b6d369b746b17083d92984743396513d718c5618c28f0293880806cfc6c310d2bd53ebe9c18ee3eb23191129d17c5332f7249ea47
+  metadata.gz: 51dca16a03148c007a512241d62f9b1c287d79269ccd1c1130b657b15dcf1c11b1e539b25f7967f78daf5dabbcbae335650880c8de15409d37031281531b0d43
+  data.tar.gz: 20a42a2c6c5e04fb034a5bc65449cbdf5b460157afb03c9657802c20e9495099c22ffb9a4423ca818af5e27eb44777dc5a3788b8b1f499a6d921dd9a37fdcb88

data/app/assets/javascripts/tramway/landing/application.js

@@ -8,12 +8,12 @@ $(document).ready(function() {
   });
 
   const iframe_selectors_for_video = ['iframe[src*="vk.com"]', 'iframe[src*="youtu.be"]', 'iframe[src*="youtube.com"]'];
-  for (const selector in iframe_selectors_for_video) {
+  iframe_selectors_for_video.forEach(function(selector) {
     $(selector).each(function() {
       width = $(this).parents('div').first().width();
       height = width / 16 * 9;
       $(this).width(width);
       $(this).height(height);
     });
-  }
+  })
 });

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

@@ -13,8 +13,6 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     def show_associations
       [:forms]
     end
-
-    delegate :human_view_state_event_name, to: :model_class
   end
 
   decorate_association :forms
@@ -39,7 +37,7 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def view_state
-    object.human_view_state_name
+    object.view_state
   end
 
   def link

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

@@ -20,18 +20,22 @@ module Tramway
         else
           if block.page.page_type.main?
             content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
+          else
+            block.page.title
           end
         end
       end
 
       def block_tagline(block)
-        unless block.is_a? Array
+        if block.is_a? Array
+          block.each do |_current_block|
+            raw _current_block.page.body
+          end
+        else
           if block.page.page_type.main?
             content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
           else
-            block.each do |_current_block|
-              raw block.page.body
-            end
+            raw block.page.body
           end
         end
       end

data/app/models/tramway/landing/block.rb

@@ -10,16 +10,16 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
 
   uploader :background, :photo, extensions: %i[jpg jpeg gif png]
 
-  state_machine :view_state, initial: :published do
-    state :published
+  aasm :view_state do
+    state :published, initial: true
     state :hidden
 
     event :publish do
-      transition hidden: :published
+      transitions from: :hidden, to: :published
     end
 
     event :hide do
-      transition published: :hidden
+      transitions from: :published, to: :hidden
     end
   end
 

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

@@ -1,16 +1,17 @@
-%nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
-  = link_to @application.public_name || yield(:application_name), '/', class: 'navbar-brand'
-  %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
-    - if @links&.any?
-      = fa_icon :bars
-  .collapse.navbar-collapse#navbarSupportedContent
-    - left_links = @links.is_a?(Hash) ? @links[:left] : @links
-    - if left_links&.any?
-      %ul.navbar-nav.mr-auto
-        - left_links.each do |link|
-          = render 'layouts/tramway/landing/navbar/link', link: link
-    - right_links = @links.is_a?(Hash) ? @links.dig(:right) : []
-    - if right_links&.any?
-      %ul.navbar-nav.ml-auto
-        - right_links.each do |link|
-          = render 'layouts/tramway/landing/navbar/link', link: link
+- if Tramway::Landing.navbar_for(@application_engine || @application.name)
+  %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
+    = link_to @application.public_name || yield(:application_name), '/', class: 'navbar-brand'
+    %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
+      - if @links&.any?
+        = fa_icon :bars
+    .collapse.navbar-collapse#navbarSupportedContent
+      - left_links = @links.is_a?(Hash) ? @links[:left] : @links
+      - if left_links&.any?
+        %ul.navbar-nav.mr-auto
+          - left_links.each do |link|
+            = render 'layouts/tramway/landing/navbar/link', link: link
+      - right_links = @links.is_a?(Hash) ? @links.dig(:right) : []
+      - if right_links&.any?
+        %ul.navbar-nav.ml-auto
+          - right_links.each do |link|
+            = render 'layouts/tramway/landing/navbar/link', link: link

data/app/views/layouts/tramway/landing/navbar/_link.html.haml

@@ -1,7 +1,7 @@
 - if link.is_a? Hash
   .nav-item.dropdown
     %a.nav-link.dropdown-toggle.scrollable{id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
-      = link.keys.first
+      = t("navbar.links.#{link.keys.first}")
     .dropdown-menu.dropdown-primary.scrollable{ 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'

data/app/views/tramway/landing/templates/_section_with_image_and_text.html.haml

@@ -1,5 +1,9 @@
 .row.page{ id: block.anchor }
   .col-md-7
-    = image_tag block.background.url, class: 'img-fluid'
+    - if block.background.present?
+      - background_url = block.background.is_a?(String) ? block.background : block.background.url
+      = image_tag background_url, class: 'img-fluid'
+    - else
+      - raise "Block background should valid image URL or PhotoUploader object. Block: #{block}"
   .col-md-5{ style: 'text-align: justify' }
     = render 'tramway/landing/templates/text', block: block

data/lib/tramway/landing.rb

@@ -14,6 +14,15 @@ module Tramway
       def head_content
         (defined?(@@head_content) && @@head_content) || []
       end
+
+      def set_navbar(bool, project:)
+        @@navbars ||= {}
+        @@navbars.merge! project => bool
+      end
+
+      def navbar_for(project)
+        @@navbars.with_indifferent_access[project]
+      end
     end
   end
 end

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.1.9'
+    VERSION = '3.2.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.1.9
+  version: 3.2.0.2
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email: