tramway-landing 3.1.1.5 → 3.1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cdf40a2a324672c52c438e27d760d6a25a74bf5254b2904d357354bb52ee2bb
-  data.tar.gz: 1afc8e68a3b43c2f50d38a2bc25673e4d055762d6fae81d1f935b30e9fa3fdd3
+  metadata.gz: 6357cedad3d2422008f3d4e6bad426889c79ece0e777041fe34988f72536b757
+  data.tar.gz: be5301c2c4dfc3e64ca2db13b6e8d4b3bf69f1e82388ad99f8139a48dc55968d
 SHA512:
-  metadata.gz: f174636195a5d28be61a438e67021db93e3cab990bf8fe356da21fe62cb83826fbfffc0deea3e02e1bd27780a180027c7e08adaff6842f8308a3807ca3cbc739
-  data.tar.gz: b76eecea6f7c4055c0238032cd0477474796bc1950207d3f3ad16268533258503f0f4b34536c859bad155abc728c7e83eddccdb2d628d2147a98afecd587b019
+  metadata.gz: 9caf4587006b41ca494e6af23b18bbd383213c99ac61a47a802c70f4e8483aaf03ed452998b4e27865d0b0e1e59b3e15d8f10311bc6e0f1615f4f39bf624014b
+  data.tar.gz: 0dcc7a118571778183d033984de220038de36ba3808c7647652487cd2c6963c6572e54dedda32d10922a970fd38c52b60c57a9cfbaf1db5821fec33ff81912eb

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

@@ -1,5 +1,5 @@
 %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
-  = link_to @application.public_name || yield(:application_name), '#', class: 'navbar-brand'
+  = 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

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/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.5'
+    VERSION = '3.1.1.10'
   end
 end

metadata

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