app/helpers/tramway/landing/application_helper.rb in tramway-landing-3.1.1.3 vs app/helpers/tramway/landing/application_helper.rb in tramway-landing-3.1.1.4
- old
+ new
@@ -11,21 +11,29 @@
forms = forms.reject { |f| f.form_name == 'user_sign_in' } if @signed_in
forms
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
end
end