tramway-landing 3.1.0.6 → 3.1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e63ac0e6c73f4a430023cfcd2b012c34dc790f17a301a80253d29514e1e770ce
-  data.tar.gz: 3c9960b503437ab6a60b686df8b112953f61fbaa836f7d757704761188ede4be
+  metadata.gz: d71197a80aec79c649064328e86784a3687e1d96456c63439ae2ffef307fcc7b
+  data.tar.gz: 2ce896949b8a659e9254b990e6a98011533c0a71cdebaace792adb2f5e1f57c5
 SHA512:
-  metadata.gz: 474416ff89499f248e8d930d42051f042bb611eab3dd0193f9bcafb1a548c1b67bfdc49874f5bf5a1270c68668ffc6d7e1e56e057c6fa02ad93e3acf2e9dab79
-  data.tar.gz: 317bd1de28db9c050168eca7c341f6c20a22eac6acd4abc10bfaaffefcfb9f9bc27aae094b92f126c99b94ebead532753b17568ea6a9a513753c1a75e3c86e66
+  metadata.gz: 472a6376fa0f9a89bdb37b17abac7bd7b36544ea203da5e6691ba1b622ca63213191bcdd336f05905cb6a65f4554166812a48ad068a11bb57ad33f614d19cb34
+  data.tar.gz: 900995a5707308577e39ea717f382990ea43be4d431fe391d7803ede062f7173944e5746fdbf30ce80d40bc09e59d3f40776d3d56dd01ea560ecc16869b710cc

data/README.md

@@ -49,12 +49,45 @@ Tramway::Admin.set_available_models ::Tramway::Landing::Block, project: #{projec
 Tramway::Admin.navbar_structure ::Tramway::Landing::Block
 ```
 
-#### 4. Run server `rails s`
-#### 5. Open `localhost:3000/admin`
-#### 6. Click on `Blocks`, add new block with type `Header`
-#### 7. Click `Show` in the block menu
+#### 4. Add `PhotoVersions` to middleware (will be removed soon)
 
-#### 8. Then create your main page controller `rails g controller web/welcome`
+*lib/middleware/tramway/landing_middleware.rb*
+```ruby
+module Tramway
+  class LandingMiddleware
+    def initialize(app)
+      @app = app
+    end
+    
+    def call(env)
+      PhotoUploader.include Tramway::Landing::PhotoVersions
+      
+      @app.call(env)
+    end
+  end
+end
+```
+
+*confing/initializers/application.rb*
+```ruby
+...
+require_relative '../lib/middleware/tramway/landing_middleware'
+...
+
+module YourApplication
+  class Application < Rails::Application
+    config.middleware.use = ::Tramway::LandingMiddleware
+  end
+end
+```
+
+
+#### 5. Run server `rails s`
+#### 6. Open `localhost:3000/admin`
+#### 7. Click on `Blocks`, add new block with type `Header`
+#### 8. Click `Show` in the block menu
+
+#### 9. Then create your main page controller `rails g controller web/welcome`
 
 *app/controllers/web/welcome_controller.rb*
 ```ruby
@@ -75,7 +108,7 @@ class Web::WelcomeController < ApplicationController
 end
 ```
 
-#### 9. Add new controller to the routes
+#### 10. Add new controller to the routes
 
 *config/routes.rb*
 ```ruby
@@ -84,7 +117,7 @@ root to: 'web/welcome#index'
 # ...
 ```
 
-#### 10. Add view for the new landing
+#### 11. Add view for the new landing
 
 *app/views/web/welcome/index.html.haml*
 ```haml

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) && yield(:application_name).present? ? yield(: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) && yield(:application_tagline).present? ? yield(: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/uploaders/tramway/landing/photo_versions.rb

@@ -17,5 +17,3 @@ module Tramway::Landing::PhotoVersions
     end
   end
 end
-
-PhotoUploader.include Tramway::Landing::PhotoVersions

data/app/views/layouts/tramway/landing/application.html.haml

@@ -14,7 +14,7 @@
       = favicon_link_tag @application.favicon
     - ::Tramway::Landing.head_content.each do |content|
       - self.instance_exec &content
-  %body
+  %body{ class: @application.name }
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.4.5/css/mdb.min.css'
     = javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.4.5/js/mdb.js'
     = javascript_include_tag 'https://cdn.rawgit.com/CezarLuiz0/anchor.js/master/dist/anchor.min.js'

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,7 +19,7 @@
           .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!

data/app/views/tramway/landing/templates/_full_page.html.haml

@@ -2,7 +2,7 @@
   #intro.view.hm-black-strong{ style: "background-image: url('#{block.background.url}')" }
     .container-fluid.full-bg-img.d-flex.align-items-center.justify-content-center
       .row.d-flex.justify-content-center
-        .col-md-10.text-center
+        .col-md-12.text-center
           %h2.display-3.font-bold.white-text.mb-2
             = block.title
           %hr.hr-light

data/config/locales/templates.yml

@@ -0,0 +1,5 @@
+ru:
+  tramway:
+    landing:
+      alert:
+        sign_up_successful: Ваши данные отправлены

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.0.6'
+    VERSION = '3.1.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.0.6
+  version: 3.1.1.4
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-06-12 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