diff --git a/app/views/shared/_lead_and_body.rhtml b/app/views/shared/_lead_and_body.rhtml
index ad5ed41..445ab22 100644
--- a/app/views/shared/_lead_and_body.rhtml
+++ b/app/views/shared/_lead_and_body.rhtml
@@ -6,12 +6,18 @@
<% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
<% lead_id ||= 0%>
<% f ||= false%>
+<% image_method ||= :image_builder %>
<%= button :add, _("Lead"), '#', :class => "lead-button", :article_id => "#article-lead-"+lead_id.to_s, :style => "margin-left: 0px;" %>
<%= _('Used when a short version of your text is needed.') %>
+
+ <% fields_for 'article[image_builder]', @article.image do |i| %>
+ <%= file_field_or_thumbnail(_('Image:'), @article.image, i) %>
+ <% end %>
+
<% if f %>
<%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
<% else %>
diff --git a/plugins/display_content/lib/display_content_block.rb b/plugins/display_content/lib/display_content_block.rb
index 18af8fb..72c79c2 100644
--- a/plugins/display_content/lib/display_content_block.rb
+++ b/plugins/display_content/lib/display_content_block.rb
@@ -54,17 +54,17 @@ class DisplayContentBlock < Block
sections.select { |section|
case section[:name]
- when 'title'
+ when 'Title'
content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '')
- when 'abstract'
+ when 'Abstract'
content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' )
if display_section?(section)
content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' )
read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
end
- when 'body'
+ when 'Body'
content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' )
- when 'image'
+ when 'Image'
image_section = image_tag item.image.public_filename if item.image
if !image_section.blank?
content_sections += (display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )
--
libgit2 0.21.2