sibu 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4506dd1c2b0f1f720045ba1bddd840a03ec19945
-  data.tar.gz: 2e028cfdf5c22480d37186397402d1dc7b3551b8
+  metadata.gz: 5c5d82061f85ff21bd3989f9b12554ed157a9338
+  data.tar.gz: b11f19b5ee199a81cea6dbbd5703916349e01bb0
 SHA512:
-  metadata.gz: b38dbbe585fd82607bcb2d459b7262fb6b1302a104f06101d547038af567dda790dbeab16d2fc1fc8546653ebc4607c6c5d353a50d02dd3ed3d64b5d0772f53a
-  data.tar.gz: a03b06e0164de60a92a0e3c24071c1a4bb126260ab25fbb288951372884354e539108d666bb9110592707d5bc289e0ef25b5317f47669a027cc3538f7496a8ae
+  metadata.gz: 75fe75f7afaa6dd93753f4c11c4106f5dd386244daab9765733ad73651091f6e76e86012ca6209096bba78898659fef9450dfeb3549541c02f8810b5369e9c22
+  data.tar.gz: 7a88ff8ceddec27e47629ddad26c66636670290fbef6e4eb8a581f444b79050ed1678856abe495758b352c12260c40eeb31c7e78a1a959031dcfd2e832a5d60b

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

@@ -49,7 +49,7 @@
     right: 0;
 }
 
-#edit_panel {
+#edit_panel, #sections_panel {
     position: fixed;
     left: 0;
     bottom: 0;
@@ -59,7 +59,12 @@
     background-color: white;
 }
 
-#element_actions {
+#sections_panel .sibu_sections {
+    max-height: 60vh;
+    overflow-y: scroll;
+}
+
+#element_actions button {
     display: none;
 }
 

data/app/controllers/sibu/pages_controller.rb

@@ -3,10 +3,10 @@ require_dependency "sibu/application_controller"
 module Sibu
   class PagesController < ApplicationController
     before_action :set_page, only: [:edit, :update, :destroy, :edit_element, :update_element, :clone_element,
-                                    :delete_element, :edit_section, :clone_section, :delete_section]
+                                    :delete_element, :child_element, :new_section, :create_section, :delete_section]
     before_action :set_site, only: [:index, :new]
     before_action :set_edit_context, only: [:edit_element, :update_element, :clone_element, :delete_element,
-                                            :clone_section, :delete_section]
+                                            :child_element, :new_section, :create_section, :delete_section]
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
@@ -75,6 +75,7 @@ module Sibu
       @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
       @repeat = params[:repeat]
       @size = params[:size].blank? ? :medium : params[:size].to_sym
+      @children = params[:children]
     end
 
     def update_element
@@ -90,14 +91,21 @@ module Sibu
       @deleted = @entity.delete_element(*@section_id.split('|'), *@element_id.split('|'))
     end
 
-    def edit_section
+    def child_element
+      @added = @entity.child_element(*@section_id.split('|'), *@element_id.split('|'))
     end
 
-    def update_section
+    # Todo - init available sections properly and fix dynamic sections creation (init needed)
+    def new_section
+      @after = params[:after]
+      @links = @site.pages_path_by_id
+      @page.sections << {"id" => "sibu_template_free_text", "elements" => [{"id" => "paragraph0"}]}
+      @page.sections << {"id" => "sibu_template_gallery",
+                         "elements" => [{"id" => "slide0", "elements" => [{"id" => "slide0"}, {"id" => "slide1"}, {"id" => "slide2"}]}]}
     end
 
-    def clone_section
-      @cloned = @entity.clone_section(*@section_id.split('|'))
+    def create_section
+      @created = @entity.create_section(*@section_id.split('|'), params[:after], section_params)
     end
 
     def delete_section
@@ -129,5 +137,9 @@ module Sibu
     def element_params
       params.require(:element).permit!
     end
+
+    def section_params
+      params.require(:section).permit!
+    end
   end
 end

data/app/helpers/sibu/pages_helper.rb

@@ -11,6 +11,11 @@ module Sibu
       [['Accueil', 'home'], ['Offre', 'offer'], ['Galerie', 'gallery'], ['Destination', 'destination'], ['Mentions légales', 'text']]
     end
 
+    def sections_templates
+      Dir.glob(File.join(Rails.root, "app/views/shared/#{@site.site_template.path}/*.erb")).map {|f| f.split('/').last}
+          .map {|f| f[1..-1].gsub('.html.erb', '')}.select {|f| f != 'site'}.map {|f| {"id" => "sibu_template_#{f}", "template" => f}}
+    end
+
     def page_languages
       [['Français', 'fr'], ['Anglais', 'en']]
     end
@@ -29,7 +34,7 @@ module Sibu
 
     [:h1, :h2, :h3, :h4, :h5, :h6, :span].each do |t|
       define_method(t) do |elt, html_opts = {}|
-        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => "Texte à modifier"}
+        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => 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(t, raw(content["text"]).html_safe, html_opts)
@@ -37,7 +42,7 @@ module Sibu
     end
 
     def p(elt, html_opts = {})
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => "Texte à modifier"}
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_PARAGRAPH}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
       html_opts.merge!({data: {id: elt_id(elt), type: "paragraph"}}) if action_name != 'show'
       content_tag(:div, content_tag(:p, raw(content["text"]).html_safe), html_opts)
@@ -48,18 +53,19 @@ module Sibu
     end
 
     def select_element(id)
-      @sb_entity.section(*@sb_section).select {|elt| elt["id"] == id}.first
+      @sb_entity.element(*@sb_section, id)
     end
 
     def elements(id = nil)
-      id ? select_element(id)["elements"] : @sb_entity.section(*@sb_section)
+      items = id ? select_element(id)["elements"] : @sb_entity.find_or_init(*@sb_section)["elements"]
+      items.blank? ? [{"id" => ""}] : items
     end
 
     def img(elt, opts = {})
       wrapper = opts.delete(:wrapper)
       repeat = opts.delete(:repeat)
       size = opts.delete(:size)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => DEFAULT_IMG}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
       opts.merge!({data: {id: elt_id(elt), type: "media", repeat: repeat, size: size}}) 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))
@@ -80,61 +86,61 @@ module Sibu
 
     def section(id, tag, html_opts = {}, &block)
       @sb_section = [id]
-      rpt = html_opts.delete(:repeat)
-      opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => id, "data-sb-repeat" => rpt, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
+      opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => id, "data-sb-repeat" => @sb_entity != @site, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
       content_tag(tag, capture(self, &block), opts)
     end
 
+    # Todo : voir comment générer une section par défaut en mode liste des sections et insertion d'un bloc avec sections
     def sections(id, tag, html_opts = {}, &block)
