sibu 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f747d2d0f30d44d8321ea252994eb72a246743
-  data.tar.gz: 4e422b2041a2e3b8ca5eb86810e5440873c7c85e
+  metadata.gz: 81b1a892357b7809824ea579fe32219a9cc864c1
+  data.tar.gz: 121e9d7cec8dd2790bafc8d152aeff2f667d2014
 SHA512:
-  metadata.gz: 22a3a04bb5835e8119274276106e99ab700cd85c55c47aecafd8111c7c7eaa633f1c57a5e35b088a3532de89d7250580e17965f411a974657df642ac3c6b8a3b
-  data.tar.gz: 284b06e15ef29a30528f605d4c7b003781f17cad85be9a5c42daf78fff8520818189128abe907976ace0930b34f5c05d1f80cf3e7d367c523267e45734e9b1b1
+  metadata.gz: 481e3ce5022276de19aa596d15da11c99638a3b06fb9cb1eeac5ad8e38699810ece60c46a1cfeff01725dd2f5a5e5bd24dc1965d343325af161b1f1b76e1133d
+  data.tar.gz: c6dcd079e5672c7a702db7d9e117aa87cb90cc687171ad6d2110f51ba1fb6b5d8de4cdff7f1c3cb884da391bb64653910067b75998c3a7631804065cf31c3a0a

data/app/helpers/sibu/extendable_helper.rb

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

data/app/helpers/sibu/pages_helper.rb

@@ -27,6 +27,13 @@ module Sibu
       options_from_collection_for_select(Sibu::Document.for_user(sibu_user), :file_url, :file_name, @element["value"])
     end
 
+    def input_categories
+      options_for_select([['Nom', 'name'], ['Adresse', 'address'], ['Email', 'email'], ['Téléphone', 'telephone'],
+                          ['Arrivée', 'arrival_date'], ['Départ', 'departure_date'], ['Nombre de personnes', 'people'],
+                          ['Message (texte libre)', 'message'], ['Inscription à la newsletter', 'newsletter']],
+                         @element["field_name"])
+    end
+
     def link_type(val)
       if val.blank? || /^\d+$/.match(val.to_s)
         'internal'
@@ -162,10 +169,49 @@ 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 = {})
+      repeat = html_opts.delete(:repeat)
+      children = html_opts.delete(:children)
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      opts = {"id" => t_id}.merge(html_opts.stringify_keys).merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      form_name = opts.delete('form_name') || 'contact'
+      field_name = opts.delete('field_name') || 'name'
+      name_attr = "#{form_name}[#{field_name}]"
+
+      @sb_section = (@sb_section || []) + [t_id]
+      opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "input", repeat: repeat, children: children}}) if action_name != 'show'
+
+      case field_name
+      when 'name', 'address'
+        html_output = content_tag(:input, nil, opts.merge('type' => 'text', 'name' => name_attr))
+      when 'email'
+        html_output = content_tag(:input, nil, opts.merge('type' => 'email', 'name' => name_attr))
+      when 'telephone'
+        html_output = content_tag(:input, nil, opts.merge('type' => 'tel', 'name' => name_attr))
+      when 'arrival_date', 'departure_date'
+        html_output = content_tag(:input, nil, opts.merge('type' => 'date', 'name' => name_attr))
+      when 'people'
+        html_output = content_tag(:input, nil, opts.merge('type' => 'number', 'name' => name_attr))
+      when 'message'
+        html_output = content_tag(:textarea, nil, opts.merge('name' => name_attr))
+      when 'newsletter'
+        html_output = content_tag(:input, nil, opts.merge('type' => 'checkbox', 'name' => name_attr))
+      else
+        html_output = content_tag(:input, nil, opts.merge('type' => 'text', 'name' => name_attr))
+      end
+
+      @sb_section -= [t_id]
+      html_output
     end
 
     def widget(elt, widget_type, opts = {}, &block)
@@ -258,7 +304,7 @@ module Sibu
         content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
       end
       if block_given?
