Commit 5562b757045eb8b8bd10c081ac2a1b001f3750e6

Authored by Karpikau Andrei
1 parent c649c603

add template for render row and cell

@@ -105,7 +105,7 @@ module Kanjai @@ -105,7 +105,7 @@ module Kanjai
105 cells = '' 105 cells = ''
106 row["cells"].each do |cell| 106 row["cells"].each do |cell|
107 page_content = page_data.page_contents.where(:structure_id => cell['id']).first 107 page_content = page_data.page_contents.where(:structure_id => cell['id']).first
108 - html = page_content.nil? ? '' : page_content.get_content_frontend 108 + html_content = page_content.nil? ? '' : page_content.get_content_frontend
109 cell_class_name = cell['className'] 109 cell_class_name = cell['className']
110 110
111 data_attributes = [ 111 data_attributes = [
@@ -116,7 +116,7 @@ module Kanjai @@ -116,7 +116,7 @@ module Kanjai
116 "data-class=#{cell['className']}", 116 "data-class=#{cell['className']}",
117 ] 117 ]
118 118
119 - cells += ApplicationController.render file: 'kanjai/pages/templates/cell', assigns: {content: html.html_safe, cell: cell, class_name: cell_class_name, data_attributes: data_attributes.join(' ')}, layout: false 119 + cells += ApplicationController.render file: 'kanjai/pages/templates/cell', assigns: {content: html_content.html_safe, cell: cell, class_name: cell_class_name, data_attributes: data_attributes.join(' ')}, layout: false
120 end 120 end
121 121
122 html += ApplicationController.render(file: 'kanjai/pages/templates/row', assigns: {content: cells.html_safe}, layout: false).html_safe 122 html += ApplicationController.render(file: 'kanjai/pages/templates/row', assigns: {content: cells.html_safe}, layout: false).html_safe
1 -<div class="row"> 1 +<div class="row-fluid clearfix">
2 <%= @content %> 2 <%= @content %>
3 </div> 3 </div>
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.128" 2 + VERSION = "0.0.129"
3 end 3 end