check issues

@@ -1406,6 +1406,7 @@ function send_ajax_form($form){
             $('#progress-window').modal('hide');
             $('#progress-window').remove();
             $(window).trigger('images:update');
+            $form.find('.hidden-file-link').remove();
         });
     }
 }
@@ -1447,7 +1448,7 @@ var addFileForAjaxUpload = function(selector, $form){
                     $this.fileupload('send', {files: fileToSend})
                         .done(function (result, textStatus, jqXHR) {
                             count_upload = count_upload + 1;
-                            if(count_upload == count_files){
+                            if(count_upload == count_files){                                
                                 send_ajax_form($form);
                             }
 
@@ -1512,7 +1513,7 @@ var initAjaxFileUpload = function(selector){
           var url = 'https://' + fileInputElem.data('host') + '/' + key;
 
           // create hidden field
-          var input = $("<input />", {type: 'hidden', name: fileInputElem.attr('name'), value: url})
+          var input = $("<input />", {type: 'hidden', class: 'hidden-file-link', name: fileInputElem.attr('name'), value: url})
           form.append(input);
           fileInputElem.val('');
         },
@@ -1927,6 +1928,11 @@ jQuery(document).ready(function(){
         });
     });
 
+    $('.choose-lang').change(function(){
+      var url = $(this).find('option:selected').data('url');
+      document.location.href = url;
+    });
+
 });
 
 

@@ -71,50 +71,59 @@ jQuery(document).ready(function(){
     });
 
     $('.html-generator').on('click', '.col-operation .col-remove', function(){
-        var $this = $(this),
-            $cell = $this.closest('.col'),
-            $block = $cell.closest('.html-generator'),
-            delete_cell_url = $block.data('delete_cell_url');
-
-        //$cell.data('id')
+        var $this = $(this);
+        bootbox.confirm('Are you sure?', function(result) {
+            if (result) {
+                var $cell = $this.closest('.col'),
+                    $block = $cell.closest('.html-generator'),
+                    delete_cell_url = $block.data('delete_cell_url');
+
+                //$cell.data('id')
+
+                jQuery.ajax({
+                    type: 'POST',
+                    url: delete_cell_url,
+                    data: {structure_id: $cell.data('id')},
+                    success: function (data) {
+                        $cell.remove();
+                    }
+                });
 
-        jQuery.ajax({
-            type: 'POST',
-            url: delete_cell_url,
-            data: {structure_id: $cell.data('id')},
-            success: function (data) {
-                $cell.remove();
-            }
+            };
         });
 
 
 
-
         return false;
     });
 
 
     $('.html-generator').on('click', '.row-operation .row-remove', function(){
-        var $this = $(this),
-            $row = $this.closest('.row-fluid'),
-            $block = $row.closest('.html-generator'),
-            delete_cell_url = $block.data('delete_cell_url'),
-            mas_cell_id = [];
-
-        $row.find('.col').each(function(){
-            mas_cell_id.push($(this).data('id'));
-        });
+        var $this = $(this);
+        bootbox.confirm('Are you sure?', function(result) {
+            if (result) {
+                var $row = $this.closest('.row-fluid'),
+                    $block = $row.closest('.html-generator'),
+                    delete_cell_url = $block.data('delete_cell_url'),
+                    mas_cell_id = [];
+
+                $row.find('.col').each(function(){
+                    mas_cell_id.push($(this).data('id'));
+                });
 
-        jQuery.ajax({
-            type: 'POST',
-            url: delete_cell_url,
-            data: {structure_ids: mas_cell_id},
-            success: function (data) {
-                $row.remove();
+                jQuery.ajax({
+                    type: 'POST',
+                    url: delete_cell_url,
+                    data: {structure_ids: mas_cell_id},
+                    success: function (data) {
+                        $row.remove();
+                    }
+                });
             }
         });
 
 
+
         return false;
     });
 
@@ -434,14 +443,14 @@ jQuery(document).ready(function(){
     var showCellAction = function(statusClass){
         var content = '<div class="col-operation">'+
                         '<div class="dropdown">' +
-                            '<button class="btn-xs btn-outline-primary  dropdown-toggle dropdown-toggle-nocaret" type="button" data-toggle="dropdown" aria-expanded="false">' +
+                            '<a class="dropdown-toggle dropdown-toggle-nocaret" type="button" data-toggle="dropdown" aria-expanded="false">' +
                                 '<span class="dropdown-text"><span class="icon icon-options-vertical"></span></span>' +
-                            '</button>' +
+                            '</a>' +
                             '<ul class="dropdown-menu">' +
                                 '<li class="dropdown-item"><a class="col-disable" href="javascript;void(0);">'+  statusClass +'</a></li>' +
+                                '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Edit</a></li>' +                                
                                 '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>' +
-                                '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Content</a></li>' +
-                                '<li class="dropdown-item"><a class="col-edit popover-link" href="javascript;void(0);">Edit</a></li>' +
+                                '<li class="dropdown-item"><a class="col-edit popover-link" href="javascript;void(0);">Settings</a></li>' +
                                 '<li class="dropdown-item"><a class="col-remove" href="javascript;void(0);">Remove</a></li>' +
                             '</ul>'+
                         '</div>' + 
@@ -453,16 +462,18 @@ jQuery(document).ready(function(){
     var showRowAction = function(statusClass, isBlockElement){
         var content = '<div class="row-operation">'+
                         '<div class="dropdown">' +
-                            '<button class="btn-xs btn-outline-primary  dropdown-toggle dropdown-toggle-nocaret" type="button" data-toggle="dropdown" aria-expanded="false">' +
+                            '<a class="  dropdown-toggle dropdown-toggle-nocaret" type="button" data-toggle="dropdown" aria-expanded="false">' +
                                 '<span class="dropdown-text"><span class="icon icon-options-vertical"></span></span>' +
-                            '</button>' +
+                            '</a>' +
                             '<ul class="dropdown-menu">' +
-                                '<li class="dropdown-item"><a class="col-disable" href="javascript;void(0);">'+  statusClass +'</a></li>' +
-                                '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>';
+                                '<li class="dropdown-item"><a class="col-disable" href="javascript;void(0);">'+  statusClass +'</a></li>'
 
                                 if (isBlockElement){
-                                    content += '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Content</a></li>';
+                                    content += '<li class="dropdown-item"><a class="col-content" href="javascript;void(0);">Edit</a></li>';
                                 }
+
+                                content += '<li class="dropdown-item"><a class="col-duplicate" href="javascript;void(0);">Duplicate</a></li>';
+
                                 content += '<li class="dropdown-item"><a class="row-remove" href="javascript;void(0);">Remove</a></li>';
 
                 content += '</ul>'+

@@ -5226,14 +5226,14 @@ body .jvectormap-zoomout {
 }
 
 .html-generator .html-content .row-inner{
-
   width:100%;
 }
 
+
 .html-generator .html-content .row-element-block, .html-generator .html-content .row-element-row{
   position:relative;
   padding-right:25px;
-  /*padding-left:25px;*/
+  padding-left:10px;
 }
 /*
 .html-generator .html-content .row-element-block:before, .html-generator .html-content .row-element-row:before {

@@ -32,4 +32,8 @@
   display: block;
   text-overflow: ellipsis;
   float: none;
+}
+
+.choose-lang{
+  padding-left:20px;
 }
\ No newline at end of file

@@ -34,7 +34,7 @@ module Kanjai
       params[:gallery_image] ||= {}
       params[:gallery_image].each do |key, data|
 
-        obj = S3_BUCKET.object(URI.parse(data['file']).path[1..-1])
+        obj = S3_BUCKET.object(data['file'].split('/')[3..-1].join('/'))
 
 
         Image.create({

@@ -84,7 +84,7 @@ module Kanjai
     private
 
     def permitted_params
-      params.permit(:page_template => [:title, :attachment_file_name,
+      params.permit(:page_template => [:title, :attachment_file_name, :notice,
                                        page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name]
                     ])
     end

@@ -117,9 +117,9 @@ module Kanjai
 
     def get_content
       if self.type_content == 'rte_editor'
-        self.text_html.to_s
+        I18n.t('admin.content_types.rte_editor')
       elsif self.type_content == 'plugin'
-        self.controller_name.to_s + '.' + self.action_name.to_s
+        "#{I18n.t('admin.content_types.plugin')}: #{controller_name}.#{action_name}"
       else
         self.type_content
       end

@@ -6,7 +6,7 @@
         <div class="card-header">
           <div class="row">
             <div class="col-md-8">
-              <%= t('admin.page_langs.title') %>
+              <%= t('admin.templates.page_title') %>
             </div>
             <div class="col-md-4 text-right">
               <%= link_to I18n.t('admin.templates.create'), new_admin_page_template_url, class: 'btn btn-primary' %>

@@ -5,7 +5,15 @@
          <li class="nav-item" role="presentation"><a class="nav-link <%= @step == 'general' ? 'active' : '' %>" href="#general" aria-controls="general" role="tab" data-toggle="tab">General</a></li>
          <li class="nav-item" role="presentation"><a class="nav-link <%= @step == 'meta' ? 'active' : '' %>" href="#meta" aria-controls="meta" role="tab" data-toggle="tab">Meta</a></li>
          <li class="nav-item" role="presentation"><a class="nav-link" href="#content" aria-controls="content" role="tab" data-toggle="tab">Content</a></li>
+         <% if Kanjai::PageLang.count > 0 %>
+            <li class="choose-lang">
+               <div class="text-right">
+                  <%= select_tag :choose_lang, options_for_select(Kanjai::PageLang.all.collect{|lang| [lang.title, lang.code, data: {url: edit_admin_page_url(@page, lang: lang.code)}] }, params[:lang]), class: 'form-control' %>
+               </div>
+            </li>
+         <% end %>   
       </ul><!-- Tab panes-->
+
    <% end %>
    <div class="tab-content">
       <div class="tab-pane <%= @step == 'general' || @page.new_record? ? 'active' : '' %>" id="general" role="tabpanel"><%= render partial: 'kanjai/admin/pages/panels/general' %></div>

@@ -19,11 +19,9 @@
               <%= link_to t('actions.enable'), activate_admin_page_url(page), class: 'dropdown-item'  %>
             <% end %>
           </li>  
-          <% Kanjai::PageLang.all.each do |lang| %>
-            <li class="dropdown-item">
-              <%= link_to t('actions.edit_with_lang', lang: lang.code), edit_admin_page_url(page, :lang => lang.code), class: 'dropdown-item'  %>
-            </li>
-          <% end %>          
+          <li class="dropdown-item">
+              <%= link_to t('actions.edit'), edit_admin_page_url(page, :lang => Kanjai::PageLang.default), class: 'dropdown-item'  %>
+          </li>
           <li class="dropdown-item">
             <%= link_to t('actions.duplicate'), clone_admin_page_url(page), class: 'dropdown-item' %>
           </li>

 module Kanjai
-  VERSION = "0.0.148"
+  VERSION = "0.0.149"
 end