sibu 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7991033d4b4015c8079d0952b34c7f11cb9a9e01
-  data.tar.gz: 4b908d62c7a595af8127ab72b71c77f9abfd2095
+  metadata.gz: 9be2c0e35af2b8d5bb5e9283434dff69b764aac6
+  data.tar.gz: e83fbe2deb769b75efe13a4211cb9f88542d9c03
 SHA512:
-  metadata.gz: eef44db76d0e344005e6070543eb9b8829b5c1fb751cdfdde9cd299bd9688686f6cf1b97335a404b14808ff0f8ddc7bfebac1610964c307c17743db68081b467
-  data.tar.gz: 010ac8a10ff5cedb1e96d576354c600245a33f9b253bef5a07fab9fb3cca51344ebf8a529bb2621380dcb7977c554fae4edef5db4353c25aa022ffe7d2b6c401
+  metadata.gz: 593deedf3cecf0eae5c84ce825726d3889d4c9e4b4eba5d2733c0a8c02ba7d1c0fb1a366dfe9523710cb55962cdd7479095e6aac0703cda77282731522e3c851
+  data.tar.gz: 7e46c8092624205af3b6506587c8a0de7f55fd406d49f2bfc5034455a2b7187c297baa35ee447982d3aeb74f4048102f457734378db1d729bb8282e4524e9fd5

data/app/assets/stylesheets/sibu/defaults.scss

@@ -229,8 +229,7 @@ $sibu-color3 : #333 !default;
     padding: 2rem;
 
     img {
-      padding-top: 2rem;
-      padding-bottom: 2rem;
+      margin-bottom: 2rem;
       border-top: 2px solid $sibu-color1;
       box-shadow: 0 0 5px #ccc;
     }

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

@@ -3,10 +3,21 @@
  *= require_self
  */
 
-.sibu_content_panel {
+body.sibu_edit_content, .sibu_content_panel {
     position: relative
 }
 
+body.sibu_edit_content > .sibu_panel:first-child {
+    position: fixed;
+    width: 100%;
+    z-index: 999999;
+    top: 0;
+}
+
+body.sibu_edit_content > .sibu_content_panel {
+    padding-top: 60px;
+}
+
 .sb-editable {
     cursor: pointer;
     outline: dashed rgba(94, 219, 255, 0.8) 3px;

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'
@@ -124,25 +131,33 @@ module Sibu
       wrapper = opts.delete(:wrapper)
       repeat = opts.delete(:repeat)
       size = opts.delete(:size)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => Sibu::DEFAULT_IMG}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "src" => Sibu::DEFAULT_IMG}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      @sb_section = (@sb_section || []) + [t_id]
       if action_name == 'show'
         content["src"] = ("/#{conf[:deployment_path]}" + content["src"]) if @online && conf[:deployment_path]
       else
-        opts.merge!({data: {id: elt_id(elt), type: "media", repeat: repeat, size: size}})
+        opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "media", repeat: repeat, size: size}})
       end
-      wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts)
+      html_output = wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts)
           : content_tag(:img, 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)
       children = opts.delete(:children)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      @sb_section = (@sb_section || []) + [t_id]
+      defaults = {"id" => t_id}
       opts = defaults.merge(opts)
-      opts.merge!({data: {id: elt_id(elt), type: "group", repeat: repeat, children: children}}) if action_name != 'show'
-      content_tag(wrapper, capture(*elts(elt), &block), opts)
+      opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "group", repeat: repeat, children: children}}) if action_name != 'show'
+      html_output = content_tag(wrapper, capture(*elts(elt), &block), opts)
+      @sb_section -= [t_id]
+      html_output
     end
 
     def empty_tag(elt, tag, type, opts = {})
@@ -160,6 +175,41 @@ module Sibu
       content_tag(:label, raw(content["text"]).html_safe, html_opts)
     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)
       content = elt.is_a?(Hash) ? elt : (select_element(elt) || {})
       opts.merge!({data: {id: elt_id(elt), type: "widget_#{widget_type.to_s.split('::').last.underscore}"}}) if action_name != 'show'
@@ -229,12 +279,14 @@ module Sibu
     def link(elt, html_opts = {}, &block)
       repeat = html_opts.delete(:repeat)
       children = html_opts.delete(:children)
