tramway-landing 3.1.1.6 → 3.1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767b052086cbf7f477174d75bda91e73dfeb5337e493feba0ccc8c0548faaaaa
-  data.tar.gz: 27666e7247984a3b8fabe85dfa4c7795acb9a34dcb3d856a8e3675e0634f3f7b
+  metadata.gz: 259d9429acccbee8e412ba037adf4381c0e4c172db64825b8fce1cc3d2b3656e
+  data.tar.gz: 18dfc48764721a6e6ce2758ccc3890998694d947fdbbbd81f0cda564b329b446
 SHA512:
-  metadata.gz: 74251e5ceabadaa9fc4afa2a5a40281c25cc40b5cc677ecf922ad2109a015078bc1b16a39999b2c1e92e4e2db16304f608941277b6ba692413111e0ed1ddf9e7
-  data.tar.gz: 5737f7759dc703945a14d2238db3cd638096a48f98f4db01bb9deefe65fe12a234b00af6df9c6a0b5f240fdba9449c20fcb771760c43bf36b80a91df72d1e577
+  metadata.gz: 1f651258e6e670687fa85e0d43d3d951a4f2f8a857394f907823e60926fbcf957e6213d3488a6b68ced67a0e3ea0a42385f4aa0a25bc235b0eb4a124a5366459
+  data.tar.gz: 7253ae02f50de70c4e0eef25a29022432af5ebd66eef3223e3e59cd650d3a8aa30d0227ab5cd718f5e31a81364aaa0ac8adb31492e869f7ad92cbed00d8dd93a

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/assets/stylesheets/tramway/landing/application.sass

@@ -69,3 +69,11 @@ footer
     top: 1vh
     right: 1vh
     left: 1vh
+    
+.dropdown-item:hover
+  background: #696969 !important
+
+.scrollable
+  height: auto
+  max-height: 30em
+  overflow-x: hidden

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/views/layouts/tramway/landing/navbar/_link.html.haml

@@ -1,8 +1,8 @@
 - 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 } }
+    %a.nav-link.dropdown-toggle.scrollable{id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
       = link.keys.first
-    .dropdown-menu.dropdown-primary{ aria: { labelledby: "dropdown_menu_button_#{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'
 - else

data/app/views/tramway/landing/blocks/block_types/contacts/_without_map.html.haml

@@ -1,29 +1,17 @@
 - records_in_the_row = 4
-- if phone.present? || email.present?
+- if defined?(::Tramway::Profiles)
+  - social_networks = (@application.social_networks.active if @application.respond_to?(:social_networks)) unless social_networks
+  - social_networks&.each do |profile|
+    %ul.list-group
+      %li.list-group-item
+        = profile_link profile
+- if yield(:phone).present? || yield(:email).present?
   .row.features-small.mt-5.wow.fadeIn
-    - if phone.present?
+    - if yield(:phone).present?
       .col-xl-3.col-lg-6
         .row.link{ data: { href: "tel:#{phone}" } }
           .col-2
             %i.fas.fa-2x.mb-1.fa-phone.indigo-text{ aria: { hidden: 'true' } }
           .col-10.mb-2.pl-3
             %h5.feature-title.font-bold.mb-1
-              = phone
-    - if email.present?
-      .col-xl-3.col-lg-6
-        .row.link{ data: { href: "mailto:#{email}" } }
-          .col-2
-            %i.fas.fa-2x.mb-1.fa-envelope.indigo-text{ aria: { hidden: 'true' } }
-          .col-10.mb-2.pl-3
-            %h5.feature-title.font-bold.mb-1
-              = email 
-- social_networks&.each_slice(records_in_the_row) do |slice|
-  .row.features-small.mt-5.wow.fadeIn
-    - slice.each do |social_network, index|
-      .col-xl-3.col-lg-6
-        .row.link{ data: { href: profile_url(social_network) } }
-          .col-2
-            %i.fab.fa-2x.mb-1.indigo-text{ aria: { hidden: 'true' }, class: "fa-#{social_network.network_name}" }
-          .col-10.mb-2.pl-3
-            %h5.feature-title.font-bold.mb-1
-              = social_network.title
+              = yield(:phone)

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/config/locales/templates.yml

@@ -3,7 +3,8 @@ ru:
     landing:
       templates:
         alert:
+          invalid_email_or_password: Пользователь не найден или введен неверный пароль
           sign_up_successful: Регистрация прошла успешно
           ign_in_successful: Авторизация прошла успешно
           there_is_some_errors: Исправьте ошибки
-          ivalid_email_or_password: email или пароль введены неверно
+          

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.1.6'
+    VERSION = '3.1.1.11'
   end
 end

metadata

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