tramway-landing 3.1.1.2 → 3.1.1.7

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: 41dc80ce521db8c83b528ddcd0d52d510104a9a4310e3f10c0ab63ba544f8f86
4
- data.tar.gz: 3978872729e584e6c38d616679cb5c5cd18307a0d26e34fafcec460b3ed3e599
3
+ metadata.gz: c6b78d726a3daaf268e64091a5b2297a492efd96be608e4230c8bcfbaaa7299e
4
+ data.tar.gz: f13bb12075bd2fc9e55b873be2224ed92f91526302026ad163f5dca3a3a29208
5
5
  SHA512:
6
- metadata.gz: 1105c2f9aee1db673c8587c9a91535d5826ab48b5b37ea1f0500b05fa01548b4a1668e791da19aa0642e8de9d100293c219ba70a7b4193c8224dd194985fc837
7
- data.tar.gz: a7ec480ba9729455ef83f97e57278132b6529340a8b7613f35c3a03e78ded8822b1f0a4892024f111d086567d9b18a07fc2b9a36ca502a93b7a1d8708ac1f0cd
6
+ metadata.gz: a35799395d9ea839b565c1e6264fd57539e7cd23dc9e6acfc463759ab8317beb281b4e19ae4bb3edc4e62631fd2c61d194e46d669a1fc0c234663c6611e71777
7
+ data.tar.gz: 23a1ca28601fcea4363e977e21addb5b3ba2aad3274b4c9308ab8cc893351732a71a4bfc4a06180d5cee0918ec7b070066196c01afb070e21739433c4a3befc6
@@ -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
@@ -19,16 +19,16 @@
19
19
  .col-md-6.col-xl-5.mb-4
20
20
  - if params[:flash] == 'success_user_sign_up'
21
21
  = render 'tramway/landing/templates/alert', alert_type: :success do
22
- Sign up successful!
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)
@@ -0,0 +1,9 @@
1
+ ru:
2
+ tramway:
3
+ landing:
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.2'
5
+ VERSION = '3.1.1.7'
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.2
4
+ version: 3.1.1.7
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-08-14 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Landing Engine for your Rails projects
14
14
  email:
@@ -77,6 +77,7 @@ files:
77
77
  - config/locales/ru.forms.yml
78
78
  - config/locales/ru.models.yml
79
79
  - config/locales/ru.state_machines.yml
80
+ - config/locales/templates.yml
80
81
  - config/routes.rb
81
82
  - lib/tasks/tramway/landing_tasks.rake
82
83
  - lib/tramway/landing.rb