-        html_output = content_tag(:a, capture(link_elt, elts(elt), &block), content.merge(html_opts).except("elements"))
+        html_output = content_tag(:a, capture(link_elt, nested_elements(elt), &block), content.merge(html_opts).except("elements"))
       else
         html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
@@ -267,10 +313,10 @@ module Sibu
     end
 
     def interactive_map(elt, html_opts = {})
-      defaults = {"data-lat" => "46.1988027", "data-lng" => "5.1748288", "data-title" => Sibu::DEFAULT_TEXT}
+      defaults = {"data-lat" => "46.1988027", "data-lng" => "5.1748288"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {"id" => elt}))
       html_opts.merge!({data: {id: elt_id(elt), type: "map"}}) if action_name != 'show'
-      content_tag(:div, nil, content.merge(html_opts))
+      content_tag(:div, nil, content.merge(html_opts.stringify_keys))
     end
 
     def elt_id(elt)

data/app/models/sibu/dynamic_style.rb

@@ -1,31 +1,36 @@
 module Sibu
   class DynamicStyle
 
-    attr_reader :site, :body, :env, :filename, :scss_file
+    attr_reader :site, :body, :env, :filename, :scss_file, :styles_changed
 
     def initialize(site_id)
       @site = Sibu::Site.find(site_id)
-      @filename = "#{site_id}_#{Time.current.to_i}"
-      @scss_file = File.new(scss_file_path, 'w')
-      @body = ERB.new(File.read(template_file_path)).result(binding)
-      @env = Rails.application.assets
+      @styles_changed = @site.style.nil? || styles_changed?(@site.style_url)
+      if @styles_changed
+        @filename = "#{site_id}_#{Time.current.to_i}"
+        @scss_file = File.new(scss_file_path, 'w')
+        @body = ERB.new(File.read(template_file_path)).result(binding)
+        @env = Rails.application.assets
+      end
     end
 
     def compile
-      find_or_create_scss
+      if @styles_changed
+        find_or_create_scss
 
-      begin
-        scss_file.write generate_css
-        scss_file.flush
-        scss_file.close
-        css_file_path = scss_file_path.gsub('scss', 'css')
-        File.rename(scss_file_path, css_file_path)
-        site.update(style: File.new(css_file_path))
-      rescue Exception => ex
-          Rails.logger.error(ex)
-      ensure
-        File.delete(scss_file_path) if scss_file_path && File.exist?(scss_file_path)
-        File.delete(css_file_path) if css_file_path && File.exist?(css_file_path)
+        begin
+          scss_file.write generate_css
+          scss_file.flush
+          scss_file.close
+          css_file_path = scss_file_path.gsub('scss', 'css')
+          File.rename(scss_file_path, css_file_path)
+          site.update(style: File.new(css_file_path))
+        rescue Exception => ex
+            Rails.logger.error(ex)
+        ensure
+          File.delete(scss_file_path) if scss_file_path && File.exist?(scss_file_path)
+          File.delete(css_file_path) if css_file_path && File.exist?(css_file_path)
+        end
       end
     end
 
@@ -73,5 +78,16 @@ module Sibu
         env.load(asset.uri).source
       end
     end
+
+    def styles_changed?(site_style_url)
+      templates_styles_path = File.join(Rails.root, 'app', 'assets', 'stylesheets', 'templates', '**/*')
+      style_updated_at = File.new(File.join(Rails.root, 'public', site_style_url)).mtime
+      Dir.glob(templates_styles_path) do |style_file|
+        if File.new(style_file).mtime > style_updated_at
+          return true
+        end
+      end
+      false
+    end
   end
 end

data/app/models/sibu/site.rb

@@ -51,13 +51,6 @@ module Sibu
       pages.where(id: page_id).select(:id, :path).first
     end
 
-    def update_paths
-      pages.each do |p|
-        p.update_path(true)
-        p.save
-      end
-    end
-
     def save_and_init
       if valid?
         self.sections = site_template.sections

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

@@ -4,11 +4,14 @@
   <title><%= conf[:title] %></title>
   <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
   <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