-      (@sb_entity.section(id).map.with_index do |elt, i|
+      (@sb_entity.find_or_init(id)["elements"].map.with_index do |elt, i|
         @sb_section = [id, elt["id"]]
         opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => @sb_section.join('|'), "data-sb-repeat" => true, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
         content_tag(tag, capture(self, i, &block), opts)
       end).join('').html_safe
     end
 
-    def elt(id)
-      select_element(id)
-    end
-
-    # Note : could work well - set the ids hierarchy in elements retrieved from the db
     def elts(id)
       items = []
-      @sb_entity.section(*@sb_section, id).each do |item|
-        item["id"] = [id, item["id"]].join("|")
-        items << item
+      element_id = elt_id(id)
+      elemnts = @sb_entity.elements(*(@sb_section + element_id.split("|")).uniq)
+      if elemnts
+        elemnts.each do |e|
+          e["data-id"] = [element_id, e["id"]].join("|")
+          items << e
+        end
       end
-      items
+      items.blank? ? [{"id" => element_id.split("|").last, "data-id" => [element_id, "#{id}0"].join("|")}] : items
     end
 
     def link(elt, html_opts = {}, &block)
       repeat = html_opts.delete(:repeat)
-      defaults = {"id" => elt_id(elt), "value" => "", "text" => "Nouveau lien"}
+      children = html_opts.delete(:children)
+      defaults = {"id" => elt_id(elt), "value" => "", "text" => DEFAULT_TEXT}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
       val = content.delete("value") || ""
       text = content.delete("text");
-      html_opts.merge!({data: {id: elt_id(elt), type: "link", repeat: repeat}}) if action_name != 'show'
+      html_opts.merge!({data: {id: elt_id(elt), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
       if val.to_s.include?('http')
         content["href"] = val
       else
         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?
-        content_tag(:a, content.merge(html_opts), &block)
+        content_tag(:a, content.merge(html_opts).except("elements"), &block)
       else
-        content_tag(:a, text, content.merge(html_opts))
+        content_tag(:a, text, content.merge(html_opts).except("elements"))
       end
     end
 
     def interactive_map(elt, html_opts = {}, &block)
-      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => "Titre marqueur"}
+      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => DEFAULT_TEXT}
       content = elt.is_a?(Hash) ? defaults.merge(elt) : (select_element(elt) || {"id" => elt}).merge(defaults)
       html_opts.merge!({data: {id: elt_id(elt), type: "map"}}) if action_name != 'show'
       content_tag(:div, nil, content.merge(html_opts))
     end
 
     def elt_id(elt)
-      elt.is_a?(Hash) ? elt["id"] : elt
+      elt.is_a?(Hash) ? (elt["data-id"] || elt["id"]) : elt
     end
   end
 end

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

@@ -2,68 +2,54 @@ module Sibu
   module SectionsConcern
     include ActiveSupport::Concern
 
-    def section(*ids)
-      if ids.length == 1
-        s = nil
-        if sections.blank?
-          self.sections = {}
-        else
-          s = sections[ids[0]]
-        end
-        if s.nil?
-          logger.debug("init section #{ids[0]}")
-          s = []
-          self.sections[ids[0]] = s
-          save
-        end
-        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"]
+    def section(id)
+      if id
+        pos = sections.index {|s| s["id"] == id}
+        pos ? sections[pos] : {"id" => id}
       end
     end
 
-    def subsection(id, subid)
-      s = section(id)
-      sub_idx = s.index {|elt| elt["id"] == subid}
-      if sub_idx
-        sub = s[sub_idx]
-      else
-        sub = {"id" => subid, "elements" => []}
-        self.sections[id] << sub
-        save
+    def elements(*ids)
+      unless ids.blank?
+        s = section(ids.first)
+        unless s["elements"].blank?
+          ids[1..-1].each do |elt_id|
+            pos = s["elements"].index {|e| e["id"] == elt_id.split('|').last}
+            s = pos ? s["elements"][pos] : {"id" => elt_id, "elements" => []}
+          end
+          s["elements"]
+        end
       end
-      sub["elements"]
-    end
-
-    def element(*ids, element_id)
-      elt = section(*ids).select {|e| e["id"] == element_id}.first
-      elt || {"id" => element_id}
     end
 
-    # Todo : add an "elements" method
-    # and make section and subsection return sections
-
-    def update_section(*ids, value)
+    def element(*ids)
+      unless ids.blank?
+        if ids.length == 1
+          section(ids.first)
+        else
+          elts = elements(*ids[0..-2]) || []
+          pos = elts.index {|e| e["id"] == ids.last}
+          pos ? elts[pos] : {"id" => ids.last}
+        end
+      end
     end
 
     def update_element(*ids, value)
-      sanitize_value(value)
-      parent_section = section(*ids)
-      if parent_section.any? {|elt| elt["id"] == value["id"]}
-        parent_section.map! {|elt| elt["id"] == value["id"] ? value : elt}
-      else
-        parent_section << value
-      end
+      unless ids.blank?
+        parent_section = find_or_init(*ids)["elements"]
+        if parent_section.any? {|elt| elt["id"] == value["id"]}
+          parent_section.map! {|elt| elt["id"] == value["id"] ? value : elt}
+        else
+          parent_section << value.to_h
+        end
 
-      value if save
+        value if save
+      end
     end
 
     def clone_element(*ids, element_id)
-      siblings = section(*ids)
+      src_elt = find_or_init(*ids, element_id)
+      siblings = find_or_init(*ids)["elements"]
       ref_index = siblings.index {|s| s["id"] == element_id}
       new_elt = siblings[ref_index].deep_dup
       new_elt["id"] = element_id + '§'
@@ -72,7 +58,8 @@ module Sibu
     end
 
     def delete_element(*ids, element_id)
-      siblings = section(*ids)
+      src_elt = find_or_init(*ids, element_id)
+      siblings = find_or_init(*ids)["elements"]
       if siblings.length > 1
         ref_index = siblings.index {|s| s["id"] == element_id}
         siblings.delete_at(ref_index)
@@ -82,30 +69,65 @@ module Sibu
       end
     end
 
-    def clone_section(*ids)
-      siblings = section(ids.first)
-      ref_index = siblings.index {|s| s["id"] == ids.last}
-      new_section = siblings[ref_index].deep_dup
-      new_section["id"] = ids.last + '§'
-      siblings.insert(ref_index + 1, new_section)
+    def child_element(*ids, element_id)
+      siblings = elements(*ids)
+      parent_elt = siblings[siblings.index {|s| s["id"] == element_id}]
+      if parent_elt["elements"].blank?
+        parent_elt["elements"] = [{"id" => "#{element_id}*"}]
+      else
+        parent_elt["elements"] << [{"id" => "#{parent_elt["elements"].last["id"]}§"}]
+      end
+      save
+    end
+
+    def create_section(*ids, after, new_section)
+      new_section["id"] = "#{new_section["template"]}-#{Time.current.to_i}"
+      if ids.length == 1
+        parent = sections
+      else
+        parent = find_or_init(*ids[0..-2])["elements"]
+      end
+      ref_pos = parent.index {|s| s["id"] == ids.last}
+      parent.insert(after.to_s == 'true' ? ref_pos + 1 : ref_pos, new_section)
       save ? new_section : nil
     end
 
     def delete_section(*ids)
-      siblings = section(ids.first)
-      if siblings.length == 1
-        nil
+      if ids.length == 1
+        if sections.length == 1
+          nil
+        else
+          ref_index = sections.index {|s| s["id"] == ids.first}
+          sections.delete_at(ref_index)
+          save
+        end
       else
-        ref_index = siblings.index {|s| s["id"] == ids.last}
-        siblings.delete_at(ref_index)
+        parent = find_or_init(*ids[0..-2])
+        ref_index = parent["elements"].index {|s| s["id"] == ids.last}
+        parent["elements"].delete_at(ref_index)
         save
       end
     end
 
-    def sanitize_value(value)
-      # unless value["text"].blank?
-      #   value["text"].gsub!(/<\/?(div|p|ul|li)>/, '')
-      # end
+    def elt(siblings, elt_id, default_elt = nil)
+      pos = siblings.index {|e| e["id"] == elt_id}
+      pos ? siblings[pos] : default_elt
+    end
+
+    def find_or_init(*ids)
+      node = nil
+      siblings = sections
+      ids.each do |elt_id|
+        node = elt(siblings, elt_id)
+        if node.nil?
+          node = {"id" => elt_id, "elements" => []}
+          siblings << node
+        elsif node["elements"].nil?
+          node["elements"] = []
+        end
+        siblings = node["elements"]
+      end
+      node
     end
   end
 end

data/app/models/sibu/page.rb

@@ -6,19 +6,20 @@ module Sibu
 
     store :metadata, accessors: [:title, :description, :keywords], coder: JSON
 
-    before_save :init_path
-    validates_presence_of :name, :site, :language, :template
+    before_save :update_path
+    validates_presence_of :name, :site, :language
 
     def save_and_init
       if valid?
-        template_defaults = site.site_template.pages.select {|p| p[:template] == template}.first
+        template_defaults = site.site_template.pages.first
         self.sections = template_defaults[:sections]  if template_defaults
       end
       save
     end
 
-    def init_path
-      self.path = template if self.path.blank? && template != 'home'
+    # Todo : fix me (is_home flag ?)
+    def update_path
+      self.path = name.parameterize if self.path.blank? && name != 'Accueil'
     end
   end
 end

data/app/models/sibu/site.rb

@@ -10,8 +10,8 @@ module Sibu
 
     validates_presence_of :name, :site_template
 
-    def page_template(page)
-      "#{site_template.path}/#{page.template}"
+    def section_template(section)
+      "#{site_template.path}/#{section["template"]}"
     end
 
     def not_found

data/app/models/sibu/site_template.rb

@@ -2,5 +2,9 @@ module Sibu
   class SiteTemplate < ApplicationRecord
     store :default_sections, accessors: [:sections], coder: JSON
     store :default_pages, accessors: [:pages], coder: JSON
+
+    def reference
+      name.parameterize.gsub('-', '_')
+    end
   end
 end

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

@@ -26,6 +26,7 @@
       <%= render conf[panel] %>
       <% if panel == :content_panel %>
         <div id="edit_panel" class="sibu_panel sibu_view"></div>
+        <div id="sections_panel"></div>
         <div id="edit_mode_overlay" class="sibu_panel sibu_view">
           <div class="overlay_top"></div>
           <div class="overlay_right"></div>
@@ -33,7 +34,8 @@
           <div class="overlay_bottom"></div>
           <div class="edit_mode_actions">
             <p id="edit_section_msg">Modifier la section</p>
-            <button id="clone_section" onclick="cloneSection()">Dupliquer</button>
+            <button id="new_section_before" onclick="newSection(false)">Insérer avant</button>
+            <button id="new_section_after" onclick="newSection(true)">Insérer après</button>
             <button id="delete_section" onclick="deleteSection()">Supprimer</button>
             <button onclick="cancelEditMode()">Fermer</button>
           </div>
@@ -60,10 +62,12 @@
         editMode.find("#edit_section_msg").text("Modifier la section");
         editMode.show();
         if(!section.data('sb-repeat')) {
-            editMode.find("#clone_section").hide();
+            editMode.find("#new_section_before").hide();
+            editMode.find("#new_section_after").hide();
             editMode.find("#delete_section").hide();
         } else {
-            editMode.find("#clone_section").show();
+            editMode.find("#new_section_before").show();
+            editMode.find("#new_section_after").show();
             editMode.find("#delete_section").show();
         }
         rootElt.animate({scrollTop: top}, 500);
@@ -82,18 +86,17 @@
         }
     }
 
