Showing
6 changed files
with
13 additions
and
6 deletions
| @@ -254,11 +254,18 @@ var csrf_token = $('meta[name=csrf-token]').attr('content'), | @@ -254,11 +254,18 @@ var csrf_token = $('meta[name=csrf-token]').attr('content'), | ||
| 254 | $cell.append($content); | 254 | $cell.append($content); |
| 255 | 255 | ||
| 256 | $content.find('.edit').click(function(){ | 256 | $content.find('.edit').click(function(){ |
| 257 | + alert('1'); | ||
| 258 | + var $iframe = $('<iframe name="content-edit" style="width:500px;height:500px;position: absolute;top: 10%;left: 50%;transform: translateX(-50%);border: 0;" src = "http://www.w3schools.com">This text ensures cross browser compatibility </iframe>'); | ||
| 259 | + $('body').append($iframe); | ||
| 260 | + alert(edit_layer_url); | ||
| 261 | + return; | ||
| 262 | + | ||
| 257 | var $block = $(this).closest('.col'), | 263 | var $block = $(this).closest('.col'), |
| 258 | page_data_id = $block.data('page_data_id'), | 264 | page_data_id = $block.data('page_data_id'), |
| 259 | structure_id = $block.data('id'); | 265 | structure_id = $block.data('id'); |
| 260 | 266 | ||
| 261 | 267 | ||
| 268 | + | ||
| 262 | //show editor for content | 269 | //show editor for content |
| 263 | if(typeof(edit_layer_url) != undefined){ | 270 | if(typeof(edit_layer_url) != undefined){ |
| 264 | jQuery.ajax({ | 271 | jQuery.ajax({ |
| @@ -137,7 +137,7 @@ module Kanjai | @@ -137,7 +137,7 @@ module Kanjai | ||
| 137 | when '###VARIABLE_FOR_EDIT_CONTENT###' | 137 | when '###VARIABLE_FOR_EDIT_CONTENT###' |
| 138 | content = '' | 138 | content = '' |
| 139 | if current_admin_user | 139 | if current_admin_user |
| 140 | - content = show_frontend_editor_admin_page_url(@page_data.page) | 140 | + content = show_editor_admin_page_url(@page_data.page, lang: @page_data.lang) |
| 141 | end | 141 | end |
| 142 | layer.gsub!(marker, content) | 142 | layer.gsub!(marker, content) |
| 143 | when '###CSRF_PARAM###' | 143 | when '###CSRF_PARAM###' |
| @@ -181,7 +181,7 @@ module Kanjai | @@ -181,7 +181,7 @@ module Kanjai | ||
| 181 | def file_expiring_url | 181 | def file_expiring_url |
| 182 | url = nil | 182 | url = nil |
| 183 | if self.original_file_name.present? | 183 | if self.original_file_name.present? |
| 184 | - object = S3_BUCKET.object("#{self.template_content_path}#{self.original_file_name}") | 184 | + object = S3_BUCKET.object("#{self.get_file_path}#{self.original_file_name}") |
| 185 | if object | 185 | if object |
| 186 | url = object.presigned_url(:get, expires_in: 3600) | 186 | url = object.presigned_url(:get, expires_in: 3600) |
| 187 | end | 187 | end |
| @@ -3,5 +3,5 @@ | @@ -3,5 +3,5 @@ | ||
| 3 | </div> | 3 | </div> |
| 4 | 4 | ||
| 5 | <script type="text/javascript"> | 5 | <script type="text/javascript"> |
| 6 | - var edit_layer_url = '<%= show_frontend_editor_admin_page_url(@page_data.page) %>'; | 6 | + var edit_layer_url = '<%= show_editor_admin_page_url(@page_data.page, lang: @page_data.lang) %>'; |
| 7 | </script> | 7 | </script> |