sibu 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed2b94d1a87f438fc6eb718059f642276236c2c
-  data.tar.gz: 89102521337f1dadae87a2a54ca97f8e197ccdfc
+  metadata.gz: 23580168267b70a604f22863c33d73268eed7967
+  data.tar.gz: 0cac86156e41ebd512473aa887fab6fd02fb5b1b
 SHA512:
-  metadata.gz: 7bd12440bb6c524396acd5358bf0d9d7c719e349301ef755dd060674e8beb34cbc72eddd9adadc6ee2d7de9bfd4387f7b8e23f9e46a1b596aff7415cd1eaab05
-  data.tar.gz: 2b5c1829b6fead0c43eff2b5051d71603a40b535a62646c8d8b7abdec1c355716f686ff93dbd47329ad744d657a4906f9ae2d177e64b0f499124bb648c119454
+  metadata.gz: a48297363054e2ec96bcc07821a45395ef9a3e56e72f2c3edcaa4c28cf05612ec1d6b3b7dd046f67f5ccfd1e564f2c6564467383f2c8ea5e9a417fe17e551ac7
+  data.tar.gz: abd171b04e211b2b22d3d2136ee35101bb48f7e0d40b93377c377e6ab3e5c47372ddfdf0578594eb8d7591814ce93923b4659f3846f868c0529df465cc068fd6

data/app/helpers/sibu/pages_helper.rb

@@ -80,7 +80,7 @@ module Sibu
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt}
       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(self, &block), opts)
+      content_tag(wrapper, capture(*elts(elt), &block), opts)
     end
 
     def form_label(elt, html_opts = {}, &block)
@@ -156,10 +156,11 @@ module Sibu
       else
         content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
       end
+      # Note : sends elts in given order
       if block_given?
-        content_tag(:a, content.merge(html_opts).except("elements"), &block)
+        content_tag(:a, capture(*([raw(text)] + elts(elt)), &block), content.merge(html_opts).except("elements"))
       else
-        content_tag(:a, text, content.merge(html_opts).except("elements"))
+        content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
     end
 

data/app/models/sibu/dynamic_style.rb

@@ -22,7 +22,7 @@ module Sibu
         File.rename(scss_file_path, css_file_path)
         site.update(style: File.new(css_file_path))
       rescue Exception => ex
-          logger.error(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)

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

@@ -28,7 +28,7 @@
     <% end %>
     <% if @documents.empty? %>
       <tr>
-        <td colspan="4">Aucun document téléchargé pour le moment.</td>
+        <td colspan="5">Aucun document téléchargé pour le moment.</td>
       </tr>
     <% end %>
     </tbody>

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

@@ -27,6 +27,12 @@
       <%= hidden_field_tag 'element[target]', '_blank', disabled: current_type != 'document' %>
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <!-- Note : to be tested on multiple nested elements -->
+    <% (@element["elements"] || []).each do |e| %>
+      <% e.each_pair do |k, v| %>
+        <%= hidden_field_tag "element[elements][][#{k}]", v %>
+      <% end %>
+    <% end %>
     <%= hidden_field_tag :element_id, @element_id %>
     <%= hidden_field_tag :section_id, @section_id %>
     <%= hidden_field_tag :entity, @entity_type %>

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

@@ -1,24 +1,6 @@
 <% if @updated.nil? %>
   $("#edit_panel #edit_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");
-<% elsif @refresh %>
-  $("#edit_panel").slideUp();
-  location.reload(true);
 <% else %>
   $("#edit_panel").slideUp();
-  var updatedElt = $("[data-sb-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']");
-  <% if @updated["text"] %>
-    updatedElt.html("<%= j(raw @updated["text"]) %>");
-  <% elsif @updated["code"] %>
-    updatedElt.html("<%= j(raw @updated["code"]) %>");
-  <% end %>
-  <% unless @updated.except("id", "text", "value").blank? %>
-    var tag = updatedElt.prop("tagName").toLowerCase();
-    <% @updated.except("id", "text", "value").each_pair do |attr, val| %>
-      if(("<%= attr %>" === 'src' || "<%= attr %>" === 'alt' || "<%= attr %>" === 'style') && tag !== 'img') {
-        updatedElt.find("img").attr("<%= attr %>", "<%= val %>");
-      } else {
-        updatedElt.attr("<%= attr %>", "<%= val %>");
-      }
-    <% end %>
-  <% end %>
+  refreshAfterEdit(true, '<%= @section_id %>');
 <% end %>

data/lib/sibu/engine.rb

@@ -4,5 +4,13 @@ module Sibu
   class Engine < ::Rails::Engine
     isolate_namespace Sibu
     config.assets.paths << File.expand_path("../../assets/fonts", __FILE__)
+    config.to_prepare do
+      begin
+        # Load custom helper if defined
+        ApplicationController.helper(SibuCustomHelper)
+      rescue
+        Rails.logger.info("Sibu custom helper is not available - skipping")
+      end
+    end
   end
 end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails