sibu 1.0.7 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91412642b584abf2717aedb917a915c773854e76
-  data.tar.gz: 862c35b00d09b62cae6a738666e631ede94f972a
+  metadata.gz: d80e0d86c6b0ae3ee81f45775acf1c021fe15a17
+  data.tar.gz: 712c3383c6bb99034f988e9ecd45933f7cd60957
 SHA512:
-  metadata.gz: 1a383d56e8a4569b124970bc021c9c9174383cfc047a0ad24df0bb6222af9cddd794f0a903615cae1c3af43c37170fc883c9a6ec6ee593840879a047d52a0f05
-  data.tar.gz: 2e6d288aefae771322512dfd80ebc786c82ce782600cfcce69c46f34b754bd8b992bad5b3c69a1f13bd8c58df20bcf6059b56df5e3d6408d12ba282e00ae94ef
+  metadata.gz: a51aca986aff80d8a5c0341aa6081bf464f66ee74eacae47aedf730035a123d19edf9219e4d3df56e00b3adf56dfb2aff72841677b2459ceec37a1892f09ccb5
+  data.tar.gz: 79751582c4674b13b2d7da12cd50224d2073f695bdb746d2d222457eb97c5a4ccb01fb9962777ff71c95313c4c4f554b26a5da8d47661f4200469f9236cf0fe5

data/app/controllers/sibu/sites_controller.rb

@@ -38,8 +38,8 @@ module Sibu
 
     def update
       if @site.update(site_params)
-        if conf[:custom_styles] && @site.previous_changes.has_key?(:custom_data)
-          generate_styles(@site)
+        if conf[:custom_styles]
+          generate_styles(@site, @site.previous_changes.has_key?(:custom_data))
         end
         if @site.previous_changes.has_key?(:version)
           @site.update_paths
@@ -61,7 +61,7 @@ module Sibu
       if new_site.save
         if conf[:custom_styles]
           generate_styles(@site)
-          generate_styles(new_site)
+          generate_styles(new_site, true)
         end
         redirect_to sites_url, notice: "Le site a bien été copié."
       else
@@ -81,8 +81,8 @@ module Sibu
       params.require(:site).permit!
     end
 
-    def generate_styles(site)
-      ds = Sibu::DynamicStyle.new(site.id)
+    def generate_styles(site, force_styles = false)
+      ds = Sibu::DynamicStyle.new(site.id, force_styles)
       ds.compile
     end
   end

data/app/helpers/sibu/extendable_helper.rb

@@ -0,0 +1,4 @@
+module Sibu
+  module ExtendableHelper
+  end
+end

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)
@@ -169,10 +192,14 @@ module Sibu
     end
 
     def form_label(elt, html_opts = {}, &block)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => Sibu::DEFAULT_TEXT}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "text" => Sibu::DEFAULT_TEXT}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({data: {id: elt_id(elt), type: "text"}}) if action_name != 'show'
-      content_tag(:label, raw(content["text"]).html_safe, html_opts)
+      @sb_section = (@sb_section || []) + [t_id]
+      html_opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "text"}}) if action_name != 'show'
+      html_output = content_tag(:label, raw(content["text"]).html_safe, html_opts)
+      @sb_section -= [t_id]
+      html_output
     end
 
     def form_input(elt, html_opts = {})
@@ -238,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/models/sibu/dynamic_style.rb

@@ -3,9 +3,9 @@ module Sibu
 
     attr_reader :site, :body, :env, :filename, :scss_file, :styles_changed
 
-    def initialize(site_id)
+    def initialize(site_id, force_styles = false)
       @site = Sibu::Site.find(site_id)
-      @styles_changed = styles_changed?(@site.style_url)
+      @styles_changed = @site.style.nil? || force_styles || styles_changed?(@site.style_url)
       if @styles_changed
         @filename = "#{site_id}_#{Time.current.to_i}"
         @scss_file = File.new(scss_file_path, 'w')

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.7'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.12
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,7 @@ files:
 - app/controllers/sibu/sites_controller.rb
 - app/helpers/sibu/application_helper.rb
 - app/helpers/sibu/documents_helper.rb
+- app/helpers/sibu/extendable_helper.rb
 - app/helpers/sibu/images_helper.rb
 - app/helpers/sibu/pages_helper.rb
 - app/helpers/sibu/sites_helper.rb