sibu 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48f219f6b806e3d5d5fbd7ce2df9224fd2e65b8a
-  data.tar.gz: 56fcfd81852d1cb3a11f4c0b4a3754cbf0f261c7
+  metadata.gz: 83f747d2d0f30d44d8321ea252994eb72a246743
+  data.tar.gz: 4e422b2041a2e3b8ca5eb86810e5440873c7c85e
 SHA512:
-  metadata.gz: 10d19792d46338bd0bd7a3be61bad6547562e8e55edf252ee311727b7f02dfad823c95e66667f3e314ad6d3be30ca51a688028b0a1628f7d6ecfda46caf2e12d
-  data.tar.gz: 92ecb493f7f4f5986cb0c8f5936add93dd5d962fa7618c5eba06cbd40638bc73837ba0f9e94a6673968c3ec044685ac25fa5d2e37eb21cbd20c8e5b0eb41bad3
+  metadata.gz: 22a3a04bb5835e8119274276106e99ab700cd85c55c47aecafd8111c7c7eaa633f1c57a5e35b088a3532de89d7250580e17965f411a974657df642ac3c6b8a3b
+  data.tar.gz: 284b06e15ef29a30528f605d4c7b003781f17cad85be9a5c42daf78fff8520818189128abe907976ace0930b34f5c05d1f80cf3e7d367c523267e45734e9b1b1

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

@@ -229,8 +229,7 @@ $sibu-color3 : #333 !default;
     padding: 2rem;
 
     img {
-      padding-top: 2rem;
-      padding-bottom: 2rem;
+      margin-bottom: 2rem;
       border-top: 2px solid $sibu-color1;
       box-shadow: 0 0 5px #ccc;
     }

data/app/helpers/sibu/pages_helper.rb

@@ -124,25 +124,33 @@ module Sibu
       wrapper = opts.delete(:wrapper)
       repeat = opts.delete(:repeat)
       size = opts.delete(:size)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt, "src" => Sibu::DEFAULT_IMG}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "src" => Sibu::DEFAULT_IMG}
       content = defaults.merge(elt.is_a?(Hash) ? elt : (select_element(elt) || {}))
+      @sb_section = (@sb_section || []) + [t_id]
       if action_name == 'show'
         content["src"] = ("/#{conf[:deployment_path]}" + content["src"]) if @online && conf[:deployment_path]
       else
-        opts.merge!({data: {id: elt_id(elt), type: "media", repeat: repeat, size: size}})
+        opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "media", repeat: repeat, size: size}})
       end
-      wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts)
+      html_output = wrapper ? content_tag(wrapper, content_tag(:img, nil, content.except("id")), opts)
           : content_tag(:img, nil, content.except("id").merge(opts.stringify_keys) {|k, old, new| k == 'class' ? [old, new].join(' ') : new})
+      @sb_section -= [t_id]
+      html_output
     end
 
     def grp(elt, opts = {}, &block)
       wrapper = opts.delete(:wrapper) || :div
       repeat = opts.delete(:repeat)
       children = opts.delete(:children)
-      defaults = {"id" => elt.is_a?(Hash) ? elt["id"] : elt}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      @sb_section = (@sb_section || []) + [t_id]
+      defaults = {"id" => t_id}
       opts = defaults.merge(opts)
-      opts.merge!({data: {id: elt_id(elt), type: "group", repeat: repeat, children: children}}) if action_name != 'show'
-      content_tag(wrapper, capture(*elts(elt), &block), opts)
+      opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "group", repeat: repeat, children: children}}) if action_name != 'show'
+      html_output = content_tag(wrapper, capture(*elts(elt), &block), opts)
+      @sb_section -= [t_id]
+      html_output
     end
 
     def empty_tag(elt, tag, type, opts = {})
@@ -229,12 +237,14 @@ module Sibu
     def link(elt, html_opts = {}, &block)
       repeat = html_opts.delete(:repeat)
       children = html_opts.delete(:children)
-      defaults = {"id" => elt_id(elt), "value" => "", "text" => Sibu::DEFAULT_TEXT}
+      t_id = elt.is_a?(Hash) ? elt["id"] : elt
+      defaults = {"id" => t_id, "value" => "", "text" => Sibu::DEFAULT_TEXT}
       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'
+      @sb_section = (@sb_section || []) + [t_id]
+      html_opts.merge!({data: {id: @sb_section[1..-1].join('|'), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
       if val.to_s.start_with?('http')
         content["href"] = val
       elsif val.to_s.start_with?('#')
@@ -248,13 +258,12 @@ module Sibu
         content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
       end
       if block_given?
-        @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"))
+        html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end
+      @sb_section -= [t_id]
+      html_output
     end
 
     def interactive_map(elt, html_opts = {})

data/app/models/sibu/page.rb

@@ -62,5 +62,9 @@ module Sibu
         save
       end
     end
+
+    def home?
+      is_home == 'true' || is_home == '1'
+    end
   end
 end

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]}-edit", 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>

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

@@ -1,6 +1,9 @@
 <div id="pages" class="sibu_view">
   <div class="actions">
-    <%= link_to 'Créer une page', new_site_page_path(@site.id) %> <%= link_to 'Retour', :back %>
+    <%= link_to "Bibliothèque d'images", images_path %>
+    <%= link_to "Documents", documents_path %>
+    <%= link_to 'Créer une page', new_site_page_path(@site.id) %>
+    <%= link_to 'Retour', :back %>
   </div>
   <h2>Pages du site "<%= @site.name %>"</h2>
   <table>
@@ -24,7 +27,7 @@
           <%= 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 'Copier', duplicate_site_page_path(@site.id, p), method: :post, data: {confirm: "Copier la page \"#{p.name}\" ?"} %> |
-          <%= link_to 'Réglages', edit_site_page_path(@site.id, p) %> |
+          <%= link_to 'Paramétrer cette page', edit_site_page_path(@site.id, p) %> |
           <%= link_to 'Supprimer', site_page_path(@site.id, p), method: :delete, data: {confirm: "Supprimer la page \"#{p.name}\" ?"} %>
         </td>
       </tr>

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

@@ -16,8 +16,8 @@
   <div class="sibu_field">
     <%= f.label :site_template_id, 'Modèle' %>
     <div>
-      <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all, :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
-      <small>Choisissez le gabarit qui servira de modèle pour votre site (non modifiable après création)</small>
+      <%= f.collection_select(:site_template_id, Sibu::SiteTemplate.all.order(:name), :id, :name, {prompt: 'Sélectionnez un modèle de site'}, disabled: @site.persisted?) %>
+      <small>Choisissez le gabarit qui servira de modèle pour votre site (voir exemples ci-dessous - non modifiable après création)</small>
     </div>
   </div>
   <div class="sibu_field">

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

@@ -8,7 +8,7 @@
   </div>
   <h2>Aperçu des modèles</h2>
   <div>
-    <% Sibu::SiteTemplate.all.each do |st| %>
+    <% Sibu::SiteTemplate.all.order(:name).each do |st| %>
       <div class="sibu_template">
         <h3><%= st.name %></h3>
         <%= image_tag "#{st.path}1.jpg" %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

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