sibu 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bd4c7f3ddac097c6e3ff1718357d64f3769f886
-  data.tar.gz: c45772f2d3851da0c553d0fb7b76a427fc6fdea6
+  metadata.gz: cf0a50b455e8b126a684c7e873aab00e81d81c5b
+  data.tar.gz: 92a49e130dcfb15a8d4d468f9477ea688621b184
 SHA512:
-  metadata.gz: 02475b5b1707ec2f4807be144549aa06234050e9f2c34e600d34fcb807c29858a698d4b64697719763911b857aa4087b14ed29b9b62a51441205e418709a39eb
-  data.tar.gz: d9383148391ef403d4cc9de8ec3203853eb7870bc9c6de18ddd6b623d8277e9b505cff40ac738cbe668188175867189a7232eed49532f8c26d72a87e578cfda4
+  metadata.gz: ff2da9127eb7226336125f793ec6f174c5745b163f93e3e4d18e603033d206f1bfeb07231561fd1a2c485d69996cf55a425b8db808bec2c3cf8895f10cb46b1c
+  data.tar.gz: ad09d978727300f5c30bb1f3f21d7aa8d5151428f787db9c3004bccceb2af187eab3b77011e1354d4b18621f3fc581478a46b44d3c7d24dd845d4c159eb21f03

data/app/controllers/sibu/pages_controller.rb

@@ -102,6 +102,10 @@ module Sibu
       @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"}]}]}
+      @page.sections << {"id" => "sibu_template_table", "elements" => [
+          {"id" => "col0", "elements" => [{"id" => "row1"}, {"id" => "row2"}]},
+          {"id" => "col1", "elements" => [{"id" => "row1"}, {"id" => "row2"}]},
+      ]}
     end
 
     def create_section

data/app/helpers/sibu/pages_helper.rb

@@ -41,11 +41,12 @@ module Sibu
       end
     end
 
-    def p(elt, html_opts = {})
+    def p(elt, opts = {})
+      repeat = opts.delete(:repeat)
       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)
+      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)
     end
 
     def sb
@@ -58,7 +59,7 @@ module Sibu
 
     def elements(id = nil)
       items = id ? select_element(id)["elements"] : @sb_entity.find_or_init(*@sb_section)["elements"]
-      items.blank? ? [{"id" => ""}] : items
+      items.blank? ? [{"id" => "#{@sb_section.last}*"}] : items
     end
 
     def img(elt, opts = {})
@@ -71,6 +72,16 @@ module Sibu
       wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts) : content_tag(:img, nil, content.except("id").merge(opts))
     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}
+      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)
+    end
+
     # Note : see ActionView::OutputBuffer
     def sb_page
       @sb_entity = @page
@@ -109,7 +120,7 @@ module Sibu
           items << e
         end
       end
-      items.blank? ? [{"id" => element_id.split("|").last, "data-id" => [element_id, "#{id}0"].join("|")}] : items
+      items.blank? ? [{"id" => element_id.split("|").last, "data-id" => [element_id, "#{element_id}0"].join("|")}] : items
     end
 
     def link(elt, html_opts = {}, &block)

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

@@ -179,12 +179,14 @@
     function initInnerOverlays(section) {
         var editables = section.find("[data-type]");
         editables.off();
-        editables.hover(function() {
+        editables.hover(function(evt) {
+            evt.stopPropagation();
             $(this).addClass("sb-editable");
         }, function() {
             $(this).removeClass("sb-editable");
         });
         editables.click(function(evt) {
+            evt.stopPropagation();
             evt.preventDefault();
             var elt = $(this), eltId = elt.data("id"), repeat = elt.data("repeat"), type = elt.data("type"),
                 size = elt.data("size"), children = elt.data("children");

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

@@ -0,0 +1,3 @@
+<h2>Modifier le groupe</h2>
+<div id="edit_msg"></div>
+<%= render 'element_actions' %>

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

@@ -12,7 +12,7 @@
       <% end %>
     </div>
     <div class="sibu_field">
-      <%= label_tag 'element[alt]', 'Texte alternatif' %>
+      <%= label_tag 'element[alt]', 'Légende / texte alternatif' %>
       <%= text_field_tag 'element[alt]', @element["alt"] %>
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>

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

@@ -35,6 +35,8 @@ editPanel.html("");
     $("#link_" + selected).find("#element_value, #element_target").removeAttr("disabled");
     $("#link_" + other).find("#element_value, #element_target").attr("disabled", "disabled");
   });
+<% when 'group' %>
+  editPanel.html("<%= j(render 'group_edit_panel') %>");
 <% else %>
   editPanel.html("<%= j(render 'error_panel') %>");
 <% end %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.22'
+  VERSION = '0.1.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,6 +139,7 @@ files:
 - app/views/sibu/pages/_element_actions.html.erb
 - app/views/sibu/pages/_error_panel.html.erb
 - app/views/sibu/pages/_form.html.erb
+- app/views/sibu/pages/_group_edit_panel.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