sibu 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f39c1e6272a79e2e8411ec2c7f36cd8a4803ffd
-  data.tar.gz: 42a4ea2c163c8b7b4283cf799603158521a4afba
+  metadata.gz: 4506dd1c2b0f1f720045ba1bddd840a03ec19945
+  data.tar.gz: 2e028cfdf5c22480d37186397402d1dc7b3551b8
 SHA512:
-  metadata.gz: 2931fd1c14fde78303a6f987a8d237726126f3d1da78060998b61dd6ba22f752b32296cac2d20db18ec49b6bb3d8c70f0e90d64ecca26b5bf4afb508e1fe9f7a
-  data.tar.gz: cae5fec21675c2fdf8dc84964a6e46d689d3b0d646d965cd2b4b396453d4faef69f36a22ec7da9d8bc86727770d76fae50339e703c35ab60dc81f2eb9ea20ba3
+  metadata.gz: b38dbbe585fd82607bcb2d459b7262fb6b1302a104f06101d547038af567dda790dbeab16d2fc1fc8546653ebc4607c6c5d353a50d02dd3ed3d64b5d0772f53a
+  data.tar.gz: a03b06e0164de60a92a0e3c24071c1a4bb126260ab25fbb288951372884354e539108d666bb9110592707d5bc289e0ef25b5317f47669a027cc3538f7496a8ae

data/app/controllers/sibu/pages_controller.rb

@@ -74,6 +74,7 @@ module Sibu
       @links = @site.pages_path_by_id if @site
       @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
       @repeat = params[:repeat]
+      @size = params[:size].blank? ? :medium : params[:size].to_sym
     end
 
     def update_element

data/app/helpers/sibu/pages_helper.rb

@@ -58,9 +58,10 @@ module Sibu
     def img(elt, opts = {})
       wrapper = opts.delete(:wrapper)
       repeat = opts.delete(:repeat)
+      size = opts.delete(:size)
       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!({data: {id: elt_id(elt), type: "media", repeat: repeat}}) if action_name != 'show'
+      opts.merge!({data: {id: elt_id(elt), type: "media", repeat: repeat, size: size}}) 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
 

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

@@ -51,11 +51,7 @@
     });
 
     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});
@@ -146,7 +142,7 @@
         $("#edit_panel").slideUp("fast");
     }
 
-    function editContent(eltId, sectionId, entity, repeat, contentType) {
+    function editContent(eltId, sectionId, entity, repeat, contentType, size) {
         $.ajax({
             url: "<%= edit_element_site_page_path(@site.id, @page.id) %>",
             method: "GET",
@@ -155,7 +151,8 @@
                 section_id: sectionId,
                 entity: entity,
                 repeat: repeat,
-                content_type: contentType
+                content_type: contentType,
+                size: size
             }
         })
     }
@@ -170,32 +167,13 @@
         });
         editables.click(function(evt) {
             evt.preventDefault();
-            var elt = $(this), eltId = elt.data("id"), repeat = elt.data("repeat"), type = elt.data("type");
+            var elt = $(this), eltId = elt.data("id"), repeat = elt.data("repeat"), type = elt.data("type"), size = elt.data("size");
             var sectionId = section.data("sb-id"), entity = section.data("sb-entity");
-            editContent(eltId, sectionId, entity, repeat, type);
+            editContent(eltId, sectionId, entity, repeat, type, size);
         })
     }
 
     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);
-        //     });
-        //
-        //     overlay.click(function() {
-        //         setEditMode($(this));
-        //     })
-        // });
         var container = $("#edit_overlays");
         container.html("");
         $("[data-sb-id]").each(function() {
@@ -227,17 +205,6 @@
         });
         return height;
     }
-
-    function overlayDimensions(overlay, element) {
-        var children = element.find("> *:not(.sb-overlay)");
-        var width = - +children.first().css("margin-left").replace("px", ""), height = - +children.first().css("margin-top").replace("px", "");
-        var maxWidth = element.parent().outerWidth(true), maxHeight = element.parent().outerHeight(true);
-        element.find("> *:not(.sb-overlay)").each(function() {
-            width = width + $(this).outerWidth(true);
-            height = height + $(this).outerHeight(true);
-        });
-        return {width: Math.min(width, maxWidth), height: Math.min(height, maxHeight)};
-    }
 </script>
 <%= yield :scripts %>
 </body>

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" data-img-id="<%= image.id %>">
-        <%= image_tag image.file_url(:medium), class: (@element["src"] == image.file_url(:medium) ? 'selected' : '') %>
+        <%= image_tag image.file_url(:small), class: (@element["src"] == image.file_url(@size) ? 'selected' : ''), data: {src: image.file_url(@size)} %>
       </div>
       <% end %>
     </div>

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

@@ -24,7 +24,7 @@ editPanel.html("");
     if(!$(this).hasClass('selected')) {
       images.removeClass('selected');
       $(this).addClass('selected');
-      $("#element_src").val($(this).attr("src"));
+      $("#element_src").val($(this).data("src"));
     }
   });
 <% when 'link' %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.19'
+  VERSION = '0.1.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Jean-Baptiste Vilain