check repeat function, pages views

@@ -2180,6 +2180,18 @@ jQuery(document).ready(function(){
     $('.nestable-page-list').nestable({
       group: 1
     }).on('change', function(){
+      var url = $(this).data('sort-url');
+
+      jQuery.ajax({
+          type: 'POST',
+          url: url,
+          dataType: 'json',
+          data: {sort: $('.nestable-page-list').nestable('serialize')},
+          success: function(data){
+
+          }
+      });
+
       console.log($('.nestable-page-list').nestable('serialize'));
     }); // activate Nestable for list 2
 

@@ -99,7 +99,7 @@ module Kanjai
     def clone
       @page = Page.find(params[:id])
       @page.clone
-      redirect_to action: :index
+      redirect_to action: :index, domain_id: @page.domain.id
     end
 
     def show_editor
@@ -201,6 +201,9 @@ module Kanjai
 
 
     def sort
+      
+      sort_order(params[:sort], nil)
+
       @page = Page.find(params[:id])
 
       case params[:direction]
@@ -210,7 +213,7 @@ module Kanjai
           @page.move_lower
       end
 
-      redirect_to :action => :index
+      render json: {status: 'ok'}
 
     end
 
@@ -359,6 +362,19 @@ module Kanjai
       @obj.build_markers(@obj.type_content)
     end
 
+    def sort_order(collection, parent)
+      collection.each do |order, data|
+        p order
+        page = Kanjai::Page.where(id: data[:id]).first
+        if page
+          page.update_columns(position: order.to_i + 1, parent_id: parent)
+          if data[:children]
+            sort_order(data[:children], page.id)
+          end
+        end
+      end
+    end
+
 
   end
 end
\ No newline at end of file

@@ -2,7 +2,7 @@
     <div class="container">
 
       <div class="drop-down-upload">
-        <div style="padding:10px;">
+        <div style="padding:30px;">
           <div class="drop" data-url="<%= @s3_direct_post.url %>" data-form-data="<%= @s3_direct_post.fields.to_json %>" data-host="<%= URI.parse(@s3_direct_post.url).host %>" >
             <%= t('drop_your_file') %>
             <div class="dropped-file-list row"></div>

@@ -42,11 +42,24 @@
                             <%= form2.text_area :text_value, :class => "form-control" %>
                         <% end %>                        
                         <% if form2.object.get_marker_type(@obj.type_content) == 'file' %>
-                            <% s3_direct_post = S3_BUCKET.presigned_post(key: "#{form2.object.get_file_path}${filename}", success_action_status: '201', acl: 'public-read') %>
-                            <%= form2.file_field :text_value, :class => "", 'data-url' => s3_direct_post.url, 'data-form-data' => s3_direct_post.fields.to_json, 'data-host' => URI.parse(s3_direct_post.url).host , 'data-type' => 'zip' %>
-                            <% if form2.object.text_value.present? %>
-                                <%= link_to 'file', form2.object.text_value %>
-                            <% end %>
+                            <%= form2.hidden_field :text_value %>
+                            <div class="preview">
+                              <% if form2.object.text_value.present? %>
+                                      <% if Kanjai::PageContentMarker.image?(form2.object.text_value) %>
+                                          <div class="image-preview-block without-border">
+                                            <div class="image-preview">
+                                              <img src="<%= form2.object.text_value %>" alt="preview" />
+                                            </div>
+                                          </div>
+                                      <% else %>
+                                          <%= link_to 'file', form2.object.text_value %>
+                                      <% end %>
+                              <% end %>
+                            </div>
+                            <div class="btn-group">
+                              <%= link_to t('actions.choose_file'), get_files_admin_images_url, class: 'btn btn-primary content-choose-image'  %>
+                              <%= link_to t('actions.remove_file'), get_files_admin_images_url, class: "btn btn-danger content-remove-image #{form2.object.text_value.present? ? '' : 'not-visible'}"  %>
+                            </div>  
                         <% end %>
 
                       </div>

+<div class="row">
+  <div class="col-xl-12">
+    <!-- START card-->
+    <div class="card card-default">
+      <div class="card-header">
+        <div class="row">
+          <div class="col-md-8">
+            <%= t('admin.pages.page_title') %>
+          </div>
+          <div class="col-md-4 text-right">
+            <%= link_to t('admin.pages.add_new'), new_admin_page_url(domain_id: domain.id), class: 'btn btn-primary' %>
+          </div>
+        </div>
+      </div>
+      <div class="card-body">
+        <div class="">
+          <div class="nestable-page-list dd dd-full-width page-list" data-sort-url="<%= sort_admin_pages_path %>">              
+            <ol class="dd-list">                 
+               <%= render partial: 'kanjai/admin/pages/page_block', locals: {collection: domain.pages.where(parent: nil).order(:position)} %>
+            </ol>
+           </div>            
+        </div>  
+      </div>
+    </div><!-- END card-->
+  </div>
+</div>
\ No newline at end of file

@@ -5,6 +5,7 @@
       
           <div class="card card-default">
             <div class="card-header">
+              <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id) %>
               <div class="card-title"><%= t('admin.pages.edit', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></div>
             </div>            
             <%= render partial: 'form' %>

 <div class="content-wrapper">
 
-
-  <div id="accordion">
-    <% Kanjai::Domain.order(:title).each do |domain| %>
-     <div class="card card-default mb-1">
-        <div class="card-header" id="domain-headline-<%= domain.id %>">
-           <h4 class="mb-0"><a class="text-inherit" data-toggle="collapse" data-target="#domain-<%= domain.id %>" aria-expanded="true" aria-controls="domain-<%= domain.id %>" href=""><%= domain.title %></a></h4>
-        </div>
-        <div class="collapse <%= params[:domain_id].to_i == domain.id ? 'show' : '' %>" id="domain-<%= domain.id %>" aria-labelledby="domain-headline-<%= domain.id %>" data-parent="#accordion" style="">
-           <div class="card-body border-top">
-
-
-            <div class="row">
-              <div class="col-xl-12">
-                <!-- START card-->
-                <div class="card card-default">
-                  <div class="card-header">
-                    <div class="row">
-                      <div class="col-md-8">
-                        <%= t('admin.pages.page_title') %>
-                      </div>
-                      <div class="col-md-4 text-right">
-                        <%= link_to t('admin.pages.add_new'), new_admin_page_url(domain_id: domain.id), class: 'btn btn-primary' %>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="card-body">
-                    <div class="">
-                      <div class="nestable-page-list dd dd-full-width page-list">              
-                        <ol class="dd-list">                 
-                           <%= render partial: 'kanjai/admin/pages/page_block', locals: {collection: domain.pages.where(parent: nil).order(:position)} %>
-                        </ol>
-                       </div>            
-                    </div>  
-                  </div>
-                </div><!-- END card-->
-              </div>
-            </div>
-
-
-           </div>
-        </div>
-     </div>
-    <% end %>
-  </div>
+  <% if Kanjai::Domain.count == 1 %>
+    <%= render partial: 'kanjai/admin/pages/pages_one_domain', locals: {domain: Kanjai::Domain.first} %>
+  <% else %>
+    <div id="accordion">
+      <% Kanjai::Domain.order(:title).each do |domain| %>
+       <div class="card card-default mb-1">
+          <div class="card-header" id="domain-headline-<%= domain.id %>">
+             <h4 class="mb-0"><a class="text-inherit" data-toggle="collapse" data-target="#domain-<%= domain.id %>" aria-expanded="true" aria-controls="domain-<%= domain.id %>" href=""><%= domain.title %></a></h4>
+          </div>
+          <div class="collapse <%= params[:domain_id].to_i == domain.id ? 'show' : '' %>" id="domain-<%= domain.id %>" aria-labelledby="domain-headline-<%= domain.id %>" data-parent="#accordion" style="">
+             <div class="card-body border-top">
+                <%= render partial: 'kanjai/admin/pages/pages_one_domain', locals: {domain: domain} %>
+             </div>
+          </div>
+       </div>
+      <% end %>
+    </div>
+  <% end %>
 
 
 </div>

@@ -91,6 +91,8 @@
         </div>
         <div class="col-md-6">
           <div class="float-right">
+            <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id), class: 'btn btn-secondary' %>
+
             <%= link_to t('actions.reset'), 'javascript:void(0)', class: 'btn btn-secondary btn-form-reset' %>
             <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
           </div>

@@ -28,6 +28,7 @@
     <div class="card-footer mt-20">
       <div class="clearfix">
         <div class="float-right">
+          <%= link_to t('back_to_page_list'), admin_pages_path(domain_id: @page.domain.id), class: 'btn btn-secondary' %>
           <%= link_to t('actions.reset'), 'javascript:void(0)', class: 'btn btn-secondary btn-form-reset' %>
           <button class="btn btn-primary" type="submit"><%= t('actions.save') %></button>
         </div>

@@ -46,7 +46,7 @@ en:
   rte_choose_image: "Choose Image"
   add_alternative_domain: "Add Alternative Domain"
   tag_input_help_text: "Type the name of the tag and finish the input with enter"
-
+  back_to_page_list: "Back to page overview"
 
   date:
     formats:

@@ -34,7 +34,7 @@ Kanjai::Engine.routes.draw do
       get :clone, on: :member
       post :meta_update, on: :member
 
-      get :sort, on: :member
+      post :sort, on: :collection
       get :structure, on: :member
       get :save_structure, on: :member
       post :delete_content, on: :member

 module Kanjai
-  VERSION = "0.0.236"
+  VERSION = "0.0.237"
 end