sibu 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b1a892357b7809824ea579fe32219a9cc864c1
-  data.tar.gz: 121e9d7cec8dd2790bafc8d152aeff2f667d2014
+  metadata.gz: ddad9d6305d71605c692e8dbdafadb0c6cce1d7a
+  data.tar.gz: 91539711c089a4d111dede2965a554051c590dc5
 SHA512:
-  metadata.gz: 481e3ce5022276de19aa596d15da11c99638a3b06fb9cb1eeac5ad8e38699810ece60c46a1cfeff01725dd2f5a5e5bd24dc1965d343325af161b1f1b76e1133d
-  data.tar.gz: c6dcd079e5672c7a702db7d9e117aa87cb90cc687171ad6d2110f51ba1fb6b5d8de4cdff7f1c3cb884da391bb64653910067b75998c3a7631804065cf31c3a0a
+  metadata.gz: e025dc9b575fedeb91471848f78487b4ba1e3e7fbb19e81822bc31576aae2cd764326ce75bd6e39dd2d2b9ea0901d30f5b33bcef1a26a354a62f90f3d3d74a05
+  data.tar.gz: cb43b5c568dcd4c9323944645c2ab6935f81988d8a95fe3c47902115db8070bf8e2f10253174d8eaa73074f63348bce2acb724e0c69171e1ff8540355a8db827

data/app/helpers/sibu/pages_helper.rb

@@ -118,6 +118,13 @@ module Sibu
           nested_elts.map {|e| e.merge({"data-id" => join_tokens(element_id_tokens[1..-1], e['id'])})}
     end
 
+    def each_element(elt_or_id)
+      element_id = elt_id(elt_or_id)
+      @sb_section = (@sb_section + element_id.split("|")).uniq unless element_id.blank?
+      (@sb_entity.elements(*@sb_section) || []).map {|el| yield(el)}
+      @sb_section -= [element_id] unless element_id.blank?
+    end
+
     def select_element(id)
       @sb_entity.element(*@sb_section, id)
     end
@@ -146,6 +153,22 @@ module Sibu
       html_output
     end
 
+    def svg_image(elt, opts = {})
+      size = opts.delete(:size)
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "xlink:href" => Sibu::DEFAULT_IMG}
+      content = defaults.merge((elt.is_a?(Hash) ? elt : (select_element(elt) || {})).transform_keys {|k| k == 'src' ? 'xlink:href' : k})
+      @sb_section = (@sb_section || []) + [t_id]
+      if action_name == 'show'
+        content["xlink:href"] = ("/#{conf[:deployment_path]}" + content["xlink:href"]) if @online && conf[:deployment_path]
+      else
+        opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "media", repeat: false, size: size}})
+      end
+      html_output = content_tag(:image, nil, content.except("id").merge(opts.stringify_keys) {|k, old, new| k == 'class' ? [old, new].join(' ') : new})
+      @sb_section -= [t_id]
+      html_output
+    end
+
     def grp(elt, opts = {}, &block)
       wrapper = opts.delete(:wrapper) || :div
       repeat = opts.delete(:repeat)
@@ -242,16 +265,17 @@ module Sibu
 
     alias site sb_site
 
-    def render_page_section(s)
+    def render_page_section(s, set_id = false)
       @sb_section = [s['id']]
       @sb_entity = @page
       render partial: "shared/#{@site.section_template(s)}",
-             locals: {sibu: self, sibu_section: s, sibu_attrs: sibu_attributes(s).html_safe}
+             locals: {sibu: self, sibu_section: s, sibu_attrs: sibu_attributes(s, set_id).html_safe}
     end
 
     # Page sections attrs
-    def sibu_attributes(section)
-      action_name != 'show' ? ('data-sb-id="' + section['id'] + '" data-sb-entity="page"') : ''
+    def sibu_attributes(section, set_id)
+      attrs = set_id ? ('id="' + section['id'] + '" ') : ''
+      attrs + (action_name != 'show' ? ('data-sb-id="' + section['id'] + '" data-sb-entity="page"') : '')
     end
 
     # Site sections attrs

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

@@ -65,7 +65,7 @@
         rightOverlay.style.height = height + "px";
         rightOverlay.style.left = left + width + "px";
         rightOverlay.style.top = top + "px";
-        editModeActions.style.top = (top <= 120 ? (top + height) : (top - 40 - 20)) + "px";
+        editModeActions.style.top = (top + height) + "px";
         editModeActions.style.left = left + "px";
         editModeActions.style.width = width + "px";
         editMode.querySelector("#edit_section_msg").innerText = "Modifier la section";
@@ -79,8 +79,6 @@
             editMode.querySelector("#new_section_after").style.display = "block";
             editMode.querySelector("#delete_section").style.display = "block";
         }
-        var topPadding = top <= 120 ? 60 : 120;
-        window.scrollTo(0, top - topPadding);
         section.classList.add('sb-editing');
         initInnerOverlays(section);
         document.querySelector("#edit_overlays").innerHTML = "";

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

@@ -49,11 +49,11 @@ setTimeout(function() {
                         editPanel.querySelector('.sibu_image.selected').classList.remove('selected');
                     }
                     evt.currentTarget.classList.add('selected');
-                    var imgElt = evt.currentTarget.querySelector("img");
-                    document.querySelector("#element_src").value = imgElt.getAttribute("data-src");
+                    var imgElt = evt.currentTarget.querySelector("img"), eltSrc = document.querySelector("#element_src");
+                    eltSrc.value = imgElt.getAttribute("data-src");
                     document.querySelector("#element_alt").value = imgElt.getAttribute("data-alt");
                     editPanel.querySelector(".sibu_center").innerHTML =
-                        '<img src="' + $("#element_src").val() + '"/>' +
+                        '<img src="' + eltSrc.value + '"/>' +
                         '<div id="sibu_center_pos" style="display: none;">✕</div>' +
                         '<div id="sibu_center_desc" style="display: none;"><em>Cliquez sur l\'image pour la recentrer sur un point donné (à utiliser lorsque l\'image est tronquée car la zone d\'affichage est trop petite)</em></div>';
                     if (editPanel.querySelector(".sibu_selected_image > p:first-child")) {

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails