sibu 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f747d2d0f30d44d8321ea252994eb72a246743
-  data.tar.gz: 4e422b2041a2e3b8ca5eb86810e5440873c7c85e
+  metadata.gz: 96611f8f7b23adda4d4502b1eef05f34d0a4dea2
+  data.tar.gz: 27fe50a309c23dfe80bce28c687d6fc05d96452d
 SHA512:
-  metadata.gz: 22a3a04bb5835e8119274276106e99ab700cd85c55c47aecafd8111c7c7eaa633f1c57a5e35b088a3532de89d7250580e17965f411a974657df642ac3c6b8a3b
-  data.tar.gz: 284b06e15ef29a30528f605d4c7b003781f17cad85be9a5c42daf78fff8520818189128abe907976ace0930b34f5c05d1f80cf3e7d367c523267e45734e9b1b1
+  metadata.gz: 3022613a600e634834e57373d4fefae4e760eda752e7966c5da5f403e7464d9279a0c1dd5277bdd97f9cbac101df450290a0762ea6a58183079362fd87d003c5
+  data.tar.gz: 530731b14939afd5615a25df8c1d0834f541c41343484ddfb256b0b1f98b53981fa513ee4b584c1ac6b6067b8d4d20ea0450aa2466955daaf18844509f84ebeb

data/app/helpers/sibu/pages_helper.rb

@@ -258,7 +258,7 @@ 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?
-        html_output = content_tag(:a, capture(link_elt, elts(elt), &block), content.merge(html_opts).except("elements"))
+        html_output = content_tag(:a, capture(link_elt, nested_elements(elt), &block), content.merge(html_opts).except("elements"))
       else
         html_output = content_tag(:a, raw(text), content.merge(html_opts).except("elements"))
       end

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

@@ -4,11 +4,14 @@
   <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" %>
+  <% end %>
+
+  <% if @site %>
     <%= javascript_include_tag @site.site_template.path %>
   <% end %>
+  <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= csrf_meta_tags %>
   <%= yield :styles %>
 </head>

data/lib/sibu/version.rb

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

metadata

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