tramway-landing 3.1.1.3 → 3.1.1.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '08d7831b4585397754e140b18998cb695ec0ba23b07f6d0f80ff6b01fda43efb'
4
- data.tar.gz: 8399b98114b9e3de6b6a5bcd4b03d5ceb099181a42b44636a1e8443dd586c1ea
3
+ metadata.gz: a07142655ea5f526eac28bc7cf0a3927cc409cb109406295da0069166a4f8119
4
+ data.tar.gz: 352a98f439a4d8ff0e95c833e838813bfda780ce4e32ef91905396977efb06cc
5
5
  SHA512:
6
- metadata.gz: f4ec85b3d2c054f45138349d95088334dcbccde09cf72fd6460264e477042378c7f5615a7fbef4210c7e2f7033af7a3c16f909cc5c2f249fe5cc31de5aaf18a5
7
- data.tar.gz: a7b55670a6f4b906df8c1d05e3cdb0da1f5f377b18fafc62f0288375500b8e0f3a1060c9f98dbda48f335019124126033958ab5e0429a253e117571e18cc8797
6
+ metadata.gz: 87cb4fd35bd7397d62fc117f302cfbee55144d8a026a3c87bc7cf974eb058eaf43cd92a2329f48558fd8d8ed23c07fb3666828cc55f289595b493234defe111f
7
+ data.tar.gz: b864e61fa4e4c31be1b8015daa538545b1f18a812d56bf70b3ae5bf9547a10ab83c725c656093b82917cc2f1e3697fb14adf23f2bbcc37f5a5f9cadcaa977e01
@@ -69,3 +69,11 @@ footer
69
69
  top: 1vh
70
70
  right: 1vh
71
71
  left: 1vh
72
+
73
+ .dropdown-item:hover
74
+ background: #696969 !important
75
+
76
+ .scrollable
77
+ height: auto
78
+ max-height: 30em
79
+ overflow-x: hidden
@@ -13,18 +13,26 @@ module Tramway
13
13
  end
14
14
 
15
15
  def block_title(block)
16
- if block.page.page_type.main?
17
- content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
16
+ if block.is_a? Array
17
+ block.each do |current_block|
18
+ current_block.page.title
19
+ end
18
20
  else
19
- block.page.title
21
+ if block.page.page_type.main?
22
+ content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
23
+ end
20
24
  end
21
25
  end
22
26
 
23
27
  def block_tagline(block)
24
- if block.page.page_type.main?
25
- content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
26
- else
27
- raw block.page.body
28
+ unless block.is_a? Array
29
+ if block.page.page_type.main?
30
+ content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
31
+ else
32
+ block.each do |_current_block|
33
+ raw block.page.body
34
+ end
35
+ end
28
36
  end
29
37
  end
30
38
  end
@@ -1,5 +1,5 @@
1
1
  %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
2
- = link_to @application.public_name || yield(:application_name), '#', class: 'navbar-brand'
2
+ = link_to @application.public_name || yield(:application_name), '/', class: 'navbar-brand'
3
3
  %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
4
4
  - if @links&.any?
5
5
  = fa_icon :bars
@@ -1,8 +1,8 @@
1
1
  - if link.is_a? Hash
2
2
  .nav-item.dropdown
