sibu 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 187225523e44d7872b43460ec38fa2fb60279279
-  data.tar.gz: 0b666532cb850f434cfe870f97fbe185f75b4f92
+  metadata.gz: ee29b0c95ac6340e5d0a42975ba4c699b19a413d
+  data.tar.gz: d25ad5770ab28ddd5dea0424506449a70ac74d12
 SHA512:
-  metadata.gz: 44ebbdfbceaa354891598646aed2e6fcaa61b157978dd1e151c87ef39413a4cdd3389abf1faacf3e6ea1d805ef5b1e3ef7fe2dd41da3b9263b5cb8879da69a3f
-  data.tar.gz: 3617c7fdbbac46f19f70200e2bba5e13ea656a9e0f65bc97132c07a862c356f6b59d31fe8529a5b231bb119bafc9763ce0c5bb5f74130f3e16e6bd7a5459261f
+  metadata.gz: 8fe798120905a4ce03a06b170ac5568cc86aab93056d7e04578b3aa9171492a1da52340b98384318c107f20724655250f0144dc5ffef5833776fd4eba0772c77
+  data.tar.gz: 16c4d3f1f5048fa095813055ea968b9fccab205cd0333a12ccda5fb6a49645df26372305a4fdf989ea808f77f95e5c7a09d5b0627d2cb97ad11cf0bbfa824d3f

data/app/controllers/sibu/pages_controller.rb

@@ -70,11 +70,11 @@ module Sibu
     def edit_element
       @content_type = params[:content_type]
       @links = @site.pages_path_by_id if @site
-      @element = @entity.element(@section_id, @element_id)
+      @element = @entity.element(*@section_id.split('|'), @element_id)
     end
 
     def update_element
-      @updated = @entity.update_element(@section_id, element_params)
+      @updated = @entity.update_element(*@section_id.split('|'), element_params)
     end
 
     def edit_section

data/app/helpers/sibu/pages_helper.rb

@@ -36,9 +36,9 @@ module Sibu
 
     def site_section(id, sub_id = nil, &block)
       @sb_entity = @site
-      @sb_section = sub_id ? [id, sub_id] : id
+      @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
+        "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='site'>#{capture(self, &block)}</sb-edit>".html_safe
       else
         self
       end
@@ -46,8 +46,8 @@ module Sibu
 
     def section(id, sub_id = nil, &block)
       @sb_entity = @page
-      @sb_section = sub_id ? [id, sub_id] : id
-      "<sb-edit data-id='#{id}' data-entity='page'>#{capture(self, &block)}</sb-edit>".html_safe
+      @sb_section = sub_id ? [id, sub_id] : [id]
+      "<sb-edit data-id='#{@sb_section.join('|')}' data-entity='page'>#{capture(self, &block)}</sb-edit>".html_safe
     end
 
     def site_sections(id)
@@ -64,13 +64,13 @@ module Sibu
 
     def each
       # Todo : init array when empty
-      @sb_entity.section(@sb_section).each do |elt|
+      @sb_entity.section(*@sb_section).each do |elt|
         yield(elt.except("elements"), elt["elements"])
       end
     end
 
     def each_elements
-      @sb_entity.section(@sb_section).each do |elt|
+      @sb_entity.section(*@sb_section).each do |elt|
         yield(*elt["elements"])
       end
     end

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

@@ -20,22 +20,14 @@ module Sibu
       elsif ids.length == 2
         subsection(*ids)
       end
-      #   s = section(ids[0])
-      #   sub = s.select {|elt| elt["id"] == ids[1]}
-      #   unless sub
-      #     sub = {"id" => ids[1], "elements" => []}
-      #     self.sections[ids[0]] << sub
-      #     save
-      #   end
-      #   elts = sub
-      # end
-      # elts.blank? ? {"default" => {}} : Hash[elts.map {|e| [e["id"], e.except("id")]}]
     end
 
     def subsection(id, subid)
       s = section(id)
-      sub = s.select {|elt| elt["id"] == subid}.first
-      unless sub
+      sub_idx = s.index {|elt| elt["id"] == subid}
+      if sub_idx
+        sub = s[sub_idx]
+      else
         sub = {"id" => subid, "elements" => []}
         self.sections[id] << sub
         save
@@ -43,21 +35,23 @@ module Sibu
       sub["elements"]
     end
 
-    def element(section_id, element_id)
-      elt = section(section_id).select {|e| e["id"] == element_id}.first
+    def element(*ids, element_id)
+      elt = section(*ids).select {|e| e["id"] == element_id}.first
       elt || {}
     end
 
     def update_section(*ids, value)
     end
 
-    def update_element(section_id, value)
+    def update_element(*ids, value)
       sanitize_value(value)
-      if self.sections[section_id].any? {|elt| elt["id"] == value["id"]}
-        self.sections[section_id].map! {|elt| elt["id"] == value["id"] ? value : elt}
+      parent_section = section(*ids)
+      if parent_section.any? {|elt| elt["id"] == value["id"]}
+        parent_section.map! {|elt| elt["id"] == value["id"] ? value : elt}
       else
-        self.sections[section_id] << value
+        parent_section << value
       end
+
       value if save
     end
 

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

@@ -2,9 +2,9 @@
 <html>
 <head>
   <title><%= conf[:title] %></title>
-  <%= stylesheet_link_tag conf[:stylesheet], media: 'all' %>
+  <%= stylesheet_link_tag "#{conf[:stylesheet]}-edit", media: 'all' %>
   <%= stylesheet_link_tag 'sibu/sibu', media: 'all' %>
-  <%= javascript_include_tag conf[:javascript] %>
+  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= javascript_include_tag 'sibu/sibu' %>
   <% if @site %>
     <%= stylesheet_link_tag @site.site_template.path, media: "all" %>
@@ -17,20 +17,22 @@
   <% unless conf[panel].blank? %>
     <div class="<%= panel == :content_panel ? 'sibu_content_panel' : 'sibu_panel' %>">
       <%= render conf[panel] %>
+      <% if panel == :content_panel %>
+        <div id="edit_panel" class="sibu_panel sibu_view"></div>
+        <div id="edit_mode_overlay" class="sibu_panel sibu_view">
+          <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">
+            <p>Modifier la section</p>
+            <button onclick="cancelEditMode()">Fermer</button>
+          </div>
+        </div>
+      <% end %>
     </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'];
@@ -44,12 +46,14 @@
         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});
+        var yPosition = offset.top - $(".sibu_content_panel").offset().top;
+        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.show();
+        window.scrollTo(0, yPosition);
         initInnerOverlays(elt);
         elt.remove();
     }

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

@@ -1,8 +1,9 @@
 <h2>Modifier l'image</h2>
 <div id="edit_msg"></div>
-<div class="sibu_form">
+<div class="sibu_edit_form">
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
-    <div class="sibu_select_images">
+    <div class="sibu_select_images sibu_field">
+      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id) %> une image</p>
       <% @site.images.each do |image| %>
       <div class="sibu_image">
         <%= image_tag image.file_url(:small) %>

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

@@ -8,6 +8,7 @@ editPanel.html("");
 <% 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"));
   });
 <% elsif @content_type == 'link' %>

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

@@ -10,7 +10,7 @@
       <th>Modèle</th>
       <th>Chemin d'accès</th>
       <th>Mise à jour</th>
-      <th></th>
+      <th colspan="2"></th>
     </tr>
     </thead>
     <tbody>
@@ -20,7 +20,7 @@
         <td><%= p.template %></td>
         <td><%= p.path %></td>
         <td><%= l p.updated_at %></td>
-        <td>
+        <td colspan="2">
           <%= link_to 'Voir', site_page_path(@site.id, p), target: '_blank' %> |
           <%= link_to 'Editer', site_page_edit_content_path(site_id: @site.id, page_id: p.id) %> |
           <%= link_to 'Modifier', edit_site_page_path(@site.id, p) %> |

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

@@ -9,7 +9,7 @@
         <th>Nom</th>
         <th>Modèle</th>
         <th>Mise à jour</th>
-        <th></th>
+        <th colspan="2"></th>
       </tr>
     </thead>
     <tbody>
@@ -18,9 +18,9 @@
         <td><%= s.name %></td>
         <td><%= s.site_template.name if s.site_template %></td>
         <td><%= l s.updated_at %></td>
-        <td>
-          <%= link_to 'Voir', site_path(s), target: '_blank' %> |
+        <td colspan="2">
           <%= link_to 'Pages', site_pages_path(s) %> |
+          <%= link_to 'Images', site_images_path(s) %> |
           <%= link_to 'Modifier', edit_site_path(s) %> |
           <%= link_to 'Supprimer', site_path(s), method: :delete, data: {confirm: "Supprimer le site \"#{s.name}\" ?"} %>
         </td>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

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