sibu 0.9.0 → 0.9.5

data/app/controllers/sibu/sites_controller.rb

@@ -37,6 +37,9 @@ module Sibu
         if conf[:custom_styles] && @site.previous_changes.has_key?(:custom_data)
           generate_styles(@site)
         end
+        if @site.previous_changes.has_key?(:version)
+          @site.update_paths
+        end
         redirect_to sites_url, notice: "Le site a bien été mis à jour."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement du site."

data/app/helpers/sibu/pages_helper.rb

@@ -37,7 +37,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" => DEFAULT_TEXT}
+        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "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(t, raw(content["text"]).html_safe, html_opts)
@@ -46,7 +46,7 @@ module Sibu
 
     def p(elt, opts = {})
       repeat = opts.delete(:repeat)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_PARAGRAPH}
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => Sibu::DEFAULT_PARAGRAPH}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
       opts.merge!({data: {id: elt_id(elt), repeat: repeat, type: "paragraph"}}) if action_name != 'show'
       content_tag(:div, content_tag(:p, raw(content["text"]).html_safe), opts)
@@ -69,7 +69,7 @@ module Sibu
       wrapper = opts.delete(:wrapper)
       repeat = opts.delete(:repeat)
       size = opts.delete(:size)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => DEFAULT_IMG}
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => Sibu::DEFAULT_IMG}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
       if action_name == 'show'
         content["src"] = ("/#{conf[:deployment_path]}" + content["src"]) if @online && conf[:deployment_path]
@@ -90,8 +90,16 @@ module Sibu
       content_tag(wrapper, capture(*elts(elt), &block), opts)
     end
 
+    def empty_tag(elt, tag, type, opts = {})
+      repeat = opts.delete(:repeat)
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt}.merge!(default_content(type))
+      opts = defaults.merge(opts)
+      opts.merge!({data: {id: elt_id(elt), type: type, repeat: repeat}}) if action_name != 'show'
+      content_tag(tag, nil, opts)
+    end
+
     def form_label(elt, html_opts = {}, &block)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => DEFAULT_TEXT}
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "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)
@@ -131,14 +139,6 @@ module Sibu
       content_tag(tag, capture(self, &block), opts)
     end
 
-    def sections(id, tag, html_opts = {}, &block)
-      (@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 elts(id)
       items = []
       element_id = elt_id(id)
@@ -155,7 +155,7 @@ 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" => DEFAULT_TEXT}
+      defaults = {"id" => elt_id(elt), "value" => "", "text" => Sibu::DEFAULT_TEXT}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
       val = content.delete("value") || ""
       text = content.delete("text")
@@ -181,7 +181,7 @@ module Sibu
     end
 
     def interactive_map(elt, html_opts = {})
-      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => DEFAULT_TEXT}
+      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "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))
@@ -190,5 +190,20 @@ module Sibu
     def elt_id(elt)
       elt.is_a?(Hash) ? (elt["data-id"] || elt["id"]) : elt
     end
+
+    def default_content(type)
+      case type
+      when "text"
+        {"text" => Sibu::DEFAULT_TEXT}
+      when "link"
+        {"value" => "", "text" => Sibu::DEFAULT_TEXT}
+      when "paragraph"
+        {"text" => Sibu::DEFAULT_PARAGRAPH}
+      when "media"
+        {"src" => Sibu::DEFAULT_IMG}
+      when "embed"
+        {"code" => '<p>Contenu HTML personnalisé (iframe, etc...)</p>'}
+      end
+    end
   end
 end

data/app/models/sibu/page.rb

@@ -30,12 +30,13 @@ module Sibu
       save
     end
 
-    def update_path
+    def update_path(force_update = false)
       prefix = site.version == Sibu::Site::DEFAULT_VERSION ? '' : "#{site.version}/"
       if is_home == 'true'
-        self.path = ''
+        self.path = prefix
       else
         self.path = "#{prefix}#{name.parameterize}" if self.path.blank?
+        self.path = "#{prefix}#{name.parameterize}" if self.path.blank? || force_update
       end
     end
 

data/app/models/sibu/site.rb

@@ -36,7 +36,7 @@ module Sibu
     end
 
     def section_template(section)
-        "#{site_template.path}/#{section["category"]}/#{section["template"]}"
+      "#{site_template.path}/#{section["category"]}/#{section["template"]}"
     end
 
     def not_found
@@ -69,6 +69,13 @@ module Sibu
       Hash[pages.collect {|p| [p.id.to_s, p.path]}]
     end
 
+    def update_paths
+      pages.each do |p|
+        p.update_path(true)
+        p.save
+      end
+    end
+
     def init_pages(source)
       site_data = Rails.application.config.sibu[:site_data][source]
       site_data.pages.each do |p|

data/app/models/sibu/site_template.rb

@@ -16,6 +16,9 @@ module Sibu
         sections_list += Dir.glob(dir + "*.erb").map {|f| f.split('/').last}.
             map {|f| f[1..-1].gsub('.html.erb', '')}.map {|f| {"id" => "sibu_template_#{f}", "category" => cat, "template" => f}}
       end