3
- %a.nav-link.dropdown-toggle{ id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
3
+ %a.nav-link.dropdown-toggle.scrollable{id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
4
4
  = link.keys.first
5
- .dropdown-menu.dropdown-primary{ aria: { labelledby: "dropdown_menu_button_#{link.keys.first}" } }
5
+ .dropdown-menu.dropdown-primary.scrollable{ aria: { labelledby: "dropdown_menu_button_#{link.keys.first}" } }
6
6
  - link.values.first.each do |menu_item|
7
7
  = link_to menu_item.title, menu_item.link, class: 'dropdown-item'
8
8
  - else
@@ -4,9 +4,9 @@
4
4
  .row
5
5
  .col-md-6
6
6
  %h5.title
7
- = block_title(block)
7
+ - block_title(block)
8
8
  %p
9
- = block_tagline(block)
9
+ - block_tagline(block)
10
10
  .logo_collage.effect-parent
11
11
  = yield :footer_logos
12
12
  .col-md-6
@@ -22,13 +22,13 @@
22
22
  = t('.sign_up_successful')
23
23
  - if params[:flash] == 'success_user_sign_in'
24
24
  = render 'tramway/landing/templates/alert', alert_type: :success do
25
- Sign In successful!
25
+ = t('.sign_in_successful')
26
26
  - if params[:flash] == 'error_user_sign_up'
27
27
  = render 'tramway/landing/templates/alert', alert_type: :danger do
28
- There is some errors
28
+ = t('.there_is_some_errors')
29
29
  - if params[:flash] == 'error_user_sign_in'
30
30
  = render 'tramway/landing/templates/alert', alert_type: :danger do
31
- There is some errors
31
+ = t('.invalid_email_or_password')
32
32
  .card
33
33
  .card-body
34
34
  - raise 'Initialize @header_with_form in a controller with something like that `@header_with_form = UserSignUpForm.new User.new`. `User` is your model which you want to Sign Up' unless defined?(@header_with_form)
@@ -1,29 +1,17 @@
1
1
  - records_in_the_row = 4
2
- - if phone.present? || email.present?
2
+ - if defined?(::Tramway::Profiles)
3
+ - social_networks = (@application.social_networks.active if @application.respond_to?(:social_networks)) unless social_networks
4
+ - social_networks&.each do |profile|
5
+ %ul.list-group
6
+ %li.list-group-item
7
+ = profile_link profile
8
+ - if yield(:phone).present? || yield(:email).present?
3
9
  .row.features-small.mt-5.wow.fadeIn
4
- - if phone.present?
10
+ - if yield(:phone).present?
5
11
  .col-xl-3.col-lg-6
6
12
  .row.link{ data: { href: "tel:#{phone}" } }
7
13
  .col-2
8
14
  %i.fas.fa-2x.mb-1.fa-phone.indigo-text{ aria: { hidden: 'true' } }
9
15
  .col-10.mb-2.pl-3
10
16
  %h5.feature-title.font-bold.mb-1
11
- = phone
12
- - if email.present?
13
- .col-xl-3.col-lg-6
14
- .row.link{ data: { href: "mailto:#{email}" } }
15
- .col-2
16
- %i.fas.fa-2x.mb-1.fa-envelope.indigo-text{ aria: { hidden: 'true' } }
17
- .col-10.mb-2.pl-3
18
- %h5.feature-title.font-bold.mb-1
19
- = email
20
- - social_networks&.each_slice(records_in_the_row) do |slice|
21
- .row.features-small.mt-5.wow.fadeIn
22
- - slice.each do |social_network, index|
23
- .col-xl-3.col-lg-6
24
- .row.link{ data: { href: profile_url(social_network) } }
25
- .col-2
26
- %i.fab.fa-2x.mb-1.indigo-text{ aria: { hidden: 'true' }, class: "fa-#{social_network.network_name}" }
27
- .col-10.mb-2.pl-3
28
- %h5.feature-title.font-bold.mb-1
29
- = social_network.title
17
+ = yield(:phone)
@@ -1,5 +1,9 @@
1
1
  ru:
2
2
  tramway:
3
3
  landing:
4
- alert:
5
- sign_up_successful: Ваши данные отправлены
4
+ templates:
5
+ alert:
6
+ sign_up_successful: Регистрация прошла успешно
7
+ ign_in_successful: Авторизация прошла успешно
8
+ there_is_some_errors: Исправьте ошибки
9
+ ivalid_email_or_password: email или пароль введены неверно
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Tramway
4
4
  module Landing
5
- VERSION = '3.1.1.3'
5
+ VERSION = '3.1.1.8'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-landing
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.1.3
4
+ version: 3.1.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - moshinaan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-09 00:00:00.000000000 Z
11
+ date: 2020-09-07 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Landing Engine for your Rails projects
14
14
  email: