sibu 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0759366a72fa83ad3e5c5ed0288d0c9f2f3c180
-  data.tar.gz: d0d7497a1224778cbc8fc771d5e4ee864fab877f
+  metadata.gz: 3d01668ddff9c00c0ff68dcd8334ccab00b95a24
+  data.tar.gz: 1e78b2109e6a725646fe51c0e20e02630118d29f
 SHA512:
-  metadata.gz: ae3b4f04caf0fe037407dd5a37093373a0490c67e0f4c46e4b570a8fc7cb23551fd6d91d9e9a7737af1875ae4ddbac40bac1ba93105ad29fbaf84367790277b4
-  data.tar.gz: b7151b91df5c7ab7c04da668776175c5bc34ab03f7ab0fd486826b0ca9f9a0ec9be2c11914737e52a39855021d445abcb22eace1b831d56a6601e180e92f7d5c
+  metadata.gz: 0fe91b0963e43c828f0011536d81e165fadb46f774948b372f0f7d68c41ee1a5b4e0a86531f7e3300a8ae47de2166c803d0ee850c24f8ea4c5bca63b0d26a6b4
+  data.tar.gz: 4256d29e8642ce55a1577580fa013726f7326d9deb227bb042b492b9762a907e85db707423443caf452858c96dc9d809a635047ec0a930fcf9dbe3a2cf70ed3f

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

@@ -3,8 +3,70 @@
  *= require_self
  */
 
-sb-edit .sb-edit-active {
+.sibu_content_panel {
+    position: relative
+}
+
+sb-edit {
+    position: relative;
+}
+
+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 .sb-editable {
     cursor: pointer;
+    outline: dashed rgba(94, 219, 255, 0.8) 2px;
+    outline-offset: -3px;
+}
+
+#edit_mode_overlay {
+    display: none;
+}
+
+#edit_mode_overlay > div {
+    position: absolute;
+    z-index: 999;
+}
+
+#edit_mode_overlay .overlay_top,
+#edit_mode_overlay .overlay_bottom,
+#edit_mode_overlay .overlay_left,
+#edit_mode_overlay .overlay_right {
+    background-color: rgba(94, 219, 255, 0.5);
+}
+
+#edit_mode_overlay > .overlay_top {
+    top: 0;
+    left: 0;
+    width: 100%;
+}
+
+#edit_mode_overlay > .overlay_bottom {
+    bottom: 0;
+    left: 0;
+    width: 100%;
+}
+
+#edit_mode_overlay > .overlay_left {
+    left: 0;
+}
+
+#edit_mode_overlay > .overlay_right {
+    right: 0;
 }
 
 #edit_panel {