-  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <% if @site %>
     <%= stylesheet_link_tag (conf[:custom_styles] ? @site.style_url : @site.site_template.path), media: "all" %>
+  <% end %>
+
+  <% if @site %>
     <%= javascript_include_tag @site.site_template.path %>
   <% end %>
+  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>
@@ -43,6 +46,8 @@
 <% end %>
 <%= javascript_include_tag 'sibu/sibu' %>
 <script>
+    var sectionsState = {};
+
     document.addEventListener("DOMContentLoaded", function() {
         initOverlays("<%= @edit_section || '' %>");
         sibuCallback("editContent");
@@ -208,25 +213,29 @@
     }
 
     function initInnerOverlays(section) {
-        var editables = section.querySelectorAll("[data-type]");
-        for (var i = 0; i < editables.length; i++) {
-            if (editables[i].getAttribute("data-type") !== 'group' || editables[i].getAttribute("data-repeat") === 'true' || editables[i].getAttribute("data-children") === 'true') {
-                editables[i].addEventListener("mouseenter", function(evt) {
-                    evt.stopPropagation();
-                    evt.currentTarget.classList.add("sb-editable");
-                });
-                editables[i].addEventListener("mouseleave", function(evt) {
-                    evt.currentTarget.classList.remove("sb-editable");
-                });
-                editables[i].addEventListener("click", function(evt) {
-                    evt.stopPropagation();
-                    evt.preventDefault();
-                    var elt = evt.currentTarget, eltId = elt.getAttribute("data-id"), repeat = elt.getAttribute("data-repeat"),
-                        type = elt.getAttribute("data-type"), size = elt.getAttribute("data-size"), children = elt.getAttribute("data-children");
-                    var sectionId = section.getAttribute("data-sb-id"), entity = section.getAttribute("data-sb-entity");
-                    editContent(eltId, sectionId, entity, repeat, type, size, children);
-                });
+        var sectionId = section.getAttribute('data-sb-id');
+        if (!sectionsState[sectionId]) {
+            var editables = section.querySelectorAll("[data-type]");
+            for (var i = 0; i < editables.length; i++) {
+                if (editables[i].getAttribute("data-type") !== 'group' || editables[i].getAttribute("data-repeat") === 'true' || editables[i].getAttribute("data-children") === 'true') {
+                    editables[i].addEventListener("mouseenter", function(evt) {
+                        evt.stopPropagation();
+                        evt.currentTarget.classList.add("sb-editable");
+                    });
+                    editables[i].addEventListener("mouseleave", function(evt) {
+                        evt.currentTarget.classList.remove("sb-editable");
+                    });
+                    editables[i].addEventListener("click", function(evt) {
+                        evt.stopPropagation();
+                        evt.preventDefault();
+                        var elt = evt.currentTarget, eltId = elt.getAttribute("data-id"), repeat = elt.getAttribute("data-repeat"),
+                            type = elt.getAttribute("data-type"), size = elt.getAttribute("data-size"), children = elt.getAttribute("data-children");
+                        var sectionId = section.getAttribute("data-sb-id"), entity = section.getAttribute("data-sb-entity");
+                        editContent(eltId, sectionId, entity, repeat, type, size, children);
+                    });
+                }
             }
+            sectionsState[sectionId] = 'ready';
         }
     }
 
@@ -253,7 +262,7 @@
                     };
                 })(sections[i], sectionBox.left, yOffset, width, height));
             }
-            if (activeSection) {
+            if (activeSection && document.querySelector("[data-sb-overlay='" + activeSection + "']")) {
                 document.querySelector("[data-sb-overlay='" + activeSection + "']").click();
             }
         }, 800);

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

