sibu 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d78859af9d1f4d0a1146f7ef2e97b9d4c269b6b
-  data.tar.gz: 4e0816b2b0b815010eb1cae2678a58a40f353562
+  metadata.gz: 9efa54f95bf9624f3e75050cab00861a3142662b
+  data.tar.gz: 3d84e0bfbfeb7fefd2c8c6fd4116c3de969dc2c2
 SHA512:
-  metadata.gz: b799c22dfca0fa3a14ce15b96b70e0333ab7f8f8e9b019d0a0aae5ca3b618397bcd0fe8effebeed1c2324089c0b89c99fb2d082984a3df94036fcb2d02a4300f
-  data.tar.gz: 4d784daf9463b355d0a128e25e3ea36fc2c4eb5f4c6eadb5608966dfb3582003bc02eb740cb0405eede9d191e360395218ee7f4a154efd01204fee87ed46552a
+  metadata.gz: 11644aaa295ba8e4f3732ee52328f69384976c24670c46a937405dd2dee498564e0f4b975f8e4090bad6f359afe7f0141df1d08714bcfcb93ca5a9524290aa66
+  data.tar.gz: 7f4821ac37a0cc4dea26cb920843e998c3dce0518c497c261b21a2ed7e5814b79bf460df2f834fe3baf94d47fbe51eca6a01d10c315c55ff612dded668788d3b

data/app/controllers/sibu/pages_controller.rb

@@ -2,9 +2,10 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class PagesController < ApplicationController
-    before_action :set_page, only: [:edit, :update, :destroy, :edit_element, :update_element, :edit_section]
+    before_action :set_page, only: [:edit, :update, :destroy, :edit_element, :update_element, :edit_section,
+                                    :clone_section, :delete_section]
     before_action :set_site, only: [:index, :new]
-    before_action :set_edit_context, only: [:edit_element, :update_element]
+    before_action :set_edit_context, only: [:edit_element, :update_element, :clone_section, :delete_section]
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
@@ -83,6 +84,16 @@ module Sibu
     def update_section
     end
 
+    def clone_section
+      @section_id = params[:section_id]
+      @cloned = @entity.clone_section(*@section_id.split('|'))
+    end
+
+    def delete_section
+      @section_id = params[:section_id]
+      @deleted = @entity.delete_section(*@section_id.split('|'))
+    end
+
     private
 
     def set_page

data/app/helpers/sibu/pages_helper.rb

@@ -47,8 +47,21 @@ module Sibu
     def section(id, sub_id = nil, &block)
       @sb_entity = @page
       @sb_section = sub_id ? [id, sub_id] : [id]
-      "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='page'>#{capture(self, &block)}</sb-edit>".html_safe
-    end
+      "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='page' data-duplicate='#{!sub_id.nil?}'>#{capture(self, &block)}</sb-edit>".html_safe
+    end
+
+    # def site_sections(id, &block)
+      # @site.section(id).map {|s| s["id"]}.each do |s|
+      #   site_section(id, sub_id, &block)
+      # end
+    #   out = ''
+    #   @sb_entity = @site
+    #   @site.section(id).map do |s|
+    #     @sb_section = [id, s["id"]]
+    #     out += "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='site' data-duplicate='true'>#{capture(self, &block)}</sb-edit>".html_safe
+    #   end
+    #   out.html_safe
+    # end
 
     def site_sections(id)
       @site.section(id).map {|s| s["id"]}

data/app/models/concerns/sibu/sections_concern.rb

@@ -12,6 +12,7 @@ module Sibu
           s = sections[ids[0]]
         end
         if s.nil?
+          logger.debug("init section #{ids[0]}")
           s = []
           self.sections[ids[0]] = s
           save
@@ -28,6 +29,7 @@ module Sibu
       if sub_idx
         sub = s[sub_idx]
       else
+        logger.debug("init section #{subid}")
         sub = {"id" => subid, "elements" => []}
         self.sections[id] << sub
         save
@@ -37,9 +39,12 @@ module Sibu
 
     def element(*ids, element_id)
       elt = section(*ids).select {|e| e["id"] == element_id}.first
-      elt || {}
+      elt || {"id" => element_id}
     end
 
+    # Todo : add an "elements" method
+    # and make section and subsection return sections
+
     def update_section(*ids, value)
     end
 
@@ -55,6 +60,26 @@ module Sibu
       value if save
     end
 
+    def clone_section(*ids)
+      siblings = section(ids.first)
+      ref_index = siblings.index {|s| s["id"] == ids.last}
+      new_section = siblings[ref_index].deep_dup
+      new_section["id"] = ids.last + '§'
+      siblings.insert(ref_index + 1, new_section)
+      save ? new_section : nil
+    end
+
+    def delete_section(*ids)
+      siblings = section(ids.first)
+      if siblings.length == 1
+        nil
+      else
+        ref_index = siblings.index {|s| s["id"] == ids.last}
+        siblings.delete_at(ref_index)
+        save
+      end
+    end
+
     def sanitize_value(value)
       unless value["text"].blank?
         value["text"].gsub!(/<\/?(div|p|ul|li)>/, '')

data/app/views/layouts/sibu/edit_content.html.erb

@@ -25,8 +25,10 @@
           <div class="overlay_left"></div>
           <div class="overlay_bottom"></div>
           <div class="edit_mode_actions">
-            <p>Modifier la section</p>
-            <button onclick="cancelEditMode()">Fermer</button>
+            <p id="edit_section_msg">Modifier la section</p>
+            <button id="clone_section" onclick="cloneSection()">Dupliquer</button>
+            <button id="delete_section" onclick="deleteSection()">Supprimer</button>
+            <button onclick="cancelEditMode()">Annuler</button>
           </div>
         </div>
       <% end %>
@@ -47,13 +49,23 @@
         var width = elt.width(), height = elt.height();
         var overlay = $("#edit_mode_overlay");
         var yPosition = offset.top - $(".sibu_content_panel").offset().top;
+        var section = elt.parents("sb-edit").first();
         overlay.find(".overlay_top").css("height", yPosition);
         overlay.find(".overlay_bottom").css("top", yPosition + height);
         overlay.find(".overlay_left").css({"height": height, "width": offset.left, "top": yPosition});
         overlay.find(".overlay_right").css({"height": height, "left": offset.left + width, "top": yPosition});
         overlay.find(".edit_mode_actions").css({"top": (yPosition <= 40 ? (yPosition + height) : (yPosition - 40)), left: offset.left, width: width});
+        overlay.find("#edit_section_msg").text("Modifier la section");
         overlay.show();
+        if(!section.data('duplicate')) {
+            overlay.find("#clone_section").hide();
+            overlay.find("#delete_section").hide();
+        } else {
+            overlay.find("#clone_section").show();
+            overlay.find("#delete_section").show();
+        }
         window.scrollTo(0, yPosition);
+        section.addClass('sb-editing');
         initInnerOverlays(elt);
         elt.remove();
     }
@@ -61,9 +73,38 @@
     function cancelEditMode() {
         $("#edit_mode_overlay").hide();
         cancelEdit();
+        $("sb-edit.sb-editing").removeClass("sb-editing");
         initOverlays();
     }
 
+    function cloneSection() {
+        if (window.confirm("Dupliquer la section ?")) {
+            var section = $("sb-edit.sb-editing");
+            $.ajax({
+                url: "<%= clone_section_site_page_path(@site.id, @page.id) %>",
+                method: "POST",
+                data: {
+                    section_id: section.data("id"),
+                    entity: section.data("entity")
+                }
+            })
+        }
+    }
+
+    function deleteSection() {
+        if (window.confirm("Supprimer la section ?")) {
+            var section = $("sb-edit.sb-editing");
+            $.ajax({
+                url: "<%= delete_section_site_page_path(@site.id, @page.id) %>",
+                method: "DELETE",
+                data: {
+                    section_id: section.data("id"),
+                    entity: section.data("entity")
+                }
+            })
+        }
+    }
+
     function cancelEdit() {
         $("#edit_panel").slideUp("fast");
     }

data/app/views/sibu/pages/_link_edit_panel.html.erb

@@ -1,6 +1,6 @@
 <h2>Modifier le lien</h2>
 <div id="edit_msg"></div>
-<div class="sibu_form">
+<div class="sibu_edit_form">
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
     <div class="sibu_field">
       <%= label_tag 'element[text]', 'Libellé' %>

data/app/views/sibu/pages/_text_edit_panel.html.erb

@@ -1,6 +1,6 @@
 <h2>Modifier le texte</h2>
 <div id="edit_msg"></div>
-<div class="sibu_form">
+<div class="sibu_edit_form">
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
     <%= trix_editor_tag 'element[text]', '', input: 'element_text' %>
     <%= hidden_field_tag 'element[id]', @element["id"] %>

data/app/views/sibu/pages/clone_section.js.erb

@@ -0,0 +1,10 @@
+<% if @cloned %>
+var section = $(".sibu_content_panel").find("[data-id='<%= @section_id %>']").first();
+var newSection = section.clone();
+newSection.data("id", "<%= [@section_id.split('|')[0], @cloned["id"]].join('|') %>");
+section.after(newSection);
+cancelEditMode();
+<% else %>
+$("#edit_section_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");
+<% end %>
+

data/app/views/sibu/pages/delete_section.js.erb

@@ -0,0 +1,7 @@
+<% if @deleted %>
+$(".sibu_content_panel").find("[data-id='<%= @section_id %>']").first().remove();
+cancelEditMode();
+<% else %>
+$("#edit_section_msg").text("Une erreur s'est produite lors de la suppression.");
+<% end %>
+

data/config/routes.rb

@@ -11,6 +11,8 @@ Sibu::Engine.routes.draw do
         get :edit_section, on: :member
         patch 'update_element', on: :member
         patch 'update_section', on: :member
+        post 'clone_section', on: :member
+        delete 'delete_section', on: :member
       end
 
       resources :images

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,8 @@ files:
 - app/views/sibu/pages/_link_edit_panel.html.erb
 - app/views/sibu/pages/_media_edit_panel.html.erb
 - app/views/sibu/pages/_text_edit_panel.html.erb
+- app/views/sibu/pages/clone_section.js.erb
+- app/views/sibu/pages/delete_section.js.erb
 - app/views/sibu/pages/destroy.html.erb
 - app/views/sibu/pages/edit.html.erb
 - app/views/sibu/pages/edit_content.html.erb