@@ -14,6 +76,7 @@ sb-edit .sb-edit-active {
     width: 100%;
     display: none;
     z-index: 1000;
+    background-color: white;
 }
 
 .trix-button-group--block-tools {

data/app/controllers/sibu/images_controller.rb

@@ -0,0 +1,47 @@
+require_dependency "sibu/application_controller"
+
+module Sibu
+  class ImagesController < ApplicationController
+    before_action :set_site, only: [:index, :new]
+
+    def index
+      @images = Sibu::Image.where(site_id: params[:site_id])
+    end
+
+    def new
+      @image = Sibu::Image.new(site_id: @site.id)
+    end
+
+    def create
+      @image = Sibu::Image.new(image_params)
+      if @image.save
+        redirect_to site_images_url(@image.site_id), notice: "L'image a bien été téléchargée."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors du téléchargement de l'image."
+        render :new
+      end
+    end
+
+    def show
+    end
+
+    def edit
+    end
+
+    def updateé
+    end
+
+    def destroy
+    end
+
+    private
+
+    def set_site
+      @site = Sibu::Site.find(params[:site_id])
+    end
+
+    def image_params
+      params.require(:image).permit!
+    end
+  end
+end

data/app/controllers/sibu/pages_controller.rb

@@ -16,7 +16,7 @@ module Sibu
         @site = Sibu::Site.find_by_domain(request.domain)
         if @site
           @page = @site.page(params[:path])
-          @links = @site.internal_links
+          @links = @site.pages_path_by_id
           view_template = @page ? 'show' : @site.not_found
         else
           view_template = Rails.application.config.sibu[:not_found]
@@ -24,7 +24,7 @@ module Sibu
       else
         @site = Sibu::Site.find(params[:site_id])
         @page = Sibu::Page.find(params[:id])
-        @links = @site.internal_links
+        @links = @site.pages_path_by_id
         view_template = 'show'
       end
 
@@ -38,7 +38,7 @@ module Sibu
     def create
       @page = Sibu::Page.new(page_params)
       if @page.save
-        redirect_to site_pages_url(@page.site_id), "La page a bien été créée."
+        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été créée."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de la création de la page."
         render :new
@@ -63,11 +63,14 @@ module Sibu
     def edit_content
       @page = Sibu::Page.find(params[:page_id])
       @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
-      @links = @site.internal_links if @site
+      @links = @site.pages_path_by_id if @site
       render :edit_content, layout: 'sibu/edit_content'
     end
 
     def edit_element
+      @content_type = params[:content_type]
+      @links = @site.pages_path_by_id if @site
+      @element = @entity.element(@section_id, @element_id)
     end
 
     def update_element

data/app/controllers/sibu/sites_controller.rb

@@ -20,7 +20,7 @@ module Sibu
 
     def create
       @site = Sibu::Site.new(site_params)
-      if @site.save_and_init(:default)
+      if @site.save_and_init
         redirect_to sites_url, notice: "Le site a bien été créé."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de la création du site."

data/app/helpers/sibu/images_helper.rb

@@ -0,0 +1,4 @@
+module Sibu
+  module ImagesHelper
+  end
+end

data/app/helpers/sibu/pages_helper.rb

@@ -18,9 +18,10 @@ module Sibu
     end
 
     [:h1, :h2, :h3, :h4, :h5, :h6, :p, :span, :div].each do |t|
-      define_method(t) do |id_or_elt, html_opts = {}|
-        content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"text" => "Texte à modifier"}) : (select(id_or_elt) || {"text" => "Texte à modifier"})
-        html_opts.merge!({class: "sb-#{t} #{html_opts[:class]}", data: {id:  id_or_elt.is_a?(Hash) ? id_or_elt["id"] : id_or_elt}}) if action_name != 'show'
+      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'
         content_tag(t, raw(content["text"]).html_safe, html_opts)
       end
     end
@@ -29,20 +30,36 @@ module Sibu
       self
     end
 
-    def select(id)
-      @sb_entity.section(@sb_section).select {|elt| elt["id"] == id}.first
+    def select_element(id)
+      @sb_entity.section(*@sb_section).select {|elt| elt["id"] == id}.first
     end
 
-    def site_section(id, &block)
+    def site_section(id, sub_id = nil, &block)
       @sb_entity = @site
-      @sb_section = id
-      "<sb-edit data-id='#{id}'>#{capture(self, &block)}</sb-edit>".html_safe
+      @sb_section = sub_id ? [id, sub_id] : id
+      if block_given?
+        "<sb-edit data-id='#{id}' data-entity='site'>#{capture(self, &block)}</sb-edit>".html_safe
+      else
+        self
+      end
     end
 
-    def section(id, &block)
+    def section(id, sub_id = nil, &block)
       @sb_entity = @page
-      @sb_section = id
-      "<sb-edit data-id='#{id}'>#{capture(self, &block)}</sb-edit>".html_safe
+      @sb_section = sub_id ? [id, sub_id] : id
+      "<sb-edit data-id='#{id}' data-entity='page'>#{capture(self, &block)}</sb-edit>".html_safe
+    end
+
+    def site_sections(id)
+      @site.section(id).map {|s| s["id"]}
+    end
+
+    def sections(id)
+      @page.section(id).map {|s| s["id"]}
+    end
+
+    def elements(id = nil)
+      id ? select_element(id)["elements"] : @sb_entity.section(*@sb_section)
     end
 
     def each
@@ -58,14 +75,24 @@ module Sibu
       end
     end
 
-    def img(id_or_elt, html_opts = {})
-      content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"src" => "/default.jpg"}) : (select(id_or_elt) || {"src" => "/default.jpg"})
-      opts = action_name == 'show' ? html_opts.merge({class: "sb-img #{html_opts[:class]}", data: {id: id_or_elt.is_a?(Hash) ? id_or_elt["id"] : id_or_elt}}) : html_opts
-      content_tag(:img, nil, content.except("id").merge(opts))
+    def img(elt, html_opts = {})
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      html_opts.merge!({class: "sb-img #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      content_tag(:img, nil, content.except("id").merge(html_opts))
+    end
+
+    def bg_img(elt, html_opts = {})
+      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => "/default.jpg"}
+      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      html_opts.merge!({class: "sb-img #{html_opts[:class]}", data: {id: elt.is_a?(Hash) ? elt["id"] : elt}}) if action_name != 'show'
+      content_tag(:div, content_tag(:img, nil, content.except("id")), html_opts)
     end
 
-    def link(id_or_elt, html_opts = {}, &block)
-      content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"value" => "", "text" => "Nouveau lien"}) : (select(id_or_elt) || {"value" => "", "text" => "Nouveau lien"})
+    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'
       val = content["value"] || ""
       if val.to_s.include?('http')
         href = val
@@ -79,10 +106,18 @@ module Sibu
       end
     end
 
-    def form_label(id_or_elt, html_opts = {}, &block)
-      content = id_or_elt.is_a?(Hash) ? (id_or_elt || {"text" => "Texte à modifier"}) : (select(id_or_elt) || {"text" => "Texte à modifier"})
-      html_opts.merge!({class: "sb-label #{html_opts[:class]}", data: {id:  id_or_elt.is_a?(Hash) ? id_or_elt["id"] : id_or_elt}}) if action_name != 'show'
+    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'
       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'
+      content_tag(:div, nil, content.merge(html_opts))
+    end
   end
 end

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

@@ -1,3 +1,27 @@
-class ImageUploader < Shrine
-  # plugins and uploading logic
+require "image_processing/mini_magick"
+
+class Sibu::ImageUploader < Shrine
+  include ImageProcessing::MiniMagick
+  plugin :processing
+  plugin :versions
+  plugin :delete_raw
+
+  process(:store) do |io, context|
+    original = io.download
+    images_config = Rails.application.config.sibu[:images]
+
+    large = resize_to_limit!(original, images_config[:large], images_config[:large]) { |cmd| cmd.auto_orient }
+    medium = resize_to_limit(large,  images_config[:medium], images_config[:medium])
+    small = resize_to_limit(medium,  images_config[:small], images_config[:small])
+
+    {original: io, large: large, medium: medium, small: small}
+  end
+
+  def generate_location(io, context)
+    site_id  = context[:record].site_id
+    style = context[:version] != :original ? "resized" : "originals"
+    name  = super
+
+    [site_id, style, name].compact.join("/")
+  end
 end

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

@@ -2,22 +2,24 @@ module Sibu
   module SectionsConcern
     include ActiveSupport::Concern
 
-    def section(id)
+    def section(*ids)
       # elts = nil
-      # if ids.length == 1
+      if ids.length == 1
         s = nil
         if sections.blank?
           self.sections = {}
         else
-          s = sections[id]
+          s = sections[ids[0]]
         end
         if s.nil?
           s = []
-          self.sections[id] = s
+          self.sections[ids[0]] = s
           save
         end
         s
-      # elsif ids.length == 2
+      elsif ids.length == 2
+        subsection(*ids)
+      end
       #   s = section(ids[0])
       #   sub = s.select {|elt| elt["id"] == ids[1]}
       #   unless sub
@@ -32,13 +34,13 @@ module Sibu
 
     def subsection(id, subid)
       s = section(id)
-      sub = s.select {|elt| elt["id"] == ids[1]}
+      sub = s.select {|elt| elt["id"] == subid}.first
       unless sub
-        sub = {"id" => ids[1], "elements" => []}
-        self.sections[ids[0]] << sub
+        sub = {"id" => subid, "elements" => []}
+        self.sections[id] << sub
         save
       end
-      elts = sub
+      sub["elements"]
     end
 
     def element(section_id, element_id)

data/app/models/sibu/image.rb

@@ -1,5 +1,7 @@
 module Sibu
   class Image < ApplicationRecord
     include ImageUploader::Attachment.new(:file)
+
+    belongs_to :site, :class_name => 'Sibu::Site'
   end
 end

data/app/models/sibu/site.rb

@@ -4,6 +4,7 @@ module Sibu
 
     belongs_to :site_template, :class_name => 'Sibu::SiteTemplate'
     has_many :pages, :class_name => 'Sibu::Page', dependent: :destroy
+    has_many :images, :class_name => 'Sibu::Image', dependent: :destroy
 
     validates_presence_of :name, :site_template
 
@@ -23,16 +24,18 @@ module Sibu
       pages.where(id: page_id).first
     end
 
-    def save_and_init(source)
-      ActiveRecord::Base.transaction do
-        save!
-        init_pages(source)
-        init_sections(source)
+    def save_and_init
+      if valid?
+        self.sections = site_template.sections
+        site_template.pages.each do |p|
+          self.pages << Sibu::Page.new(p)
+        end
       end
+      save!
     end
 
-    def internal_links
-      Hash[pages.collect {|p| [p.id, p.path]}]
+    def pages_path_by_id
+      Hash[pages.collect {|p| [p.id.to_s, p.path]}]
     end
 
     def init_pages(source)

data/app/models/sibu/site_template.rb

@@ -1,4 +1,6 @@
 module Sibu
   class SiteTemplate < ApplicationRecord
+    store :default_sections, accessors: [:sections], coder: JSON
+    store :default_pages, accessors: [:pages], coder: JSON
   end
 end

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

@@ -15,71 +15,124 @@
 <body>
 <% [:top_panel, :side_panel, :content_panel, :bottom_panel].each do |panel| %>
   <% unless conf[panel].blank? %>
-    <div class="<%= 'sibu_panel' unless panel == :content_panel %>">
+    <div class="<%= panel == :content_panel ? 'sibu_content_panel' : 'sibu_panel' %>">
       <%= render conf[panel] %>
     </div>
   <% end %>
 <% end %>
 <div id="edit_panel" class="sibu_view"></div>
+<div id="edit_mode_overlay">
+  <div class="overlay_top"></div>
+  <div class="overlay_right"></div>
+  <div class="overlay_left"></div>
+  <div class="overlay_bottom"></div>
+  <div class="edit_mode_actions">
+    <button onclick="cancelEditMode()">Fermer</button>
+  </div>
+</div>
 
 <script>
+    const TEXT_TAGS = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'span'];
+    const IMG_TAGS = ['img'];
+    const LINK_TAGS = ['a'];
+
     $(function () {
         initOverlays();
     });
 
-    function initOverlays() {
-        const textTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'p', 'span'];
+    function setEditMode(elt) {
+        var offset = elt.offset();
+        var width = elt.width(), height = elt.height();
+        var overlay = $("#edit_mode_overlay");
+        overlay.find(".overlay_top").css("height", offset.top);
+        overlay.find(".overlay_bottom").css("top", offset.top + height);
+        overlay.find(".overlay_left").css({"height": height, "width": offset.left, "top": offset.top});
+        overlay.find(".overlay_right").css({"height": height, "left": offset.left + width, "top": offset.top});
+        overlay.find(".edit_mode_actions").css({"top": (offset.top <= 40 ? (offset.top + height) : (offset.top - 40)), left: offset.left, width: width});
+        overlay.show();
+        initInnerOverlays(elt);
+        elt.remove();
+    }
+
+    function cancelEditMode() {
+        $("#edit_mode_overlay").hide();
+        cancelEdit();
+        initOverlays();
+    }
+
+    function cancelEdit() {
+        $("#edit_panel").slideUp("fast");
+    }
+
+    function editContent(eltId, sectionId, entity, contentType) {
+        $.ajax({
+            url: "<%= edit_element_site_page_path(@site.id, @page.id) %>",
+            method: "GET",
+            data: {
+                element_id: eltId,
+                section_id: sectionId,
+                entity: entity,
+                content_type: contentType
+            }
+        })
+    }
 
-        var elts = $("[class*='sb-']");
-        elts.each(function () {
-            var previous;
-            var elt = $(this), tag = elt.prop("tagName").toLowerCase(), width = elt.width(),
-                height = elt.height(), display = elt.css("display"), padding = elt.css("padding"), margin = elt.css("margin");
+    function initInnerOverlays(elt) {
+        var editables = elt.parents("sb-edit").first().find("[class*='sb-']");
+        editables.off();
+        editables.hover(function() {
+            $(this).addClass("sb-editable");
+        }, function() {
+            $(this).removeClass("sb-editable");
+        });
+        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 overlayElt = $(editOverlay(width, height, display, padding, margin));
-            bindMouseEnter(elt, overlayElt, eltId, sectionId, entity);
-        });
+            if (TEXT_TAGS.indexOf(tag) !== -1) {
+                editContent(eltId, sectionId, entity, 'text');
+            } else if (IMG_TAGS.indexOf(tag) !== -1 || elt.hasClass('sb-img')) {
+                editContent(eltId, sectionId, entity, 'media');
+            } else if (LINK_TAGS.indexOf(tag) !== -1) {
+                editContent(eltId, sectionId, entity, 'link');
+            } else {
+                console.log('Sibu - Unsupported tag type : ' + tag);
+            }
+        })
+    }
 
-        function bindMouseEnter(element, overlay, elementId, sectionId, entity) {
-            element.mouseenter(function () {
-                overlay.replaceAll(element);
-                overlay.addClass("sb-edit-active sibu_panel");
-                overlay.click(function() {
-                  editContent(elementId, sectionId, entity)
-                });
-                bindMouseLeave(element, overlay, elementId, sectionId, entity);
-            });
-        }
+    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);
 
-        function bindMouseLeave(element, overlay, elementId, sectionId, entity) {
-            overlay.mouseleave(function() {
-                overlay.removeClass("sb-edit-active sibu_panel");
-                element.replaceAll(overlay);
-                bindMouseEnter(element, overlay, elementId, sectionId, entity);
+            elt.hover(function() {
+                overlay.css("opacity", 1);
+            }, function() {
+                overlay.css("opacity", 0);
             });
-        }
 
-        function editOverlay(width, height, display, padding, margin) {
-            return '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ' +
-                      'style="box-sizing: content-box; display: ' + display + '; padding: ' + padding + '; margin: ' + margin + ';"' +
-                      'viewBox="0 0 ' + width + ' ' + height + '" width="' + width + 'px" height="' + height + 'px">' +
-                      '<rect width="' + width + '" height="' + height + '" x="0" y="0" fill="#dedede"/>' +
-                   '</svg>';
-        }
-
-        function editContent(eltId, sectionId, entity) {
-            $.ajax({
-                url: "<%= edit_element_site_page_path(@site.id, @page.id) %>",
-                method: "GET",
-                data: {
-                    element_id: eltId,
-                    section_id: sectionId,
-                    entity: entity
-                }
+            overlay.click(function() {
+                setEditMode($(this));
             })
-        }
+        });
+    }
 
+    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 %>

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

@@ -0,0 +1,11 @@
+<%= form_for([@site, @image]) do |f| %>
+  <div class="sibu_field">
+    <%= f.hidden_field :file, value: @image.cached_file_data %>
+    <%= f.file_field :file %>
+  </div>
+  <%= f.hidden_field :site_id %>
+  <div class="sibu_actions">
+    <%= f.submit 'Valider' %>
+    <%= link_to 'Annuler', :back %>
+  </div>
+<% end %>

data/app/views/sibu/images/edit.html.erb

@@ -0,0 +1,2 @@
+<h1>Images#edit</h1>
+<p>Find me in app/views/sibu/images/edit.html.erb</p>

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

@@ -0,0 +1,10 @@
+<div id="pages" class="sibu_view">
+  <div class="actions">
+    <%= link_to 'Télécharger une image', new_site_image_path(@site.id) %> | <%= link_to 'Retour', :back %>
+  </div>
+  <h2>Images du site "<%= @site.name %>"</h2>
+  <% @images.each do |image| %>
+    <div class="sibu_image"><%= image_tag image.file_url(:small) %></div>
+  <% end %>
+</div>
+

data/app/views/sibu/images/new.html.erb

@@ -0,0 +1,9 @@
+<div class="sibu_view">
+  <div class="actions">
+    <%= link_to 'Retour', :back %>
+  </div>
+  <h2>Télécharger une image</h2>
+  <div class="sibu_form">
+    <%= render 'form' %>
+  </div>
+</div>

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

@@ -0,0 +1,2 @@
+<h1>Images#show</h1>
+<p>Find me in app/views/sibu/images/show.html.erb</p>

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

@@ -0,0 +1,22 @@
+<h2>Modifier le lien</h2>
+<div id="edit_msg"></div>
+<div class="sibu_form">
+  <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
+    <div class="sibu_field">
+      <%= label_tag 'element[text]', 'Libellé' %>
+      <%= text_field_tag 'element[text]', @element["text"] %>
+    </div>
+    <div class="sibu_field">
+      <%= label_tag 'element[value]', 'Lien' %>
+      <%= select_tag 'element[value]', options_from_collection_for_select(@site.pages, :id, :name, @element["value"]),
+                     {prompt: 'Sélectionnez une page'} %>
+    </div>
+    <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <%= hidden_field_tag :section_id, @section_id %>
+    <%= hidden_field_tag :entity, @entity_type %>
+    <div class="sibu_actions">
+      <%= submit_tag 'Valider' %>
+      <%= link_to 'Annuler', '#', onclick: 'cancelEdit(); return false;' %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,25 @@
+<h2>Modifier l'image</h2>
+<div id="edit_msg"></div>
+<div class="sibu_form">
+  <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
+    <div class="sibu_select_images">
+      <% @site.images.each do |image| %>
+      <div class="sibu_image">
+        <%= image_tag image.file_url(:small) %>
+      </div>
+      <% end %>
+    </div>
+    <div class="sibu_field">
+      <%= label_tag 'element[alt]', 'Texte alternatif' %>
+      <%= text_field_tag 'element[alt]', @element["alt"] %>
+    </div>
+    <%= hidden_field_tag 'element[id]', @element["id"] %>
+    <%= hidden_field_tag 'element[src]', @element["src"] %>
+    <%= hidden_field_tag :section_id, @section_id %>
+    <%= hidden_field_tag :entity, @entity_type %>
+    <div class="sibu_actions">
+      <%= submit_tag 'Valider' %>
+      <%= link_to 'Annuler', '#', onclick: '$("#edit_panel").slideUp("fast"); return false;' %>
+    </div>
+  <% end %>
+</div>

data/app/views/sibu/pages/{_edit_panel.html.erb → _text_edit_panel.html.erb}

@@ -1,14 +1,14 @@
-<h2>Modifier l'élément</h2>
+<h2>Modifier le texte</h2>
 <div id="edit_msg"></div>
 <div class="sibu_form">
   <%= 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">
       <%= submit_tag 'Valider' %>
-      <%= link_to 'Annuler', '#', onclick: '$("#edit_panel").slideUp("fast"); return false;' %>
+      <%= link_to 'Annuler', '#', onclick: 'cancelEdit(); return false;' %>
     </div>
   <% end %>
 </div>

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

@@ -1,5 +1,18 @@
 var editPanel = $("#edit_panel");
-editPanel.html("<%= j(render 'edit_panel') %>");
-var editorElt = editPanel.find("trix-editor")[0];
-editorElt.editor.loadHTML("<%= raw(@entity.element(@section_id, @element_id)["text"].gsub("\n", "<br/>")) %>");
+editPanel.html("");
+<% if @content_type == 'text' %>
+  <% text_value = @element["text"] || 'Texte à modifier' %>
+  editPanel.html("<%= j(render 'text_edit_panel') %>");
+  var editorElt = editPanel.find("trix-editor")[0];
+  editorElt.editor.loadHTML("<%= raw(text_value.gsub("\n", "<br/>")) %>");
+<% elsif @content_type == 'media' %>
+  editPanel.html("<%= j(render 'media_edit_panel') %>");
+  editPanel.find(".sibu_image img").click(function() {
+    $("#element_src").val($(this).attr("src"));
+  });
+<% elsif @content_type == 'link' %>
+  editPanel.html("<%= j(render 'link_edit_panel') %>");
+<% end %>
+
+
 editPanel.slideDown("fast");

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

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

data/config/initializers/shrine.rb

@@ -2,8 +2,8 @@ require "shrine"
 require "shrine/storage/file_system"
 
 Shrine.storages = {
-    cache: Shrine::Storage::FileSystem.new("public", prefix: "uploads/cache"), # temporary
-    store: Shrine::Storage::FileSystem.new("public", prefix: "uploads/store"), # permanent
+    cache: Shrine::Storage::FileSystem.new("public", prefix: "uploads/cache"),
+    store: Shrine::Storage::FileSystem.new("public", prefix: "uploads/store"),
 }
 
 Shrine.plugin :activerecord

data/config/routes.rb

@@ -12,6 +12,8 @@ Sibu::Engine.routes.draw do
         patch 'update_element', on: :member
         patch 'update_section', on: :member
       end
+
+      resources :images
     end
   end
 end

data/db/migrate/20180208082317_rename_images_user_id_to_site_id.rb

@@ -0,0 +1,5 @@
+class RenameImagesUserIdToSiteId < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :sibu_images, :user_id, :site_id
+  end
+end

data/db/migrate/20180208125024_rename_image_data_column.rb

@@ -0,0 +1,5 @@
+class RenameImageDataColumn < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :sibu_images, :data, :file_data
+  end
+end

data/db/migrate/20180210181644_add_defaults_to_site_templates.rb

@@ -0,0 +1,6 @@
+class AddDefaultsToSiteTemplates < ActiveRecord::Migration[5.1]
+  def change
+    add_column :sibu_site_templates, :default_sections, :text
+    add_column :sibu_site_templates, :default_pages, :text
+  end
+end

data/lib/sibu/engine.rb

@@ -1,3 +1,4 @@
+require 'jquery-rails'
 require 'trix'
 
 module Sibu

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,9 +123,11 @@ files:
 - app/assets/javascripts/sibu/sibu.js.erb
 - app/assets/stylesheets/sibu/sibu.css
 - app/controllers/sibu/application_controller.rb
+- app/controllers/sibu/images_controller.rb
 - app/controllers/sibu/pages_controller.rb
 - app/controllers/sibu/sites_controller.rb
 - app/helpers/sibu/application_helper.rb
+- app/helpers/sibu/images_helper.rb
 - app/helpers/sibu/pages_helper.rb
 - app/helpers/sibu/sites_helper.rb
 - app/jobs/sibu/application_job.rb
@@ -112,8 +142,15 @@ files:
 - app/views/layouts/sibu/application.html.erb
 - app/views/layouts/sibu/edit_content.html.erb
 - app/views/layouts/sibu/site.html.erb
-- app/views/sibu/pages/_edit_panel.html.erb
+- app/views/sibu/images/_form.html.erb
+- app/views/sibu/images/edit.html.erb
+- app/views/sibu/images/index.html.erb
+- app/views/sibu/images/new.html.erb
+- app/views/sibu/images/show.html.erb
 - app/views/sibu/pages/_form.html.erb
+- app/views/sibu/pages/_link_edit_panel.html.erb
+- app/views/sibu/pages/_media_edit_panel.html.erb
+- app/views/sibu/pages/_text_edit_panel.html.erb
 - app/views/sibu/pages/destroy.html.erb
 - app/views/sibu/pages/edit.html.erb
 - app/views/sibu/pages/edit_content.html.erb
@@ -140,6 +177,9 @@ files:
 - db/migrate/20180126114522_rename_url_to_path_in_pages.rb
 - db/migrate/20180126114628_add_domain_to_sites.rb
 - db/migrate/20180127211533_create_sibu_images.rb
+- db/migrate/20180208082317_rename_images_user_id_to_site_id.rb
+- db/migrate/20180208125024_rename_image_data_column.rb
+- db/migrate/20180210181644_add_defaults_to_site_templates.rb
 - lib/sibu.rb
 - lib/sibu/engine.rb
 - lib/sibu/version.rb