-    function cloneSection() {
-        if (window.confirm("Dupliquer la section ?")) {
-            var section = $(".sb-editing").first();
-            $.ajax({
-                url: "<%= clone_section_site_page_path(@site.id, @page.id) %>",
-                method: "POST",
-                data: {
-                    section_id: section.data("sb-id"),
-                    entity: section.data("sb-entity")
-                }
-            })
-        }
+    function newSection(isAfter) {
+        var section = $(".sb-editing").first();
+        $.ajax({
+            url: "<%= new_section_site_page_path(@site.id, @page.id) %>",
+            method: "GET",
+            data: {
+                section_id: section.data("sb-id"),
+                entity: section.data("sb-entity"),
+                after: isAfter
+            }
+        })
     }
 
     function deleteSection() {
@@ -138,11 +141,26 @@
         }
     }
 
+    function addChildElement(entity, sectionId, elementId) {
+        if (window.confirm("Ajouter un sous-menu ?")) {
+            $.ajax({
+                url: "<%= child_element_site_page_path(@site.id, @page.id) %>",
+                method: "POST",
+                data: {
+                    section_id: sectionId,
+                    element_id: elementId,
+                    entity: entity
+                }
+            })
+        }
+    }
+
     function cancelEdit() {
         $("#edit_panel").slideUp("fast");
+        document.body.style.overflow = "initial";
     }
 
