sibu 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6916799ff35b88c15850f4911c93517a43e8ba1f
-  data.tar.gz: ef515f1129ed26fdf3f156794e79ac402a37011d
+  metadata.gz: b274fec919e722e48ba571e1ee3379f037af6372
+  data.tar.gz: 4da5793bc66501214bbb5c9a5a38b00890b4754e
 SHA512:
-  metadata.gz: 471eee1cd3b1388651e1771f65396748f48a5e59826552fda85588373cbd2e8df68fa6d0b0a99f6c33f43b0291cba853dd36ded178aa3ec6f2dadd510d968095
-  data.tar.gz: 913ed58b8942eb16f66b492536e7466927835ff9be32523335c3ec13dc3a1898d0f81aeeedbfda4eb6e38e41ef7a6491f698b5dccc1e334fb12fc160e255faf9
+  metadata.gz: '085bf4d2059a0f51494b062332fa6c9e9ada4313d6be6c4ee4799c8f0418d0fc4967d1c2ac967e7f750651866abb1fb249997e6f10e71d067c912fb5ecb5081e'
+  data.tar.gz: f26e18f34db37e935cdf4f891fa7033bc585a78421f32b950974460f1a777e97174cf8b728b9f95c452c6d2ffdd7fff2e82e2fbe6163e235fd5633cd0b250f88

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
@@ -194,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/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
@@ -58,7 +62,7 @@ module Sibu
           end
         else
           if t == :p
-            html_output = content_tag(:div, content_tag(t, raw(content["text"]).html_safe, html_opts), html_opts)
+            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
@@ -95,8 +99,12 @@ module Sibu
       (tokens + [suffix]).select {|t| !t.blank?}.join("|")
     end
 
-    def nested_elements(id)
-      element_id = elt_id(id)
+    # 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")}] :
@@ -187,10 +195,18 @@ module Sibu
              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-entity" => @sb_entity == @site ? 'site' : 'page'}) : html_opts
@@ -242,7 +258,7 @@ module Sibu
     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))

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

@@ -2,13 +2,13 @@
 <html>
 <head>
   <title><%= conf[:title] %></title>
-  <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
-  <%= stylesheet_link_tag conf[:stylesheet], media: 'all' %>
-  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <% if @site %>
     <%= stylesheet_link_tag (conf[:custom_styles] ? @site.style_url : @site.site_template.path), media: "all" %>
     <%= javascript_include_tag @site.site_template.path %>
   <% end %>
+  <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
+  <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
+  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>
@@ -44,11 +44,8 @@
 <%= javascript_include_tag 'sibu/sibu' %>
 <script>
     document.addEventListener("DOMContentLoaded", function() {
-        initOverlays();
+        initOverlays("<%= @edit_section || '' %>");
         sibuCallback("editContent");
-        <% unless @edit_section.blank? %>
-          document.querySelector("[data-sb-overlay='<%= @edit_section %>']").click();
-        <% end %>
     });
 
     function setEditMode(section, overlay, left, top, width, height) {
@@ -232,7 +229,7 @@
         }
     }
 
-    function initOverlays() {
+    function initOverlays(activeSection = "") {
         setTimeout(function() {
             var container = document.querySelector("#edit_overlays"), sections = document.querySelectorAll("[data-sb-id]");
             container.innerHTML = "";
@@ -255,6 +252,9 @@
                     };
                 })(sections[i], sectionBox.left, yOffset, width, height));
             }
+            if (activeSection) {
+                document.querySelector("[data-sb-overlay='" + activeSection + "']").click();
+            }
         }, 800);
     }
 

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

@@ -1,5 +1,6 @@
 <h2>Modifier le contenu</h2>
 <div id="edit_msg"></div>
+<%= render 'element_actions' %>
 <div class="sibu_edit_form">
   <form class="edit_element_form" action="<%= update_element_site_page_path(@site.id, @page.id, format: :js) %>" accept-charset="UTF-8" method="patch">
     <div class="sibu_field">

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

@@ -13,6 +13,13 @@
       <small>L'adresse (ou URL) de la page, utilisée par les navigateurs web pour y accéder</small>
     </div>
   </div>
+  <div class="sibu_field">
+    <%= f.label :source, "Référence" %>
+    <div>
+      <%= f.text_field :source, placeholder: "Référence interne optionnelle (Ex: test mise en page 2) " %>
+      <small>Un bref descriptif de la page, à usage interne uniquement</small>
+    </div>
+  </div>
   <div class="sibu_field">
     <%= f.label :is_home, "Page d'accueil" %>
     <div>
@@ -56,6 +63,7 @@
     </div>
   </div>
   <%= f.hidden_field :site_id %>
+  <%= f.hidden_field :site_id %>
   <div class="sibu_actions">
     <%= f.submit 'Valider' %>
     <%= link_to 'Annuler', :back %>

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

@@ -1,5 +1,6 @@
 <h2>Modifier la carte</h2>
 <div id="edit_msg"></div>
+<%= render 'element_actions' %>
 <div class="sibu_edit_form">
   <form class="edit_element_form" action="<%= update_element_site_page_path(@site.id, @page.id, format: :js) %>" accept-charset="UTF-8" method="patch">
     <div class="sibu_field">

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

@@ -8,7 +8,7 @@
     <tr>
       <th>Nom</th>
       <th>Chemin d'accès</th>
-      <th>Origine</th>
+      <th>Référence</th>
       <th>Mise à jour</th>
       <th></th>
     </tr>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails