sibu 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c6e2a83ee5222226abadce0270913620fc0be7
-  data.tar.gz: 838423c80a797ef3c8a5f4022d94f23b6c8e880a
+  metadata.gz: c61f2f2905326da60f6cd60d7a4288fda6c788b4
+  data.tar.gz: ff7bb3dc20761e3919071963598eca29ad12fb61
 SHA512:
-  metadata.gz: 8e638a83f6b58bafa9bf0cd6a17850586f538f1dd3b4909849924ba47687bc6970bb29982768f4f2d20d5468c32094953a4562fea2a132f86c2c075c3e2c48e0
-  data.tar.gz: a596fe89724f5f320f239ba844538d6e9556e14a67059b18af7de73c13c1c4fa1a335399721a9b97ec252650d36f97aa985a88d938a66ef8006e2377ab259a5a
+  metadata.gz: a0d470dac9b1215dd9d27e59b21e278c40beae5abbaed2dde2718348945dd9e42411c1e9ccef307e9cec56de5736cdc90d23684621e2a2574c1ace95861d8c28
+  data.tar.gz: 9d7896645eb2ae46714c8f60acf0e379a93738ad159f075a986a79d5ff979e4d4b8f3b792e4628db91b1be897366901913024bf2e25cef084d18c7523d364a10

data/app/assets/stylesheets/sibu/sibu.css

@@ -7,29 +7,29 @@
     position: relative
 }
 
-sb-edit {
-    position: relative;
-    display: inherit;
-    width: 100%;
-}
+/*sb-edit {*/
+    /*position: relative;*/
+    /*display: inherit;*/
+    /*width: 100%;*/
+/*}*/
 
-sb-edit div.sb-overlay {
-    position: absolute;
-    z-index: 999;
-    opacity: 0;
-    background-color: rgba(0, 0, 0, 0.5);
-    cursor: pointer;
-    top: 0;
-    left: 0;
-}
+/*sb-edit div.sb-overlay {*/
+    /*position: absolute;*/
+    /*z-index: 999;*/
+    /*opacity: 0;*/
+    /*background-color: rgba(0, 0, 0, 0.5);*/
+    /*cursor: pointer;*/
+    /*top: 0;*/
+    /*left: 0;*/
+/*}*/
 
-sb-edit div.sb-overlay a {
-    display: inline-block;
-    width: 100%;
-    height: 100%;
-}
+/*sb-edit div.sb-overlay a {*/
+    /*display: inline-block;*/
+    /*width: 100%;*/
+    /*height: 100%;*/
+/*}*/
 
