sibu 0.9.5 → 1.0.4

data/app/assets/stylesheets/sibu/defaults.scss

@@ -238,101 +238,93 @@ $sibu-color3 : #333 !default;
 }
 
 #sections_panel {
-  position: relative;
-
-  &:before {
-    box-shadow: 0 -15px 15px -15px inset;
-    content: " ";
-    width: 100%;
-    left: 0;
-    top: -15px;
-    position: absolute;
-    z-index: 0;
-    height: 15px;
-    opacity: 0.4;
-    color: $sibu-color3;
-  }
-
-  .sibu_sections_tabs, .tabs {
-    height: 100%;
-  }
-
-  .sibu_sections {
+  .sibu_site_content {
     padding: 2rem;
     max-height: 60vh;
     overflow-y: scroll;
 
-    .tabs__list {
-      margin: 0;
-      padding: 0;
-      display: table;
-      width: 100%;
-    }
-    .tabs__item {
-      display: table-cell;
-      > a {
-        text-decoration: none;
-      }
-    }
+    & > .sibu_sections_tabs {
+      height: 100%;
 
-    .tabs__link {
-      display: inline-block;
-      cursor: pointer;
-      margin-bottom: -2px;
-      padding: 1rem 2.5rem;
-      border-bottom: 4px solid transparent;
-      color: $sibu-color1;
-      text-decoration: none;
-      border-radius: 0 0 0 0;
-      transition: .25s;
-      transition-property: color, border, background-color;
-      font-size: 2rem;
-      &:focus {
-        border-bottom-color: $sibu-color2;
-        color: $sibu-color2;
-        outline: 0;
-      }
-    }
+      & > .tabs {
+        height: 100%;
 
-    [aria-selected="true"].tabs__link {
-      border-bottom-color: $sibu-color2;
-      color: $sibu-color2;
-      outline: 0;
-    }
+        & > .tabs__list {
+          margin: 0;
+          padding: 0;
+          display: table;
+          width: 100%;
 
-    .tabs__content {
-      padding: 2rem 0;
-      background-color: white;
-      max-height: calc(100% - 40px);
-      overflow-y: scroll;
+          .tabs__item {
+            display: table-cell;
 
-      > * {
-        padding: 4px 0;
-        margin: 0 1rem 2rem 1rem;
-        min-height: auto;
-        box-shadow: 0 0 5px #cdcdcd;
+            > a {
+              text-decoration: none;
+            }
+          }
 
-        &:hover {
-          cursor: pointer;
-          outline: dashed $sibu-color2 4px;
-          outline-offset: -5px;
-        }
+          .tabs__link {
+            display: inline-block;
+            cursor: pointer;
+            margin-bottom: -2px;
+            padding: 1rem 2.5rem;
+            border-bottom: 4px solid transparent;
+            color: $sibu-color1;
+            text-decoration: none;
+            border-radius: 0 0 0 0;
+            transition: .25s;
+            transition-property: color, border, background-color;
+            font-size: 2rem;
+
+            &:focus {
+              border-bottom-color: $sibu-color2;
+              color: $sibu-color2;
+              outline: 0;
+            }
+          }
 
-        &.selected {
-          outline: solid $sibu-color1 5px;
-          outline-offset: -5px;
+          [aria-selected="true"].tabs__link {
+            border-bottom-color: $sibu-color2;
+            color: $sibu-color2;
+            outline: 0;
+          }
         }
 
-        > * {
-          margin-top: 0 !important;
-          margin-bottom: 0 !important;
+        & > .tabs__content {
+          padding: 2rem 0;
+          background-color: white;
+          max-height: calc(100% - 40px);
+          overflow-y: scroll;
+
+          > * {
+            padding: 4px 0;
+            margin: 0 1rem 2rem 1rem;
+            min-height: auto;
+            box-shadow: 0 0 5px #cdcdcd;
+
+            &:hover {
+              cursor: pointer;
+              outline: dashed $sibu-color2 4px;
+              outline-offset: -5px;
+            }
+
+            &.selected {
+              outline: solid $sibu-color1 5px;
+              outline-offset: -5px;
+            }
+
+            > * {
+              margin-top: 0 !important;
+              margin-bottom: 0 !important;
+            }
+          }
+
+          &[aria-hidden="true"] {
+            display: none;
+          }
         }
       }
     }
-
-    [aria-hidden="true"].tabs__content {
-      display: none;
-    }
   }
 
   .sibu_actions {

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

@@ -3,10 +3,21 @@
  *= require_self
  */
 
-.sibu_content_panel {
+body.sibu_edit_content, .sibu_content_panel {
     position: relative
 }
 
+body.sibu_edit_content > .sibu_panel:first-child {
+    position: fixed;
+    width: 100%;
+    z-index: 999999;
+    top: 0;
+}
+
+body.sibu_edit_content > .sibu_content_panel {
+    padding-top: 60px;
+}
+
 .sb-editable {
     cursor: pointer;
     outline: dashed rgba(94, 219, 255, 0.8) 3px;
@@ -63,6 +74,10 @@
     background-color: white;
 }
 
+#edit_panel.active, #sections_panel.active {
+    display: block;
+}
+
 #element_actions button {
     display: none;
 }
@@ -78,6 +93,10 @@
     cursor: pointer;
 }
 
+#edit_overlays > *:hover {
+    opacity: 1;
+}
+
 .sb-editing [data-type] {
     min-width: 1em;
     min-height: 0.5em;

data/app/controllers/sibu/application_controller.rb

@@ -10,5 +10,13 @@ module Sibu
     def sibu_user
       send(conf[:current_user])
     end
+
+    def check_site_ownership!
+      if conf[:multi_user] && conf[:admin_filter]
+        unless @site.nil? || @site.user_id == sibu_user.id || conf[:admin_filter].call(sibu_user)
+          redirect_to main_app.root_url, alert: "Vous n'êtes pas autorisé(e) à consulter cette page."
+        end
+      end
+    end
   end
 end

data/app/controllers/sibu/pages_controller.rb

@@ -2,6 +2,7 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class PagesController < ApplicationController
+    before_action :compile_assets, only: [:show, :edit_content]
     before_action :set_page, only: [:edit, :update, :destroy, :duplicate, :edit_element, :update_element, :clone_element,
                                     :delete_element, :child_element, :new_section, :create_section, :edit_section,
                                     :update_section, :delete_section]
@@ -10,6 +11,7 @@ module Sibu
                                             :child_element, :new_section, :create_section, :edit_section,
                                             :update_section, :delete_section]
     before_action :set_online, only: [:show, :edit]
+
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
@@ -44,7 +46,7 @@ module Sibu
     end
 
     def new
-      @page = Sibu::Page.new(site_id: @site.id)
+      @page = Sibu::Page.new(site_id: @site.id, source: 'Saisie manuelle')
     end
 
     def create
@@ -101,9 +103,9 @@ module Sibu
       @content_type = params[:content_type]
       @links = @site.pages_path_by_id if @site
       @element = @entity.element(*@section_id.split('|'), *@element_id.split('|'))
-      @repeat = params[:repeat]
+      @repeat = params[:repeat] == 'true'
+      @children = params[:children] == 'true'
       @size = params[:size].blank? ? :medium : params[:size].to_sym
-      @children = params[:children]
     end
 
     def update_element
@@ -146,7 +148,6 @@ module Sibu
     end
 
     def update_section
-      # {"utf8"=>"✓", "section"=>{"color"=>"#AFCA0B", "filters"=>"school_camps"}, "section_id"=>"cs1536301729", "refresh"=>"true", "commit"=>"Valider", "site_id"=>"3", "id"=>"1392"}
       @entity.section(params[:section_id]).merge!(section_params)
       logger.debug @entity.section(params[:section_id])
       @updated = @entity.save
@@ -161,10 +162,12 @@ module Sibu
     def set_page
       @page = Sibu::Page.find(params[:id])
       @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page
+      check_site_ownership!
     end
 
     def set_site
       @site = Sibu::Site.find(params[:site_id])
+      check_site_ownership!
     end
 
     def set_edit_context
@@ -193,5 +196,9 @@ module Sibu
     def show_params
       params.permit!
     end
+
+    def compile_assets
+      Sibu::DynamicStyle.new(params[:site_id]).compile if Rails.env.development? && conf[:custom_styles] && !params[:site_id].blank?
+    end
   end
 end

data/app/controllers/sibu/sites_controller.rb

@@ -6,7 +6,11 @@ module Sibu
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
-      @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
+      if conf[:admin_filter].call(sibu_user)
+        @sites = Sibu::Site.all.order(:name, :version)
+      else
+        @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
+      end
     end
 
     def show
@@ -70,6 +74,7 @@ module Sibu
 
     def set_site
       @site = Sibu::Site.find(params[:id])
+      check_site_ownership!
     end
 
     def site_params

data/app/helpers/sibu/application_helper.rb

@@ -5,7 +5,7 @@ module Sibu
     end
 
     def sibu_user
-      send(Rails.application.config.sibu[:current_user])
+      send(conf[:current_user])
     end
   end
 end

data/app/helpers/sibu/pages_helper.rb

@@ -7,6 +7,10 @@ module Sibu
       p ? (request.host == conf[:host] ? site_page_path(@site.id, p.id) : (conf[:deployment_path] ? "/#{conf[:deployment_path]}/#{p.path}" : "/#{p.path}")) : "#"
     end
 
+    def is_current_page(link_val)
+      /\d+/.match?(link_val) && link_val.to_i == @page.id
+    end
+
     def sections_templates
       @site.site_template.available_sections
     end
@@ -35,27 +39,78 @@ module Sibu
       end
     end
 
-    [:h1, :h2, :h3, :h4, :h5, :h6, :span].each do |t|
-      define_method(t) do |elt, html_opts = {}|
-        defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => Sibu::DEFAULT_TEXT}
+    [:h1, :h2, :h3, :h4, :h5, :h6, :span, :p, :li].each do |t|
+      define_method(t) do |elt, opts = {}, &block|
+        t_id = elt.is_a?(Hash) ? elt["id"] : elt
+        defaults = {"id" => t_id, "text" => (t == :p ? Sibu::DEFAULT_PARAGRAPH : Sibu::DEFAULT_TEXT)}
         content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-        html_opts.merge!({data: {id: elt_id(elt), type: "text"}}) if action_name != 'show'
-        content_tag(t, raw(content["text"]).html_safe, html_opts)
+        html_opts = {"id" => t_id}.merge(opts.except(:repeat, :children).stringify_keys)
+        @sb_section = (@sb_section || []) + [t_id]
+        if action_name != 'show'
+          html_opts.merge!({
+                               "data-id" => @sb_section[1..-1].join('|'),
+                               "data-type" => (t == :p ? "paragraph" : "text"),
+                               "data-repeat" => opts.delete(:repeat),
+                               "data-children" => opts.delete(:children)
+                           })
+        end
+        if block
+          if t == :p
+            html_output = content_tag(:div, content_tag(t, capture(content, nested_elements(elt), &block)), html_opts)
+          else
+            html_output = content_tag(t, capture(content, nested_elements(t_id), &block), html_opts)
+          end
+        else
+          if t == :p
+            html_output = content_tag(:div, content_tag(t, raw(content["text"]).html_safe), html_opts)
+          else
+            html_output = content_tag(t, raw(content["text"]).html_safe, html_opts)
+          end
+        end
+        @sb_section -= [t_id]
+        html_output
       end
     end
 
-    def p(elt, opts = {})
-      repeat = opts.delete(:repeat)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "text" => Sibu::DEFAULT_PARAGRAPH}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
-      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)
+    [:div, :section, :article, :aside, :header, :footer, :nav, :main, :ul, :ol, :wrapper].each do |t|
+      define_method(t) do |elt, opts = {}, &block|
+        t_id = elt.is_a?(Hash) ? elt["id"] : elt
+        @sb_section = (@sb_section || []) + [t_id]
+        html_opts = {"id" => t_id}.merge(opts.except(:repeat, :children).stringify_keys)
+        if action_name != 'show'
+          html_opts.merge!({
+                               "data-id" => @sb_section[1..-1].join('|'),
+                               "data-type" => "group",
+                               "data-repeat" => opts.delete(:repeat),
+                               "data-children" => opts.delete(:children)
+                           })
+        end
+        html_output = t == :wrapper ? capture(current_elt(elt), nested_elements(t_id), &block) : content_tag(t, capture(current_elt(elt), nested_elements(t_id), &block), html_opts)
+        @sb_section -= [t_id]
+        html_output
+      end
     end
 
     def sb
       self
     end
 
+    def join_tokens(tokens, suffix)
+      (tokens + [suffix]).select {|t| !t.blank?}.join("|")
+    end
+
+    # Note : the best option is probably a "section" helper that is instantiated from the section hash
+    # and that provides all the logic for elements manipulation (ex: section.h3(), section.elements, section.elements(nested_id), etc...)
+    # That will also remove the entity type references (site / page) from the partials (but is still has to be figured out by Sibu)
+    # Note : add "each_with_elements" and "elements" on section/elts enumerables
+    def nested_elements(elt_or_id)
+      element_id = elt_id(elt_or_id)
+      element_id_tokens = (@sb_section + element_id.split("|")).uniq
+      nested_elts = @sb_entity.elements(*element_id_tokens)
+      nested_elts.blank? ? [{"id" => element_id.split("|").last, "data-id" => join_tokens(element_id_tokens[1..-1], "#{element_id}0")}] :
+          nested_elts.map {|e| e.merge({"data-id" => join_tokens(element_id_tokens[1..-1], e['id'])})}
+    end
+
     def select_element(id)
       @sb_entity.element(*@sb_section, id)
     end
@@ -133,9 +188,28 @@ module Sibu
 
     alias site sb_site
 
+    def render_page_section(s)
+      @sb_section = [s['id']]
+      @sb_entity = @page
+      render partial: "shared/#{@site.section_template(s)}",
+             locals: {sibu: self, sibu_section: s, sibu_attrs: sibu_attributes(s).html_safe}
+    end
+
+    # Page sections attrs
+    def sibu_attributes(section)
+      action_name != 'show' ? ('data-sb-id="' + section['id'] + '" data-sb-entity="page"') : ''
+    end
+
+    # Site sections attrs
+    def sibu_attrs(section_id)
+      @sb_section = [section_id]
+      @sb_entity = @site
+      action_name != 'show' ? ('data-sb-id="' + section_id + '" data-sb-entity="site"').html_safe : ''
+    end
+
     def section(id, tag, html_opts = {}, &block)
       @sb_section = [id]