-      defaults = {"id" => elt_id(elt), "value" => "", "text" => Sibu::DEFAULT_TEXT}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "value" => "", "text" => Sibu::DEFAULT_TEXT}
       link_elt = current_elt(elt)
       content = defaults.merge(link_elt)
       val = content.delete("value") || ""
       text = content.delete("text")
-      html_opts.merge!({data: {id: elt_id(elt), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
+      @sb_section = (@sb_section || []) + [t_id]
+      html_opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
       if val.to_s.start_with?('http')
         content["href"] = val
       elsif val.to_s.start_with?('#')
@@ -248,20 +300,19 @@ 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?
-        @sb_section = (@sb_section || []) + [elt_id(elt)]
-        html_output = content_tag(:a, capture(link_elt, elts(elt), &block), content.merge(html_opts).except("elements"))
-        @sb_section -= [elt_id(elt)]
-        html_output
+        html_output = content_tag(:a, capture(link_elt, nested_elements(elt), &block), content.merge(html_opts).except("elements"))
       else
-        content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
+        html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
+      @sb_section -= [t_id]
+      html_output
     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 = 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/page.rb

@@ -62,5 +62,9 @@ module Sibu
         save
       end
     end
+
+    def home?
+      is_home == 'true' || is_home == '1'
+    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

@@ -2,17 +2,20 @@
 <html>
 <head>
   <title><%= conf[:title] %></title>
+  <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
+  <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
   <% 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 %>
-  <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
-  <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
   <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>
-<body>
+<body class="sibu_edit_content">
 <% [:top_panel, :side_panel, :content_panel, :bottom_panel].each do |panel| %>
   <% unless conf[panel].blank? %>
     <div class="<%= panel == :content_panel ? 'sibu_content_panel' : 'sibu_panel' %>">
@@ -43,6 +46,8 @@
 <% end %>
 <%= javascript_include_tag 'sibu/sibu' %>
 <script>
+    var sectionsState = {};
+
     document.addEventListener("DOMContentLoaded", function() {
         initOverlays("<%= @edit_section || '' %>");
         sibuCallback("editContent");
@@ -74,7 +79,8 @@
             editMode.querySelector("#new_section_after").style.display = "block";
             editMode.querySelector("#delete_section").style.display = "block";
         }
-        window.scrollTo(0, top);
+        var topPadding = top <= 120 ? 60 : 120;
+        window.scrollTo(0, top - topPadding);
         section.classList.add('sb-editing');
         initInnerOverlays(section);
         document.querySelector("#edit_overlays").innerHTML = "";
@@ -207,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';
         }
     }
 
@@ -235,8 +245,8 @@
             container.innerHTML = "";
 
             for (var i = 0; i < sections.length; i++) {
-                var sectionBox = sections[i].getBoundingClientRect();
-                var yOffset = sectionBox.top - document.querySelector(".sibu_content_panel").getBoundingClientRect().top;
+                var sectionBox = eltBox(sections[i]);
+                var yOffset = sectionBox.top;
                 var width = sections[i].offsetWidth, height = (sections[i].offsetHeight === 0 ? childrenHeight(sections[i]) : sections[i].offsetHeight);
                 var overlay = document.createElement("div");
                 overlay.setAttribute("data-sb-overlay", sections[i].getAttribute("data-sb-id"));
@@ -252,12 +262,31 @@
                     };
                 })(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);
     }
 
+    function eltBox(elt) {
+        var x, y, w, h, bbox = elt.getBoundingClientRect();
+        if (isIE()) {
+            x = bbox.left + window.scrollX;
+            y = bbox.top + window.scrollY;
+        } else {
+            x = bbox.x + window.scrollX;
+            y = bbox.y + window.scrollY;
+        }
+        w = bbox.width;
+        h = bbox.height;
+        return {top: y, left: x, width: w, height: h}
+    }
+
+    function isIE() {
+        let ua = navigator.userAgent;
+        return ua.indexOf("MSIE ") > -1 || ua.indexOf("Trident/") > -1;
+    }
+
     function childrenHeight(parentElt) {
         var height = 0, children = parentElt.querySelectorAll("*");
         for (var i = 0; i < children.length; i++) {

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

@@ -5,7 +5,7 @@
   <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[code]', "Code d'intégration du contenu" %>
-      <%= text_area_tag 'element[code]', @element["code"], placeholder: ' ex: <iframe src="..."></iframe>'  %>
+      <%= text_area_tag 'element[code]', @element["code"], placeholder: 'ex: <iframe src="..."></iframe>'  %>
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
     <%= hidden_field_tag :element_id, @element_id %>

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.html.erb

@@ -2,7 +2,7 @@
   <div class="actions">
     <%= link_to 'Retour', :back %>
   </div>
-  <h2>Modifier une page</h2>
+  <h2>Réglages de la page</h2>
   <div class="sibu_form">
     <%= render '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) {
@@ -86,14 +92,14 @@ setTimeout(function() {
         document.querySelector("#clone_elt").style.display = "inline-block";
         document.querySelector("#duplicate_elt").style.display = "inline-block";
     <% else %>
-        document.querySelector("#clone_elt").remove();
-        document.querySelector("#duplicate_elt").remove();
+        if (document.querySelector("#clone_elt")) document.querySelector("#clone_elt").remove();
+        if (document.querySelector("#duplicate_elt")) document.querySelector("#duplicate_elt").remove();
     <% end %>
 
     <% 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/index.html.erb

@@ -1,6 +1,9 @@
 <div id="pages" class="sibu_view">
   <div class="actions">
-    <%= link_to 'Créer une page', new_site_page_path(@site.id) %> <%= link_to 'Retour', :back %>
+    <%= link_to "Bibliothèque d'images", images_path %>
+    <%= link_to "Documents", documents_path %>
+    <%= link_to 'Créer une page', new_site_page_path(@site.id) %>
+    <%= link_to 'Retour', :back %>
   </div>
   <h2>Pages du site "<%= @site.name %>"</h2>
   <table>
@@ -24,7 +27,7 @@
           <%= link_to 'Voir', site_page_path(@site.id, p), target: '_blank' %> |
           <%= link_to 'Editer', site_page_edit_content_path(site_id: @site.id, page_id: p.id) %> |
           <%= link_to 'Copier', duplicate_site_page_path(@site.id, p), method: :post, data: {confirm: "Copier la page \"#{p.name}\" ?"} %> |
-          <%= link_to 'Paramétrer', edit_site_page_path(@site.id, p) %> |
+          <%= link_to 'Paramétrer cette page', edit_site_page_path(@site.id, p) %> |
           <%= link_to 'Supprimer', site_page_path(@site.id, p), method: :delete, data: {confirm: "Supprimer la page \"#{p.name}\" ?"} %>
         </td>
       </tr>

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/app/views/sibu/sites/_form.html.erb

@@ -16,8 +16,8 @@
   <div class="sibu_field">
     <%= f.label :site_template_id, 'Modèle' %>
     <div>
-      <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all, :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
-      <small>Choisissez le gabarit qui servira de modèle pour votre site (non modifiable après création)</small>
+      <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all.order(:name), :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
+      <small>Choisissez le gabarit qui servira de modèle pour votre site (voir exemples ci-dessous - non modifiable après création)</small>
     </div>
   </div>
   <div class="sibu_field">

data/app/views/sibu/sites/index.html.erb

@@ -24,7 +24,7 @@
         <td><%= l s.updated_at %></td>
         <td colspan="2">
           <%= link_to 'Pages', site_pages_path(s) %> |
-          <%= link_to 'Paramétrer', edit_site_path(s) %> |
+          <%= link_to 'Réglages du site', edit_site_path(s) %> |
           <%= link_to 'Copier', duplicate_site_path(s), method: :post, data: {confirm: "Copier le site \"#{s.name}\" ?"} %> |
           <%= link_to 'Supprimer', site_path(s), method: :delete, data: {confirm: "Supprimer le site \"#{s.name}\" ?"} %>
         </td>

data/app/views/sibu/sites/new.html.erb

@@ -8,7 +8,7 @@
   </div>
   <h2>Aperçu des modèles</h2>
   <div>
-    <% Sibu::SiteTemplate.all.each do |st| %>
+    <% Sibu::SiteTemplate.all.order(:name).each do |st| %>
       <div class="sibu_template">
         <h3><%= st.name %></h3>
         <%= image_tag "#{st.path}1.jpg" %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.3'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-09-07 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