sibu 0.8.2 → 0.9.2

data/app/helpers/sibu/pages_helper.rb

@@ -90,6 +90,14 @@ 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}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
@@ -190,5 +198,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" => DEFAULT_TEXT}
+      when "link"
+        {"value" => "", "text" => DEFAULT_TEXT}
+      when "paragraph"
+        {"text" => DEFAULT_PARAGRAPH}
+      when "media"
+        {"src" => DEFAULT_IMG}
+      when "embed"
+        {"code" => '<p>Contenu HTML personnalisé (iframe, etc...)</p>'}
+      end
+    end
   end
 end

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

@@ -3,7 +3,8 @@ module Sibu
     include ActiveSupport::Concern
 
     def for_user(usr)
-      Rails.application.config.sibu[:multi_user] ? where(user_id: [nil, usr.id]) : all
+      entities = (Rails.application.config.sibu[:multi_user] ? where(user_id: [nil, usr.id]) : all)
+      entities.order(updated_at: :desc)
     end
   end
 end

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

@@ -7,13 +7,29 @@
       <div class="sibu_select_images sibu_field">
         <p>Sélectionnez ou <%= link_to 'téléchargez', new_image_path(page_id: @page.id, section_id: @section_id, entity_type: @entity_type,
                                                                      element_id: @element_id, img_id: @element["id"], size: @size) %> une image</p>
-        <% site_images.each_with_index do |image, i| %>
-          <div class="sibu_image" data-img-id="<%= image.id %>">
-            <% if i == 0 %><span>Aucune image</span><% end %>
-            <%= image_tag image.file_url(:small), class: (@element["src"] == image.file_url(@size) ? 'selected' : ''),
-                          data: {src: image.file_url(@size), alt: image.alt} %>
-          </div>
-        <% end %>
+        <table class="sibu_images">
+          <thead>
+          <tr>
+            <th>Aperçu</th>
+            <th>Descriptif</th>
+            <th>Crédits</th>
+          </tr>
+          </thead>
+          <tbody>
+            <% site_images.each do |image| %>
+              <tr>
+                <td>
+                  <span class="sibu_image" data-img-id="<%= image.id %>">
+                    <%= image_tag image.file_url(:small), class: (@element["src"] == image.file_url(@size) ? 'selected' : ''),
+                                  data: {src: image.file_url(@size), alt: image.alt} %>
+                  </span>
+                </td>
+                <td><%= image.alt %></td>
+                <td><%= image.credits %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
       </div>
       <div class="sibu_selected_image">
         <% if @element["src"] == DEFAULT_IMG || @element["src"].blank? %>
@@ -26,6 +42,7 @@
         <div class="sibu_center">
           <%= image_tag(@element["src"]) unless @element["src"] == 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' %>">
           <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>

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

@@ -38,15 +38,19 @@ editPanel.slideDown("fast", function() {
             "text-align": wrapper.css("text-align")
         });
     <% when 'media' %>
-        var images = editPanel.find(".sibu_image img");
-        var customCenter = $("#custom_center"), customCtr;
+        var images = editPanel.find(".sibu_image");
+        var customCenter = $("#custom_center");
         images.click(function() {
             if(!$(this).hasClass('selected')) {
                 images.removeClass('selected');
                 $(this).addClass('selected');
-                $("#element_src").val($(this).data("src"));
-                $("#element_alt").val($(this).data("alt"));
-                editPanel.find(".sibu_center").html('<img src="' + $("#element_src").val() + '"/><div id="sibu_center_pos" style="display: none;">✕</div>');
+                var imgElt = $(this).find("img");
+                $("#element_src").val(imgElt.data("src"));
+                $("#element_alt").val(imgElt.data("alt"));
+                editPanel.find(".sibu_center").html(
+                    '<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.find(".sibu_selected_image > p:first-child").hide();
                 editPanel.find(".sibu_selected_image").find(".sibu_custom_center").show();
                 editPanel.find(".sibu_selected_image").find(".sibu_field").show();
@@ -69,6 +73,7 @@ editPanel.slideDown("fast", function() {
               $("#element_class").val("");
               $(".sibu_center").attr("style", "");
               $(".sibu_center > #sibu_center_pos").hide();
+              $(".sibu_center > #sibu_center_desc").hide();
           }
         });
     <% when 'link' %>

data/config/initializers/assets.rb

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

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.8.2'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shrine
   requirement: !ruby/object:Gem::Requirement
@@ -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