-      opts = action_name != 'show' ? html_opts.merge({"data-sb-id" => id, "data-sb-repeat" => @sb_entity != @site, "data-sb-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
+      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
 
@@ -156,7 +230,8 @@ module Sibu
       repeat = html_opts.delete(:repeat)
       children = html_opts.delete(:children)
       defaults = {"id" => elt_id(elt), "value" => "", "text" => Sibu::DEFAULT_TEXT}
-      content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      link_elt = current_elt(elt)
+      content = defaults.merge(link_elt)
       val = content.delete("value") || ""
       text = content.delete("text")
       html_opts.merge!({data: {id: elt_id(elt), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
@@ -172,16 +247,18 @@ 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, capture(*([raw(text)] + elts(elt)), &block), content.merge(html_opts).except("elements"))
+        @sb_section = (@sb_section || []) + [elt_id(elt)]
+        html_output = content_tag(:a, capture(link_elt, elts(elt), &block), content.merge(html_opts).except("elements"))
+        @sb_section -= [elt_id(elt)]
+        html_output
       else
         content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
     end
 
     def interactive_map(elt, html_opts = {})
-      defaults = {"data-lat" => "45.68854", "data-lng" => "5.91587", "data-title" => Sibu::DEFAULT_TEXT}
+      defaults = {"data-lat" => "46.1988027", "data-lng" => "5.1748288", "data-title" => Sibu::DEFAULT_TEXT}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {"id" => elt}))
       html_opts.merge!({data: {id: elt_id(elt), type: "map"}}) if action_name != 'show'
       content_tag(:div, nil, content.merge(html_opts))
@@ -191,6 +268,10 @@ module Sibu
       elt.is_a?(Hash) ? (elt["data-id"] || elt["id"]) : elt
     end
 
+    def current_elt(elt)
+      (elt.is_a?(Hash) ? elt : (select_element(elt) || {})).except('elements')
+    end
+
     def default_content(type)
       case type
       when "text"