tramway-landing 3.1.1.1 → 3.1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9815cf619ada642aa9d5f68b7c322f74ae2541c18ff105c8b100b7a603b65b
-  data.tar.gz: 809f5a0d8f1bd62dbe6c7a092c4f988f32f875784a8ba85a08f08ad16b967bce
+  metadata.gz: 767b052086cbf7f477174d75bda91e73dfeb5337e493feba0ccc8c0548faaaaa
+  data.tar.gz: 27666e7247984a3b8fabe85dfa4c7795acb9a34dcb3d856a8e3675e0634f3f7b
 SHA512:
-  metadata.gz: 7acfeb6e279f8f11708287c50fbef4ec82a9f6e38217d88de00f47db94dccb083245c992f8bb42560c5f2c096da3d973c5878aadadbca0ec61d40e48cebb97ba
-  data.tar.gz: 853f6e6a4eaf19d77a9128d7185d2e502d41df33bb5558f21995e40bc0d8897434741feb8a3b6d9b6eb32f072b0711af8f39d986022251182390e4fdae70796c
+  metadata.gz: 74251e5ceabadaa9fc4afa2a5a40281c25cc40b5cc677ecf922ad2109a015078bc1b16a39999b2c1e92e4e2db16304f608941277b6ba692413111e0ed1ddf9e7
+  data.tar.gz: 5737f7759dc703945a14d2238db3cd638096a48f98f4db01bb9deefe65fe12a234b00af6df9c6a0b5f240fdba9449c20fcb771760c43bf36b80a91df72d1e577

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

@@ -13,18 +13,26 @@ module Tramway
       end
 
       def block_title(block)
-        if block.page.page_type.main?
-          content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
+        if block.is_a? Array
+          block.each do |current_block|
+            current_block.page.title
+          end
         else
-          block.page.title
+          if block.page.page_type.main?
+            content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
+          end
         end
       end
 
       def block_tagline(block)
-        if block.page.page_type.main?
-          content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
-        else
-          raw block.page.body
+        unless block.is_a? Array
+          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
+          end
         end
       end
     end

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/tramway/landing/blocks/block_types/_footer.html.haml

@@ -4,9 +4,9 @@
     .row
       .col-md-6
         %h5.title
-          = block_title(block)
+          - block_title(block)
         %p
-          = block_tagline(block)
+          - block_tagline(block)
         .logo_collage.effect-parent
           = yield :footer_logos
       .col-md-6

data/app/views/tramway/landing/blocks/block_types/_header_with_form.html.haml

@@ -19,16 +19,16 @@
           .col-md-6.col-xl-5.mb-4
             - if params[:flash] == 'success_user_sign_up'
               = render 'tramway/landing/templates/alert', alert_type: :success do
-                Sign up successful!
+                = t('.sign_up_successful')
             - if params[:flash] == 'success_user_sign_in'
               = render 'tramway/landing/templates/alert', alert_type: :success do
-                Sign In successful!
+                = t('.sign_in_successful')
             - if params[:flash] == 'error_user_sign_up'
               = render 'tramway/landing/templates/alert', alert_type: :danger do
-                There is some errors
+                = t('.there_is_some_errors')
             - if params[:flash] == 'error_user_sign_in'
               = render 'tramway/landing/templates/alert', alert_type: :danger do
-                There is some errors
+                = t('.invalid_email_or_password')
             .card
               .card-body
                 - 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)

data/config/locales/templates.yml

@@ -0,0 +1,9 @@
+ru:
+  tramway:
+    landing:
+      templates:
+        alert:
+          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.1'
+    VERSION = '3.1.1.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.1.1
+  version: 3.1.1.6
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -77,6 +77,7 @@ files:
 - config/locales/ru.forms.yml
 - config/locales/ru.models.yml
 - config/locales/ru.state_machines.yml
+- config/locales/templates.yml
 - config/routes.rb
 - lib/tasks/tramway/landing_tasks.rake
 - lib/tramway/landing.rb