-sb-edit .sb-editable {
+.sb-editable {
     cursor: pointer;
     outline: dashed rgba(94, 219, 255, 0.8) 2px;
     outline-offset: -3px;
@@ -81,6 +81,17 @@ sb-edit .sb-editable {
     background-color: white;
 }
 
+#edit_overlays > * {
+    position: absolute;
+    z-index: 999;
+    background-color: rgba(94, 219, 255, 0.5);
+    opacity: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+}
+
 .trix-button-group--block-tools {
     display: none !important;
 }

data/app/controllers/sibu/pages_controller.rb

@@ -72,19 +72,20 @@ module Sibu
     def edit_element
       @content_type = params[:content_type]
       @links = @site.pages_path_by_id if @site
-      @element = @entity.element(*@section_id.split('|'), @element_id)
+      @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
     end
 
     def update_element
-      @updated = @entity.update_element(*@section_id.split('|'), element_params)
+      ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
+      @updated = @entity.update_element(*ids, element_params)
     end
 
     def clone_element
-      @cloned = @entity.clone_element(*@section_id.split('|'), @element_id)
+      @cloned = @entity.clone_element(*@section_id.split('|'), *@element_id.split('|'))
     end
 
     def delete_element
-      @deleted = @entity.delete_element(*@section_id.split('|'), @element_id)
+      @deleted = @entity.delete_element(*@section_id.split('|'), *@element_id.split('|'))
     end
 
     def edit_section

data/app/helpers/sibu/pages_helper.rb

@@ -21,7 +21,7 @@ module Sibu
       define_method(t) do |elt, html_opts = {}|
         defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => "Texte à modifier"}
         content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-        html_opts.merge!({class: "sb-#{t} #{html_opts[:class]}", data: {id:  elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+        html_opts.merge!({class: "sb-#{t} #{html_opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
         content_tag(t, raw(content["text"]).html_safe, html_opts)
       end
     end
@@ -100,7 +100,7 @@ module Sibu
       wrapper = opts.delete(:wrapper)
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      opts.merge!({class: "sb-img #{opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      opts.merge!({class: "sb-img #{opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
       wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts) : content_tag(:img, nil, content.except("id").merge(opts))
     end
 
@@ -117,31 +117,53 @@ module Sibu
     end
     alias site sb_site
 
-    def repeat(&block)
-      ((action_name != 'show' ? "<sb-edit data-id='#{@sb_section}' data-entity='#{@sb_entity == @site ? 'site' : 'page'}'>" : '') +
-          @sb_entity.section(@sb_section).map {|elt| capture(elt, &block)}.join('') +
-        (action_name != 'show' ? "</sb-edit>" : '')).html_safe
-    end
-
-    def secsion(id)
-      @sb_section = id
-      if block_given?
-        if current_action != 'show'
-          "<sb-edit data-id='#{@sb_section}' data-entity='#{@sb_entity == @site ? 'site' : 'page'}'>#{capture(self, &block)}</sb-edit>".html_safe
-        else
-          capture(self, &block)
-        end
-      else
-        self
-      end
-    end
+    # def repeat(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
+    #   ((action_name != 'show' ? "<sb-edit data-id='#{@sb_section}' data-entity='#{@sb_entity == @site ? 'site' : 'page'}'>" : '') +
+    #       @sb_entity.section(@sb_section).map {|elt| capture(elt, &block)}.join('') +
+    #     (action_name != 'show' ? "</sb-edit>" : '')).html_safe
+    # end
 
-    def secsions(id)
+    # def secsion(id)
+    #   @sb_section = id
+    #   if block_given?
+    #     if current_action != 'show'
+    #       "<sb-edit data-id='#{@sb_section}' data-entity='#{@sb_entity == @site ? 'site' : 'page'}'>#{capture(self, &block)}</sb-edit>".html_safe
+    #     else
+    #       capture(self, &block)
+    #     end
+    #   else
+    #     self
+    #   end
+    # end
+    #
+    # def secsions(id)
+    #
+    # end
 
+    def secsion(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
+      content_tag(tag, capture(self, &block), opts)
     end
 
-    def elts
+    def secsions(id, tag, html_opts = {}, &block)
+      (@sb_entity.section(id).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-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
+        content_tag(tag, capture(self, i, &block), opts)
+      end).join('').html_safe
+    end
 
+    # Note : could work well - set the ids hierarchy in elements retrieved from the db
+    def elts(id)
+      items = []
+      @sb_entity.section(*@sb_section, id).each do |item|
+        item["id"] = [id, item["id"]].join("|")
+        items << item
+      end
+      items
     end
 
     # def bg_img(elt, html_opts = {})
@@ -154,7 +176,7 @@ module Sibu
     def link(elt, html_opts = {}, &block)
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "value" => "", "text" => "Nouveau lien"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({class: "sb-link #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      html_opts.merge!({class: "sb-link #{html_opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
       val = content["value"] || ""
       if val.to_s.include?('http')
         href = val
@@ -171,15 +193,19 @@ module Sibu
     def form_label(elt, html_opts = {}, &block)
       defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => "Texte à modifier"}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      html_opts.merge!({class: "sb-label #{html_opts[:class]}", data: {id:  elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      html_opts.merge!({class: "sb-label #{html_opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
       content_tag(:label, raw(content["text"]).html_safe, html_opts)
     end
 
     def interactive_map(elt, html_opts = {}, &block)
       defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => "Titre marqueur"}
       content = elt.is_a?(Hash) ? defaults.merge(elt) : (select_element(elt) || {"id" => elt}).merge(defaults)
-      html_opts.merge!({class: "sb-map #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      html_opts.merge!({class: "sb-map #{html_opts[:class]}", data: {id: elt_id(elt)}}) if action_name != 'show'
       content_tag(:div, nil, content.merge(html_opts))
     end
+
+    def elt_id(elt)
+      elt.is_a?(Hash) ? elt["id"] : elt
+    end
   end
 end

data/app/helpers/sibu/sites_helper.rb

@@ -9,11 +9,11 @@ module Sibu
     end
 
     def primary_fonts
-      Rails.application.config.sibu[:primary_fonts]
+      [''] + Rails.application.config.sibu[:primary_fonts]
     end
 
     def secondary_fonts
-      Rails.application.config.sibu[:secondary_fonts]
+      [''] + Rails.application.config.sibu[:secondary_fonts]
     end
   end
 end

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

@@ -10,6 +10,12 @@
     <%= stylesheet_link_tag @site.site_template.path, media: "all" %>
     <%= javascript_include_tag "#{@site.site_template.path}-core" %>
   <% end %>
+  <% unless @site.primary_font.blank? %>
+    <%= stylesheet_link_tag "fonts/#{@site.primary_font.downcase}", media: "all" %>
+  <% end %>
+  <% unless @site.secondary_font.blank? %>
+    <%= stylesheet_link_tag "fonts/#{@site.secondary_font.downcase}", media: "all" %>
+  <% end %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>
@@ -29,10 +35,11 @@
             <p id="edit_section_msg">Modifier la section</p>
             <button id="clone_section" onclick="cloneSection()">Dupliquer</button>
             <button id="delete_section" onclick="deleteSection()">Supprimer</button>
-            <button onclick="cancelEditMode()">Annuler</button>
+            <button onclick="cancelEditMode()">Fermer</button>
           </div>
         </div>
-      <% end %>
+        <div id="edit_overlays"></div>
+    <% end %>
     </div>
   <% end %>
 <% end %>
@@ -45,48 +52,48 @@
         initOverlays();
     });
 
-    function setEditMode(elt) {
-        var offset = elt.offset();
-        var width = elt.width(), height = elt.height();
-        var overlay = $("#edit_mode_overlay");
-        var yPosition = offset.top - $(".sibu_content_panel").offset().top;
-        var section = elt.parents("sb-edit").first();
-        overlay.find(".overlay_top").css("height", yPosition);
-        overlay.find(".overlay_bottom").css("top", yPosition + height);
-        overlay.find(".overlay_left").css({"height": height, "width": offset.left, "top": yPosition});
-        overlay.find(".overlay_right").css({"height": height, "left": offset.left + width, "top": yPosition});
-        overlay.find(".edit_mode_actions").css({"top": (yPosition <= 40 ? (yPosition + height) : (yPosition - 40)), left: offset.left, width: width});
-        overlay.find("#edit_section_msg").text("Modifier la section");
-        overlay.show();
+    function setEditMode(section, overlay, left, top, width, height) {
+        // var offset = elt.offset();
+        // var width = elt.width(), height = elt.height();
+        var editMode = $("#edit_mode_overlay");
+        // var yPosition = offset.top - $(".sibu_content_panel").offset().top;
+        // var section = elt.parents("sb-edit").first();
+        editMode.find(".overlay_top").css("height", top);
+        editMode.find(".overlay_bottom").css("top", top + height);
+        editMode.find(".overlay_left").css({"height": height, "width": left, "top": top});
+        editMode.find(".overlay_right").css({"height": height, "left": left + width, "top": top});
+        editMode.find(".edit_mode_actions").css({"top": (top <= 40 ? (top + height) : (top - 40)), left: left, width: width});
+        editMode.find("#edit_section_msg").text("Modifier la section");
+        editMode.show();
         if(!section.data('duplicate')) {
-            overlay.find("#clone_section").hide();
-            overlay.find("#delete_section").hide();
+            editMode.find("#clone_section").hide();
+            editMode.find("#delete_section").hide();
         } else {
-            overlay.find("#clone_section").show();
-            overlay.find("#delete_section").show();
+            editMode.find("#clone_section").show();
+            editMode.find("#delete_section").show();
         }
-        window.scrollTo(0, yPosition);
+        window.scrollTo(0, top);
         section.addClass('sb-editing');
-        initInnerOverlays(elt);
-        elt.remove();
+        initInnerOverlays(section);
+        $("#edit_overlays").html("");
     }
 
     function cancelEditMode() {
         $("#edit_mode_overlay").hide();
         cancelEdit();
-        $("sb-edit.sb-editing").removeClass("sb-editing");
+        $(".sb-editing").removeClass("sb-editing");
         initOverlays();
     }
 
     function cloneSection() {
         if (window.confirm("Dupliquer la section ?")) {
-            var section = $("sb-edit.sb-editing");
+            var section = $(".sb-editing").first();
             $.ajax({
                 url: "<%= clone_section_site_page_path(@site.id, @page.id) %>",
                 method: "POST",
                 data: {
-                    section_id: section.data("id"),
-                    entity: section.data("entity")
+                    section_id: section.data("sb-id"),
+                    entity: section.data("sb-entity")
                 }
             })
         }
@@ -94,13 +101,13 @@
 
     function deleteSection() {
         if (window.confirm("Supprimer la section ?")) {
-            var section = $("sb-edit.sb-editing");
+            var section = $(".sb-editing").first();
             $.ajax({
                 url: "<%= delete_section_site_page_path(@site.id, @page.id) %>",
                 method: "DELETE",
                 data: {
-                    section_id: section.data("id"),
-                    entity: section.data("entity")
+                    section_id: section.data("sb-id"),
+                    entity: section.data("sb-entity")
                 }
             })
         }
@@ -123,8 +130,8 @@
         })
     }
 
-    function initInnerOverlays(elt) {
-        var editables = elt.parents("sb-edit").first().find("[class*='sb-']");
+    function initInnerOverlays(section) {
+        var editables = section.find("[class*='sb-']");
         editables.off();
         editables.hover(function() {
             $(this).addClass("sb-editable");
@@ -134,8 +141,7 @@
         editables.click(function(evt) {
             evt.preventDefault();
             var elt = $(this), tag = elt.prop("tagName").toLowerCase();
-            var section = elt.parents("sb-edit").first();
-            var eltId = elt.data("id"), sectionId = section.data("id"), entity = section.data("entity");
+            var eltId = elt.data("id"), sectionId = section.data("sb-id"), entity = section.data("sb-entity");
             if (TEXT_TAGS.indexOf(tag) !== -1) {
                 editContent(eltId, sectionId, entity, 'text');
             } else if (IMG_TAGS.indexOf(tag) !== -1 || elt.hasClass('sb-img')) {
@@ -149,25 +155,55 @@
     }
 
     function initOverlays() {
-        $("div.sb-overlay").remove();
-        $("sb-edit").each(function() {
-            var elt = $(this);
-            elt.prepend("<div class='sb-overlay'><a>Modifier</a></div>");
-            var overlay = elt.find(".sb-overlay");
-            var dimensions = overlayDimensions(overlay, elt);
-            overlay.width(dimensions.width);
-            overlay.height(dimensions.height);
-
-            elt.hover(function() {
-                overlay.css("opacity", 1);
-            }, function() {
-                overlay.css("opacity", 0);
-            });
+        // $("div.sb-overlay").remove();
+        // $("sb-edit").each(function() {
+        //     var elt = $(this);
+        //     elt.prepend("<div class='sb-overlay'><a>Modifier</a></div>");
+        //     var overlay = elt.find(".sb-overlay");
+        //     var dimensions = overlayDimensions(overlay, elt);
+        //     overlay.width(dimensions.width);
+        //     overlay.height(dimensions.height);
+        //
+        //     elt.hover(function() {
+        //         overlay.css("opacity", 1);
+        //     }, function() {
+        //         overlay.css("opacity", 0);
+        //     });
+        //
+        //     overlay.click(function() {
+        //         setEditMode($(this));
+        //     })
+        // });
+        var container = $("#edit_overlays");
+        container.html("");
+        $("[data-sb-id]").each(function() {
+          var section = $(this);
+          var offset = section.offset();
+          var yOffset = offset.top - $(".sibu_content_panel").offset().top;
+          var width = section.outerWidth(), height = (section.outerHeight() === 0 ? childrenHeight(section) : section.outerHeight());
+          var overlay = $("<div>Modifier</div>");
+          container.append(overlay);
+          overlay.css({top: yOffset, left: offset.left, width: width, height: height});
+          overlay.hover(function() {
+              $(this).css("opacity", 1);
+          }, function() {
+              $(this).css("opacity", 0);
+          });
+          overlay.click(function() {
+              setEditMode(section, $(this), offset.left, yOffset, width, height);
+          })
+        });
+    }
 
-            overlay.click(function() {
-                setEditMode($(this));
-            })
+    function childrenHeight(parentElt) {
+        var height = 0;
+        parentElt.find("*").each(function() {
+            var childHeight = $(this).height();
+            if(childHeight > height) {
+                height = childHeight;
+            }
         });
+        return height;
     }
 
     function overlayDimensions(overlay, element) {

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

@@ -10,6 +10,12 @@
     <%= stylesheet_link_tag @site.site_template.path, media: "all" %>
     <%= javascript_include_tag @site.site_template.path %>
   <% end %>
+  <% unless @site.primary_font.blank? %>
+    <%= stylesheet_link_tag "fonts/#{@site.primary_font.downcase}", media: "all" %>
+  <% end %>
+  <% unless @site.secondary_font.blank? %>
+    <%= stylesheet_link_tag "fonts/#{@site.secondary_font.downcase}", media: "all" %>
+  <% end %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>

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

@@ -12,6 +12,7 @@
                      {prompt: 'Sélectionnez une page'} %>
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <%= hidden_field_tag :element_id, @element_id %>
     <%= hidden_field_tag :section_id, @section_id %>
     <%= hidden_field_tag :entity, @entity_type %>
     <div class="sibu_actions">

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

@@ -7,7 +7,7 @@
       <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id, page_id: @page.id) %> une image</p>
       <% @site.images.each do |image| %>
       <div class="sibu_image">
-        <%= image_tag image.file_url(:small) %>
+        <%= image_tag image.file_url(:medium), class: (@element["src"] == image.file_url(:medium) ? 'selected' : '') %>
       </div>
       <% end %>
     </div>
@@ -17,6 +17,7 @@
     </div>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
     <%= hidden_field_tag 'element[src]', @element["src"] %>
+    <%= hidden_field_tag :element_id, @element_id %>
     <%= hidden_field_tag :section_id, @section_id %>
     <%= hidden_field_tag :entity, @entity_type %>
     <div class="sibu_actions">

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

@@ -4,6 +4,7 @@
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
     <%= trix_editor_tag 'element[text]', '', input: 'element_text' %>
     <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <%= hidden_field_tag :element_id, @element_id %>
     <%= hidden_field_tag :section_id, @section_id %>
     <%= hidden_field_tag :entity, @entity_type %>
     <div class="sibu_actions">

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

@@ -2,7 +2,7 @@
 $("#edit_panel #edit_msg").html("<p class='sibu_alert'>Une erreur s'est produite lors de l'enregistrement.</p>");
 <% else %>
 $("#edit_panel").slideUp();
-var clonedElt = $("sb-edit[data-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']").first();
+var clonedElt = $("[data-sb-id='<%= @section_id %>']").find("[data-id='<%= @element_id %>']").first();
 var newElt = clonedElt.clone();
 newElt.data("id", "<%= @cloned["id"] %>");
 clonedElt.after(newElt);

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

@@ -1,4 +1,3 @@
-<%= render 'custom_styles' %>
 <div class="edit_content">
   <%= render "shared/#{@site.site_template.path}/site" %>
 </div>

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

@@ -7,9 +7,13 @@ editPanel.html("");
   editorElt.editor.loadHTML("<%= j(raw(text_value.gsub("\n", "<br/>"))) %>");
 <% elsif @content_type == 'media' %>
   editPanel.html("<%= j(render 'media_edit_panel') %>");
-  editPanel.find(".sibu_image img").click(function() {
-    $(this).toggleClass('selected');
-    $("#element_src").val($(this).attr("src"));
+  var images = editPanel.find(".sibu_image img");
+  images.click(function() {
+    if(!$(this).hasClass('selected')) {
+      images.removeClass('selected');
+      $(this).addClass('selected');
+      $("#element_src").val($(this).attr("src"));
+    }
   });
 <% elsif @content_type == 'link' %>
   editPanel.html("<%= j(render 'link_edit_panel') %>");

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

@@ -1,2 +1 @@
-<%= render 'custom_styles' %>
 <%= render "shared/#{@site.site_template.path}/site" %>

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

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

data/app/views/sibu/sites/_form.html.erb

@@ -31,11 +31,11 @@
   </div>
   <div class="sibu_field">
     <%= f.label :name, 'Police de caractères (titres)' %>
-
+    <%= f.select :primary_font, primary_fonts, {prompt: 'Police par défaut'} %>
   </div>
   <div class="sibu_field">
     <%= f.label :name, 'Police de caractères (corps)' %>
-
+    <%= f.select :secondary_font, secondary_fonts, {prompt: 'Police par défaut'} %>
   </div>
   <%= f.hidden_field :user_id %>
   <div class="sibu_actions">

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

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