Download as
Browse Code »

Commit 03dce3f0666da44be941465d612de994c8f8749c

Authored by Francisco Marcelo A. Lima Júnior
1 parent eaac9e87
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

added image field to article

Showing 2 changed files with 10 additions and 4 deletions   Show diff stats
app/views/shared/_lead_and_body.rhtml
  Diff comments   View file @03dce3f
@@ -6,12 +6,18 @@ @@ -6,12 +6,18 @@
6 <% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %> 6 <% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
7 <% lead_id ||= 0%> 7 <% lead_id ||= 0%>
8 <% f ||= false%> 8 <% f ||= false%>
  9 +<% image_method ||= :image_builder %>
9 10
10 <br style="clear: both;"/> 11 <br style="clear: both;"/>
11 <%= button :add, _("Lead"), '#', :class => "lead-button", :article_id => "#article-lead-"+lead_id.to_s, :style => "margin-left: 0px;" %> 12 <%= button :add, _("Lead"), '#', :class => "lead-button", :article_id => "#article-lead-"+lead_id.to_s, :style => "margin-left: 0px;" %>
12 <em><%= _('Used when a short version of your text is needed.') %></em> 13 <em><%= _('Used when a short version of your text is needed.') %></em>
13 14
14 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>"> 15 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
  16 +
  17 + <% fields_for 'article[image_builder]', @article.image do |i| %>
  18 + <%= file_field_or_thumbnail(_('Image:'), @article.image, i) %>
  19 + <% end %>
  20 +
15 <% if f %> 21 <% if f %>
16 <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %> 22 <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
17 <% else %> 23 <% else %>
plugins/display_content/lib/display_content_block.rb
  Diff comments   View file @03dce3f
@@ -54,17 +54,17 @@ class DisplayContentBlock &lt; Block @@ -54,17 +54,17 @@ class DisplayContentBlock &lt; Block
54 54
55 sections.select { |section| 55 sections.select { |section|
56 case section[:name] 56 case section[:name]
57 - when 'title' 57 + when 'Title'
58 content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '') 58 content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '')
59 - when 'abstract' 59 + when 'Abstract'
60 content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' ) 60 content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' )
61 if display_section?(section) 61 if display_section?(section)
62 content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' ) 62 content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' )
63 read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more') 63 read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
64 end 64 end
65 - when 'body' 65 + when 'Body'
66 content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' ) 66 content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' )
67 - when 'image' 67 + when 'Image'
68 image_section = image_tag item.image.public_filename if item.image 68 image_section = image_tag item.image.public_filename if item.image
69 if !image_section.blank? 69 if !image_section.blank?
70 content_sections += (display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' ) 70 content_sections += (display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )