sibu 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a3645e4994b5e3506134df59486cae37c4d1b1e
-  data.tar.gz: 64698eca039fff001046d5b317f022aa1fbc7027
+  metadata.gz: d011e2389e6f92f5a6058c7ad75604e1d7871b67
+  data.tar.gz: e0cf4f17e0405ba1b2ebdd4511ad97eb9fcf18c5
 SHA512:
-  metadata.gz: 4fa0cce6ff2674f8929000aa63a1dad931020a65c03d82ec2407d6a2e70476e6f20bd1482163bd378ef9ccd4d512ec0f31862b75b508b20ec6b36d1e4fc9fccd
-  data.tar.gz: 351b29a13dd3460008c7b33ce0d2cee70b7b5e35421d82ecd6b097cdac42b9739de3081a28ce202454a9b93a6c2f51cf6c8c4f3495a7c595921d9071c671592e
+  metadata.gz: 3814575a898d0e48a307392c60b9478af5e027aafbdbbc36d3be9fcb59f51a32bbab60bde845b80e427693aeef6e96264110d8bbfa354fe5ad8840bd9ee30426
+  data.tar.gz: 8036525bf448ef2f53fcde1a0ac067f102735f3287ebece966629035ab53298a9e881403806487bc41fc61049130593bda08a07f43f908313c3a67375f9428ce

data/app/assets/stylesheets/sibu/sibu.css

@@ -81,6 +81,10 @@
     background-color: white;
 }
 
+#element_actions {
+    display: none;
+}
+
 #edit_overlays > * {
     position: absolute;
     z-index: 999;

data/app/controllers/sibu/pages_controller.rb

@@ -73,6 +73,7 @@ module Sibu
       @content_type = params[:content_type]
       @links = @site.pages_path_by_id if @site
       @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
+      @repeat = params[:repeat]
     end
 
     def update_element

data/app/helpers/sibu/pages_helper.rb

@@ -98,9 +98,10 @@ module Sibu
 
     def img(elt, opts = {})
       wrapper = opts.delete(:wrapper)
+      repeat = opts.delete(:repeat)
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      opts.merge!({class: "sb-img #{opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
+      opts.merge!({class: "sb-img #{opts[:class]}", data: {id: elt_id(elt), repeat: repeat}}) if action_name != 'show'
       wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts) : content_tag(:img, nil, content.except("id").merge(opts))
     end
 
@@ -175,9 +176,10 @@ module Sibu
     # end
 
     def link(elt, html_opts = {}, &block)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "value" => "", "text" => "Nouveau lien"}
+      repeat = html_opts.delete(:repeat)
+      defaults = {"id" => elt_id(elt), "value" => "", "text" => "Nouveau lien"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({class: "sb-link #{html_opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
+      html_opts.merge!({class: "sb-link #{html_opts[:class]}", data: {id: elt_id(elt), repeat: repeat}}) if action_name != 'show'
       val = content["value"] || ""
       if val.to_s.include?('http')
         href = val

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

@@ -20,6 +20,10 @@ module Sibu
         s
       elsif ids.length == 2
         subsection(*ids)
+      elsif ids.length == 3
+        sub = subsection(*ids[0..1])
+        elt_idx = sub.index {|elt| elt["id"] == ids.last}
+        sub[elt_idx]["elements"]
       end
     end
 

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

@@ -48,6 +48,8 @@
     const IMG_TAGS = ['img'];
     const LINK_TAGS = ['a'];
 
+    var rootElt = $('html, body');
+
     $(function () {
         initOverlays();
     });
@@ -72,7 +74,7 @@
             editMode.find("#clone_section").show();
             editMode.find("#delete_section").show();
         }
-        window.scrollTo(0, top);
+        rootElt.animate({scrollTop: top}, 500);
         section.addClass('sb-editing');
         initInnerOverlays(section);
         $("#edit_overlays").html("");
@@ -83,6 +85,9 @@
         cancelEdit();
         $(".sb-editing").removeClass("sb-editing");
         initOverlays();
+        if(typeof editCancelledCallback === "function") {
+            editCancelledCallback();
+        }
     }
 
     function cloneSection() {
@@ -113,11 +118,39 @@
         }
     }
 
+    function cloneElement(entity, sectionId, elementId) {
+        if (window.confirm("Dupliquer l'élément ?")) {
+            $.ajax({
+                url: "<%= clone_element_site_page_path(@site.id, @page.id) %>",
+                method: "POST",
+                data: {
+                    section_id: sectionId,
+                    element_id: elementId,
+                    entity: entity
+                }
+            })
+        }
+    }
+
+    function deleteElement(entity, sectionId, elementId) {
+        if (window.confirm("Supprimer l'élément ?")) {
+            $.ajax({
+                url: "<%= delete_element_site_page_path(@site.id, @page.id) %>",
+                method: "DELETE",
+                data: {
+                    section_id: sectionId,
+                    element_id: elementId,
+                    entity: entity
+                }
+            })
+        }
+    }
+
     function cancelEdit() {
         $("#edit_panel").slideUp("fast");
     }
 
-    function editContent(eltId, sectionId, entity, contentType) {
+    function editContent(eltId, sectionId, entity, repeat, contentType) {
         $.ajax({
             url: "<%= edit_element_site_page_path(@site.id, @page.id) %>",
             method: "GET",
@@ -125,6 +158,7 @@
                 element_id: eltId,
                 section_id: sectionId,
                 entity: entity,
+                repeat: repeat,
                 content_type: contentType
             }
         })
@@ -140,14 +174,14 @@
         });
         editables.click(function(evt) {
             evt.preventDefault();
-            var elt = $(this), tag = elt.prop("tagName").toLowerCase();
-            var eltId = elt.data("id"), sectionId = section.data("sb-id"), entity = section.data("sb-entity");
+            var elt = $(this), tag = elt.prop("tagName").toLowerCase(), eltId = elt.data("id"), repeat = elt.data("repeat");
+            var sectionId = section.data("sb-id"), entity = section.data("sb-entity");
             if (TEXT_TAGS.indexOf(tag) !== -1) {
-                editContent(eltId, sectionId, entity, 'text');
+                editContent(eltId, sectionId, entity, repeat, 'text');
             } else if (IMG_TAGS.indexOf(tag) !== -1 || elt.hasClass('sb-img')) {
-                editContent(eltId, sectionId, entity, 'media');
+                editContent(eltId, sectionId, entity, repeat, 'media');
             } else if (LINK_TAGS.indexOf(tag) !== -1) {
-                editContent(eltId, sectionId, entity, 'link');
+                editContent(eltId, sectionId, entity, repeat, 'link');
             } else {
                 console.log('Sibu - Unsupported tag type : ' + tag);
             }

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

@@ -0,0 +1,4 @@
+<div id="element_actions">
+  <button onclick="cloneElement('<%= @entity_type %>', '<%= @section_id %>', '<%= @element_id %>')">Dupliquer</button>
+  <button onclick="deleteElement('<%= @entity_type %>', '<%= @section_id %>', '<%= @element_id %>')">Supprimer</button>
+</div>

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

@@ -1,5 +1,6 @@
 <h2>Modifier le lien</h2>
 <div id="edit_msg"></div>
+<%= render 'element_actions' %>
 <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">

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

@@ -1,6 +1,6 @@
 <h2>Modifier l'image</h2>
-
 <div id="edit_msg"></div>
+<%= render 'element_actions' %>
 <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_select_images sibu_field">

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

@@ -1,5 +1,6 @@
 <h2>Modifier le texte</h2>
 <div id="edit_msg"></div>
+<%= render 'element_actions' %>
 <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' %>

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

@@ -6,4 +6,5 @@ var clonedElt = $("[data-sb-id='<%= @section_id %>']").find("[data-id='<%= @elem
 var newElt = clonedElt.clone();
 newElt.data("id", "<%= @cloned["id"] %>");
 clonedElt.after(newElt);
+cancelEditMode();
 <% end %>

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

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

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

@@ -18,5 +18,9 @@ editPanel.html("");
 <% elsif @content_type == 'link' %>
   editPanel.html("<%= j(render 'link_edit_panel') %>");
 <% end %>
-
+<% if @repeat %>
+$("#element_actions").show();
+<% else %>
+$("#element_actions").hide();
+<% end %>
 editPanel.slideDown("fast");

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
@@ -148,12 +148,14 @@ files:
 - app/views/sibu/images/new.html.erb
 - app/views/sibu/images/show.html.erb
 - app/views/sibu/pages/_custom_styles.html.erb
+- app/views/sibu/pages/_element_actions.html.erb
 - app/views/sibu/pages/_form.html.erb
 - 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_element.js.erb
 - app/views/sibu/pages/clone_section.js.erb
+- app/views/sibu/pages/delete_element.js.erb
 - app/views/sibu/pages/delete_section.js.erb
 - app/views/sibu/pages/destroy.html.erb
 - app/views/sibu/pages/edit.html.erb