sibu 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6916799ff35b88c15850f4911c93517a43e8ba1f
-  data.tar.gz: ef515f1129ed26fdf3f156794e79ac402a37011d
+  metadata.gz: 96611f8f7b23adda4d4502b1eef05f34d0a4dea2
+  data.tar.gz: 27fe50a309c23dfe80bce28c687d6fc05d96452d
 SHA512:
-  metadata.gz: 471eee1cd3b1388651e1771f65396748f48a5e59826552fda85588373cbd2e8df68fa6d0b0a99f6c33f43b0291cba853dd36ded178aa3ec6f2dadd510d968095
-  data.tar.gz: 913ed58b8942eb16f66b492536e7466927835ff9be32523335c3ec13dc3a1898d0f81aeeedbfda4eb6e38e41ef7a6491f698b5dccc1e334fb12fc160e255faf9
+  metadata.gz: 3022613a600e634834e57373d4fefae4e760eda752e7966c5da5f403e7464d9279a0c1dd5277bdd97f9cbac101df450290a0762ea6a58183079362fd87d003c5
+  data.tar.gz: 530731b14939afd5615a25df8c1d0834f541c41343484ddfb256b0b1f98b53981fa513ee4b584c1ac6b6067b8d4d20ea0450aa2466955daaf18844509f84ebeb

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/controllers/sibu/pages_controller.rb

@@ -2,6 +2,7 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class PagesController < ApplicationController
+    before_action :compile_assets, only: [:show, :edit_content]
     before_action :set_page, only: [:edit, :update, :destroy, :duplicate, :edit_element, :update_element, :clone_element,
                                     :delete_element, :child_element, :new_section, :create_section, :edit_section,
                                     :update_section, :delete_section]
@@ -10,6 +11,7 @@ module Sibu
                                             :child_element, :new_section, :create_section, :edit_section,
                                             :update_section, :delete_section]
     before_action :set_online, only: [:show, :edit]
+
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
@@ -44,7 +46,7 @@ module Sibu
     end
 
     def new
-      @page = Sibu::Page.new(site_id: @site.id)
+      @page = Sibu::Page.new(site_id: @site.id, source: 'Saisie manuelle')
     end
 
     def create
@@ -194,5 +196,9 @@ module Sibu
     def show_params
       params.permit!
     end
+
+    def compile_assets
+      Sibu::DynamicStyle.new(params[:site_id]).compile if Rails.env.development? && conf[:custom_styles] && !params[:site_id].blank?
+    end
   end
 end

data/app/controllers/sibu/sites_controller.rb

@@ -6,7 +6,11 @@ module Sibu
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
-      @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
+      if conf[:admin_filter].call(sibu_user)
+        @sites = Sibu::Site.all.order(:name, :version)
+      else
+        @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
+      end
     end
 
     def show

data/app/helpers/sibu/application_helper.rb

@@ -5,7 +5,7 @@ module Sibu
     end
 
     def sibu_user
-      send(Rails.application.config.sibu[:current_user])
+      send(conf[:current_user])
     end
   end
 end

data/app/helpers/sibu/pages_helper.rb

@@ -7,6 +7,10 @@ module Sibu
       p ? (request.host == conf[:host] ? site_page_path(@site.id, p.id) : (conf[:deployment_path] ? "/#{conf[:deployment_path]}/#{p.path}" : "/#{p.path}")) : "#"
     end
 
+    def is_current_page(link_val)
+      /\d+/.match?(link_val) && link_val.to_i == @page.id
+    end
+
     def sections_templates
       @site.site_template.available_sections
     end
@@ -58,7 +62,7 @@ module Sibu
           end
         else
           if t == :p
-            html_output = content_tag(:div, content_tag(t, raw(content["text"]).html_safe, html_opts), html_opts)
+            html_output = content_tag(:div, content_tag(t, raw(content["text"]).html_safe), html_opts)
           else
             html_output = content_tag(t, raw(content["text"]).html_safe, html_opts)
           end
@@ -95,8 +99,12 @@ module Sibu
       (tokens + [suffix]).select {|t| !t.blank?}.join("|")
     end
 
-    def nested_elements(id)
-      element_id = elt_id(id)
+    # Note : the best option is probably a "section" helper that is instantiated from the section hash
+    # and that provides all the logic for elements manipulation (ex: section.h3(), section.elements, section.elements(nested_id), etc...)
+    # That will also remove the entity type references (site / page) from the partials (but is still has to be figured out by Sibu)
+    # Note : add "each_with_elements" and "elements" on section/elts enumerables
+    def nested_elements(elt_or_id)
+      element_id = elt_id(elt_or_id)
       element_id_tokens = (@sb_section + element_id.split("|")).uniq
       nested_elts = @sb_entity.elements(*element_id_tokens)
       nested_elts.blank? ? [{"id" => element_id.split("|").last, "data-id" => join_tokens(element_id_tokens[1..-1], "#{element_id}0")}] :
@@ -116,25 +124,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 = {})
@@ -187,10 +203,18 @@ module Sibu
              locals: {sibu: self, sibu_section: s, sibu_attrs: sibu_attributes(s).html_safe}
     end
 
+    # Page sections attrs
     def sibu_attributes(section)
       action_name != 'show' ? ('data-sb-id="' + section['id'] + '" data-sb-entity="page"') : ''
     end
 
+    # Site sections attrs
+    def sibu_attrs(section_id)
+      @sb_section = [section_id]
+      @sb_entity = @site
+      action_name != 'show' ? ('data-sb-id="' + section_id + '" data-sb-entity="site"').html_safe : ''
+    end
+
     def section(id, tag, html_opts = {}, &block)
       @sb_section = [id]
       opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => id, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
@@ -213,12 +237,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?('#')
@@ -232,17 +258,16 @@ 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" => "45.68854", "data-lng" => "5.91587", "data-title" => Sibu::DEFAULT_TEXT}
+      defaults = {"data-lat" => "46.1988027", "data-lng" => "5.1748288", "data-title" => Sibu::DEFAULT_TEXT}
       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))

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/views/layouts/sibu/edit_content.html.erb

@@ -3,16 +3,19 @@
 <head>
   <title><%= conf[:title] %></title>
   <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
-  <%= stylesheet_link_tag conf[:stylesheet], media: 'all' %>
-  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
+  <%= 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 %>
+  <%= 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' %>">
@@ -44,11 +47,8 @@
 <%= javascript_include_tag 'sibu/sibu' %>
 <script>
     document.addEventListener("DOMContentLoaded", function() {
-        initOverlays();
+        initOverlays("<%= @edit_section || '' %>");
         sibuCallback("editContent");
-        <% unless @edit_section.blank? %>
-          document.querySelector("[data-sb-overlay='<%= @edit_section %>']").click();
-        <% end %>
     });
 
     function setEditMode(section, overlay, left, top, width, height) {
@@ -77,7 +77,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 = "";
@@ -232,14 +233,14 @@
         }
     }
 
-    function initOverlays() {
+    function initOverlays(activeSection = "") {
         setTimeout(function() {
             var container = document.querySelector("#edit_overlays"), sections = document.querySelectorAll("[data-sb-id]");
             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"));
@@ -255,9 +256,31 @@
                     };
                 })(sections[i], sectionBox.left, yOffset, width, height));
             }
+            if (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

@@ -1,10 +1,11 @@
 <h2>Modifier le contenu</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[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/_form.html.erb

@@ -13,6 +13,13 @@
       <small>L'adresse (ou URL) de la page, utilisée par les navigateurs web pour y accéder</small>
     </div>
   </div>
+  <div class="sibu_field">
+    <%= f.label :source, "Référence" %>
+    <div>
+      <%= f.text_field :source, placeholder: "Référence interne optionnelle (Ex: test mise en page 2) " %>
+      <small>Un bref descriptif de la page, à usage interne uniquement</small>
+    </div>
+  </div>
   <div class="sibu_field">
     <%= f.label :is_home, "Page d'accueil" %>
     <div>
@@ -56,6 +63,7 @@
     </div>
   </div>
   <%= f.hidden_field :site_id %>
+  <%= f.hidden_field :site_id %>
   <div class="sibu_actions">
     <%= f.submit 'Valider' %>
     <%= link_to 'Annuler', :back %>

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

@@ -1,5 +1,6 @@
 <h2>Modifier la carte</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">

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

@@ -86,8 +86,8 @@ 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 %>

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>
@@ -8,7 +11,7 @@
     <tr>
       <th>Nom</th>
       <th>Chemin d'accès</th>
-      <th>Origine</th>
+      <th>Référence</th>
       <th>Mise à jour</th>
       <th></th>
     </tr>
@@ -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/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.1'
+  VERSION = '1.0.6'
 end

metadata

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