-    function editContent(eltId, sectionId, entity, repeat, contentType, size) {
+    function editContent(eltId, sectionId, entity, repeat, contentType, size, children) {
         $.ajax({
             url: "<%= edit_element_site_page_path(@site.id, @page.id) %>",
             method: "GET",
@@ -152,7 +170,8 @@
                 entity: entity,
                 repeat: repeat,
                 content_type: contentType,
-                size: size
+                size: size,
+                children: children
             }
         })
     }
@@ -167,9 +186,10 @@
         });
         editables.click(function(evt) {
             evt.preventDefault();
-            var elt = $(this), eltId = elt.data("id"), repeat = elt.data("repeat"), type = elt.data("type"), size = elt.data("size");
+            var elt = $(this), eltId = elt.data("id"), repeat = elt.data("repeat"), type = elt.data("type"),
+                size = elt.data("size"), children = elt.data("children");
             var sectionId = section.data("sb-id"), entity = section.data("sb-entity");
-            editContent(eltId, sectionId, entity, repeat, type, size);
+            editContent(eltId, sectionId, entity, repeat, type, size, children);
         })
     }
 

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

@@ -1,21 +1,21 @@
 <% content_for :styles do %>
   <style>
     <% unless @site.primary_color.blank? %>
-    :not(.sibu_panel) [class*='bg--primary'] {
+    .sibu_site_content [class*='bg--primary'] {
       background-color: <%= @site.primary_color %> !important;
     }
 
-    :not(.sibu_panel) [class *='txt--primary'] {
+    .sibu_site_content [class *='txt--primary'] {
       color: <%= @site.primary_color %> !important;
     }
     <% end %>
 
     <% unless @site.secondary_color.blank? %>
-    :not(.sibu_panel) [class*='bg--success'] {
+    .sibu_site_content [class*='bg--success'] {
       background-color: <%= @site.secondary_color %> !important;
     }
 
-    :not(.sibu_panel) [class *='txt--success'] {
+    .sibu_site_content [class *='txt--success'] {
       color: <%= @site.secondary_color %> !important;
     }
     <% end %>

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

@@ -1,4 +1,5 @@
 <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>
+  <button id="clone_elt" onclick="cloneElement('<%= @entity_type %>', '<%= @section_id %>', '<%= @element_id %>')">Dupliquer</button>
+  <button id="duplicate_elt" onclick="deleteElement('<%= @entity_type %>', '<%= @section_id %>', '<%= @element_id %>')">Supprimer</button>
+  <button id="child_elt" onclick="addChildElement('<%= @entity_type %>', '<%= @section_id %>', '<%= @element_id %>')">Ajouter un sous-menu</button>
 </div>

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

@@ -6,13 +6,6 @@
       <small>Libellé utilisé dans l'outil d'administration (non utilisé dans le site)</small>
     </div>
   </div>
-  <div class="sibu_field">
-    <%= f.label :template, 'Modèle' %>
-    <div>
-      <%= f.select(:template, page_templates, {prompt: 'Sélectionnez un modèle de page'}) %>
-      <small>Le gabarit utilisé pour créer la page</small>
-    </div>
-  </div>
   <div class="sibu_field">
     <%= f.label :path, "Chemin d'accès" %>
     <div>

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

@@ -22,7 +22,7 @@
     <%= hidden_field_tag :entity, @entity_type %>
     <div class="sibu_actions">
       <%= submit_tag 'Valider' %>
-      <%= link_to 'Annuler', '#', onclick: '$("#edit_panel").slideUp("fast"); return false;' %>
+      <%= link_to 'Annuler', '#', onclick: 'cancelEdit(); return false;' %>
     </div>
   <% end %>
 </div>

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

@@ -0,0 +1,25 @@
+<div class="sibu_panel sibu_view">
+  <h2>Choix du type de section</h2>
+  <div id="edit_msg"></div>
+</div>
+<div>
+  <div id="<%= "#{@site.site_template.reference}_sections" %>" class="sibu_sections sibu_site_content">
+    <% sections_templates.each do |st| %>
+      <div data-sb-template="<%= st["template"] %>">
+        <%= render "shared/#{@site.section_template(st)}", sec: st %>
+      </div>
+    <% end %>
+  </div>
+  <%= form_tag(create_section_site_page_path(@site.id, @page.id), method: :post, remote: true) do |f| %>
+    <%= hidden_field_tag 'section[template]', '' %>
+    <%= hidden_field_tag :section_id, @section_id %>
+    <%= hidden_field_tag :after, @after%>
+    <%= hidden_field_tag :entity, @entity_type %>
+    <div class="sibu_panel sibu_view">
+      <div class="sibu_actions">
+        <%= submit_tag 'Valider' %>
+        <%= link_to 'Annuler', '#', onclick: 'cancelEdit(); return false;' %>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,6 @@
+<% if @added.nil? %>
+$("#edit_panel #edit_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'ajout du sous-menu.</p>");
+<% else %>
+$("#edit_panel").slideUp();
+location.reload(true);
+<% end %>

data/app/views/sibu/pages/{clone_section.js.erb → create_section.js.erb}

@@ -1,4 +1,4 @@
-<% if @cloned %>
+<% if @created %>
 location.reload(true);
 <% else %>
 $("#edit_section_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");

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

@@ -40,8 +40,15 @@ editPanel.html("");
 <% end %>
 
 <% if @repeat %>
-$("#element_actions").show();
+$("#clone_elt, #duplicate_elt").show();
 <% else %>
-$("#element_actions").hide();
+$("#clone_elt, #duplicate_elt").remove();
+<% end %>
+
+<% if @children %>
+$("#child_elt").show();
+<% else %>
+$("#child_elt").remove();
 <% end %>
 editPanel.slideDown("fast");
+document.body.style.overflow = "hidden";

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

@@ -7,7 +7,6 @@
     <thead>
     <tr>
       <th>Nom</th>
-      <th>Modèle</th>
       <th>Chemin d'accès</th>
       <th>Mise à jour</th>
       <th colspan="2"></th>
@@ -17,7 +16,6 @@
     <% @pages.each do |p| %>
       <tr>
         <td><%= p.name %></td>
-        <td><%= t "sibu.templates.#{p.template}" %></td>
         <td><%= p.path %></td>
         <td><%= l p.updated_at %></td>
         <td colspan="2">

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

@@ -0,0 +1,17 @@
+var sectionsPanel = $("#sections_panel");
+sectionsPanel.html("");
+sectionsPanel.html("<%= j(render 'new_section_panel') %>");
+var sections = sectionsPanel.find(".sibu_sections > *");
+sections.click(function() {
+    if(!$(this).hasClass('selected')) {
+        sections.removeClass('selected');
+        $(this).addClass('selected');
+        $("#section_template").val($(this).data("sb-template"));
+    }
+});
+sectionsPanel.slideDown("fast", function() {
+    if(typeof initSectionsForm === "function") {
+        initSectionsForm();
+    }
+});
+document.body.style.overflow = "hidden";

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

@@ -1 +1,3 @@
-<%= render "shared/#{@site.site_template.path}/site" %>
+<div class="sibu_site_content">
+  <%= render "shared/#{@site.site_template.path}/site" %>
+</div>

data/config/initializers/constants.rb

@@ -0,0 +1,3 @@
+DEFAULT_TEXT = "Lorem ipsum"
+DEFAULT_PARAGRAPH = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut."
+DEFAULT_IMG = "/default.jpg"

data/config/routes.rb

@@ -12,8 +12,9 @@ Sibu::Engine.routes.draw do
         patch 'update_element', on: :member
         post 'clone_element', on: :member
         delete 'delete_element', on: :member
-        patch 'update_section', on: :member
-        post 'clone_section', on: :member
+        post 'child_element', on: :member
+        get 'new_section', on: :member
+        post 'create_section', on: :member
         delete 'delete_section', on: :member
       end
 

data/lib/sibu/utils.rb

@@ -0,0 +1,15 @@
+module Sibu
+  class Utils
+    def self.convert_sections
+      Sibu::Site.all.each do |s|
+        sections = s.sections
+        s.update(sections: sections.keys.map {|k| {id: k, elements: sections[k]}})
+      end
+
+      Sibu::Page.all.each do |p|
+        sections = p.sections
+        p.update(sections: sections.keys.map {|k| {id: k, elements: sections[k]}})
+      end
+    end
+  end
+end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,10 +141,12 @@ files:
 - 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/_new_section_panel.html.erb
 - app/views/sibu/pages/_paragraph_edit_panel.html.erb
 - app/views/sibu/pages/_text_edit_panel.html.erb
+- app/views/sibu/pages/child_element.js.erb
 - app/views/sibu/pages/clone_element.js.erb
-- app/views/sibu/pages/clone_section.js.erb
+- app/views/sibu/pages/create_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
@@ -153,6 +155,7 @@ files:
 - app/views/sibu/pages/edit_element.js.erb
 - app/views/sibu/pages/index.html.erb
 - app/views/sibu/pages/new.html.erb
+- app/views/sibu/pages/new_section.js.erb
 - app/views/sibu/pages/show.html.erb
 - app/views/sibu/pages/update.html.erb
 - app/views/sibu/pages/update_element.js.erb
@@ -163,6 +166,7 @@ files:
 - app/views/sibu/sites/new.html.erb
 - app/views/sibu/sites/show.html.erb
 - app/views/sibu/sites/update.html.erb
+- config/initializers/constants.rb
 - config/initializers/shrine.rb
 - config/routes.rb
 - config/tinymce.yml
@@ -179,6 +183,7 @@ files:
 - db/migrate/20180214134653_add_fields_to_sites.rb
 - lib/sibu.rb
 - lib/sibu/engine.rb
+- lib/sibu/utils.rb
 - lib/sibu/version.rb
 - lib/tasks/sibu_tasks.rake
 homepage: http://hotentic.com