@@ -0,0 +1,24 @@
+<h2>Modifier le champ de saisie</h2>
+<div id="edit_msg"></div>
+<%= render 'element_actions' %>
+<div class="sibu_edit_form">
+  <form class="edit_element_form" action="<%= update_element_site_page_path(@site.id, @page.id, format: :js) %>" accept-charset="UTF-8" method="patch">
+    <div class="sibu_field">
+      <%= label_tag 'element[field_name]', 'Type de champ' %>
+      <%= select_tag 'element[field_name]', input_categories, prompt: 'Sélectionnez un type de champ' %>
+    </div>
+    <div class="sibu_field">
+      <%= label_tag 'element[placeholder]', "Texte d'aide (optionnel)" %>
+      <%= text_field_tag 'element[placeholder]', @element["placeholder"] %>
+    </div>
+
+    <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <%= hidden_field_tag :element_id, @element_id %>
+    <%= hidden_field_tag :section_id, @section_id %>
+    <%= hidden_field_tag :entity, @entity_type %>
+    <div class="sibu_actions">
+      <%= submit_tag 'Valider' %>
+      <%= link_to 'Annuler', '#', onclick: 'cancelEdit(); return false;' %>
+    </div>
+  </form>
+</div>

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

@@ -18,6 +18,8 @@ editPanel.innerHTML = "";
   editPanel.innerHTML = "<%= j(render 'map_edit_panel') %>";
 <% when /^widget/ %>
   editPanel.innerHTML = "<%= j(render "shared/sibu/#{@content_type}_panel") %>";
+<% when 'input' %>
+  editPanel.innerHTML = "<%= j(render 'input_edit_panel') %>";
 <% else %>
   editPanel.innerHTML = "<%= j(render 'error_panel') %>";
 <% end %>
@@ -43,7 +45,9 @@ setTimeout(function() {
         for (var i = 0; i < images.length; i++) {
             images[i].addEventListener("click", function(evt) {
                 if(!evt.currentTarget.classList.contains('selected')) {
-                    evt.currentTarget.classList.remove('selected');
+                    if (editPanel.querySelector('.sibu_image.selected')) {
+                        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");
@@ -52,7 +56,9 @@ setTimeout(function() {
                         '<img src="' + $("#element_src").val() + '"/>' +
                         '<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>';
-                    editPanel.querySelector(".sibu_selected_image > p:first-child").style.display = "none";
+                    if (editPanel.querySelector(".sibu_selected_image > p:first-child")) {
+                      editPanel.querySelector(".sibu_selected_image > p:first-child").style.display = "none";
+                    }
                     editPanel.querySelector(".sibu_selected_image .sibu_custom_center").style.display = "block";
                     editPanel.querySelector(".sibu_selected_image .sibu_field").style.display = "";
                     if(customCenter.checked) {
@@ -93,7 +99,7 @@ setTimeout(function() {
     <% if @children %>
         document.querySelector("#child_elt").style.display = "inline-block";
     <% else %>
-        document.querySelector("#child_elt").remove();
+        if (document.querySelector("#child_elt")) document.querySelector("#child_elt").remove();
     <% end %>
     var formElt = document.querySelector("form.edit_element_form");
     if (formElt) {

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

@@ -20,9 +20,14 @@ if (sectionsPanel) {
           }
       });
     }
-    if(typeof initSectionsForm === "function") {
-        initSectionsForm();
+
+    var tabs = sectionsPanel.querySelectorAll(".sibu_sections a.tabs__link");
+    for (var j = 0; j < tabs.length; j++) {
+        tabs[j].addEventListener("click", function(evt) {
+            sibuCallback("selectSectionsTab", evt.currentTarget.getAttribute('aria-controls'));
+        });
     }
+
     document.body.style.overflow = "hidden";
     sibuCallback("newSection");
 }

data/lib/sibu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-09-08 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
@@ -177,6 +178,7 @@ files:
 - app/views/sibu/pages/_error_panel.html.erb
 - app/views/sibu/pages/_form.html.erb
 - app/views/sibu/pages/_group_edit_panel.html.erb
+- app/views/sibu/pages/_input_edit_panel.html.erb
 - app/views/sibu/pages/_link_edit_panel.html.erb
 - app/views/sibu/pages/_map_edit_panel.html.erb
 - app/views/sibu/pages/_media_edit_panel.html.erb