+      if Rails.application.config.sibu[:sections_ordering]
+        sections_list = Rails.application.config.sibu[:sections_ordering].call(sections_list)
+      end
       sections_list
     end
   end

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

@@ -2,10 +2,10 @@
 <html>
 <head>
   <title><%= conf[:title] %></title>
-  <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
   <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
-  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
+  <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
   <%= javascript_include_tag 'sibu/sibu' %>
+  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <% if @site %>
     <%= stylesheet_link_tag (conf[:custom_styles] ? @site.style_url : @site.site_template.path), media: "all" %>
     <%= javascript_include_tag "#{@site.site_template.path}-core" %>
@@ -123,55 +123,40 @@
     function deleteSection() {
         if (window.confirm("Supprimer la section ?")) {
             var section = $(".sb-editing").first();
-            $.ajax({
+            Rails.ajax({
                 url: "<%= delete_section_site_page_path(@site.id, @page.id) %>",
-                method: "DELETE",
-                data: {
-                    section_id: section.data("sb-id"),
-                    entity: section.data("sb-entity")
-                }
+                type: "DELETE",
+                data: new URLSearchParams({section_id: section.data("sb-id"), entity: section.data("sb-entity")}).toString()
             })
         }
     }
 
     function cloneElement(entity, sectionId, elementId) {
         if (window.confirm("Dupliquer l'élément ?")) {
-            $.ajax({
+            Rails.ajax({
                 url: "<%= clone_element_site_page_path(@site.id, @page.id) %>",
-                method: "POST",
-                data: {
-                    section_id: sectionId,
-                    element_id: elementId,
-                    entity: entity
-                }
+                type: "POST",
+                data: new URLSearchParams({section_id: sectionId, element_id: elementId, entity: entity})
             })
         }
     }
 
     function deleteElement(entity, sectionId, elementId) {
         if (window.confirm("Supprimer l'élément ?")) {
-            $.ajax({
+            Rails.ajax({
                 url: "<%= delete_element_site_page_path(@site.id, @page.id) %>",
-                method: "DELETE",
-                data: {
-                    section_id: sectionId,
-                    element_id: elementId,
-                    entity: entity
-                }
+                type: "DELETE",
+                data: new URLSearchParams({section_id: sectionId, element_id: elementId, entity: entity})
             })
         }
     }
 
     function addChildElement(entity, sectionId, elementId) {
         if (window.confirm("Ajouter un sous-menu ?")) {
-            $.ajax({
+            Rails.ajax({
                 url: "<%= child_element_site_page_path(@site.id, @page.id) %>",
-                method: "POST",
-                data: {
-                    section_id: sectionId,
-                    element_id: elementId,
-                    entity: entity
-                }
+                type: "POST",
+                data: new URLSearchParams({section_id: sectionId, element_id: elementId, entity: entity})
             })
         }
     }

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

@@ -10,12 +10,48 @@
     <%= stylesheet_link_tag (conf[:custom_styles] ? @site.style_url : @site.site_template.path), media: "all" %>
     <%= javascript_include_tag @site.site_template.path %>
     <% unless @site.analytics_id.blank? %>
-      <script async src="https://www.googletagmanager.com/gtag/js?id=<%= @site.analytics_id %>"></script>
-      <script>
-          window.dataLayer = window.dataLayer || [];
-          function gtag(){dataLayer.push(arguments);}
-          gtag('js', new Date());
-          gtag('config', '<%= @site.analytics_id %>');
+      <%= stylesheet_link_tag 'tarteaucitron/tarteaucitron' %>
+      <%= javascript_include_tag 'tarteaucitron/tarteaucitron' %>
+      <script type="text/javascript">
+        var defaultOpts = {
+            "privacyUrl": "", /* Privacy policy url */
+            "hashtag": "#tarteaucitron", /* Open the panel with this hashtag */
+            "cookieName": "tarteaucitron", /* Cookie name */
+            "orientation": "bottom", /* Banner position (top - bottom) */
+            "showAlertSmall": false, /* Show the small banner on bottom right */
+            "cookieslist": true, /* Show the cookie list */
+            "adblocker": false, /* Show a Warning if an adblocker is detected */
+            "AcceptAllCta": true, /* Show the accept all button when highPrivacy on */
+            "highPrivacy": false, /* Disable auto consent */
+            "handleBrowserDNTRequest": false, /* If Do Not Track == 1, disallow all */
+            "removeCredit": false, /* Remove credit link */
+            "moreInfoLink": true, /* Show more info link */
+            "useExternalCss": true, /* If false, the tarteaucitron.css file will be loaded */
+            "readmoreLink": "/cookiespolicy" /* Change the default readmore link */
+        };
+        if (typeof tarteaucitronOpts === 'undefined') {
+            var tarteaucitronOpts = defaultOpts;
+        } else {
+            tarteaucitronOpts["hashtag"] = "#tarteaucitron";
+            tarteaucitronOpts["cookieName"] = "tarteaucitron";
+            tarteaucitronOpts["orientation"] = tarteaucitronOpts["orientation"] || "top";
+            tarteaucitronOpts["showAlertSmall"] = !(tarteaucitronOpts["showAlertSmall"] === false);
+            tarteaucitronOpts["cookieslist"] = !(tarteaucitronOpts["cookieslist"] === false);
+            tarteaucitronOpts["adblocker"] = tarteaucitronOpts["adblocker"] === true;
+            tarteaucitronOpts["AcceptAllCta"] = tarteaucitronOpts["AcceptAllCta"] === true;
+            tarteaucitronOpts["highPrivacy"] = !(tarteaucitronOpts["AcceptAllCta"] === false);
+            tarteaucitronOpts["handleBrowserDNTRequest"] = !(tarteaucitronOpts["handleBrowserDNTRequest"] === false);
+            tarteaucitronOpts["removeCredit"] = !(tarteaucitronOpts["removeCredit"] === false);
+            tarteaucitronOpts["moreInfoLink"] = tarteaucitronOpts["moreInfoLink"] === true;
+            tarteaucitronOpts["useExternalCss"] = !(tarteaucitronOpts["useExternalCss"] === false);
+            tarteaucitronOpts["cookieDomain"] = "<%= @site.domain %>";
+        }
+        tarteaucitron.init(tarteaucitronOpts);
+      </script>
+      <script type="text/javascript">
+          tarteaucitron.user.analyticsUa = '<%= @site.analytics_id %>';
+          tarteaucitron.user.analyticsMore = function () {  };
+          (tarteaucitron.job = tarteaucitron.job || []).push('analytics');
       </script>
     <% end %>
   <% end %>

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

@@ -32,19 +32,19 @@
         </table>
       </div>
       <div class="sibu_selected_image">
-        <% if @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
+        <% if @element["src"] == Sibu::DEFAULT_IMG || @element["src"].blank? %>
           <p>Veuillez sélectionner une image.</p>
         <% end %>
-        <div class="sibu_custom_center" style="display: <%= (@element["src"] == DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
+        <div class="sibu_custom_center" style="display: <%= (@element["src"] == Sibu::DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
           <%= check_box_tag('custom_center', true, (!@element["class"].blank? && @element["class"].include?('posx')), id: 'custom_center', class: 'checkbox') %>
           <%= label_tag 'custom_center', "Recentrer l'image" %>
         </div>
         <div class="sibu_center">
-          <%= image_tag(@element["src"]) unless @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
+          <%= image_tag(@element["src"]) unless @element["src"] == Sibu::DEFAULT_IMG || @element["src"].blank? %>
           <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>
         </div>
-        <div class="sibu_field" style="display: <%= (@element["src"] == DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
+        <div class="sibu_field" style="display: <%= (@element["src"] == Sibu::DEFAULT_IMG || @element["src"].blank?) ? 'none' : 'block' %>">
           <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>
           <%= text_field_tag 'element[alt]', @element["alt"] %>
         </div>

data/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( tarteaucitron/tarteaucitron.css tarteaucitron/tarteaucitron.js )

data/config/initializers/constants.rb

@@ -1,3 +1,5 @@
-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"
+module Sibu
+  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"
+end

data/config/routes.rb

@@ -1,5 +1,8 @@
 Sibu::Engine.routes.draw do
 
+  scope format: true, constraints: { format: /jpg|png|gif|svg/ } do
+    get '/*missed', to: proc { [404, {}, ['']] }
+  end
   get '/', to: 'pages#show', constraints: lambda {|req| req.host != Rails.application.config.sibu[:host]}
   get '*path', to: 'pages#show', constraints: lambda {|req| req.host != Rails.application.config.sibu[:host]}
 

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.9.0'
+  VERSION = '0.9.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,11 +130,26 @@ files:
 - app/assets/javascripts/sibu/common.js
 - app/assets/javascripts/sibu/sibu.js.erb
 - app/assets/javascripts/tabs/van11y-accessible-tab-panel-aria.js
+- app/assets/javascripts/tarteaucitron/advertising.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.cs.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.de.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.el.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.en.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.es.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.fr.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.it.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.nl.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.pl.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.pt.js
+- app/assets/javascripts/tarteaucitron/lang/tarteaucitron.ru.js
+- app/assets/javascripts/tarteaucitron/tarteaucitron.js.erb
+- app/assets/javascripts/tarteaucitron/tarteaucitron.services.js
 - app/assets/stylesheets/cropper/cropper.css
 - app/assets/stylesheets/quill/quill.snow.css
 - app/assets/stylesheets/sibu/defaults.scss
 - app/assets/stylesheets/sibu/icons.scss
 - app/assets/stylesheets/sibu/sibu.css
+- app/assets/stylesheets/tarteaucitron/tarteaucitron.css
 - app/controllers/sibu/application_controller.rb
 - app/controllers/sibu/documents_controller.rb
 - app/controllers/sibu/images_controller.rb
@@ -207,6 +222,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/assets.rb
 - config/initializers/constants.rb
 - config/initializers/shrine.rb
 - config/routes.rb