Download as
Browse Code »

Commit a73a2a756792efd78c29655b04f4c53f1f1bafd1

Authored by Joenio Costa
Committed by Rafael Reggiani Manzo
1 parent ccc53a30
Exists in web_steps_improvements and in 9 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_sign_up_form, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.5

moving some HTML from models to views

Showing 6 changed files with 29 additions and 19 deletions   Show diff stats
app/models/article_block.rb
  Diff comments   View file @a73a2a7
... ... @@ -21,12 +21,7 @@ class ArticleBlock < Block
21 21 def content(args={})
22 22 block = self
23 23 proc do
24   - block_title(block.title) +
25   - (block.article ? article_to_html(FilePresenter.for(block.article),
26   - :gallery_view => false,
27   - :inside_block => block, # For Blogs and folders
28   - :format => block.visualization_format # For Articles and contents
29   - ).html_safe : _('Article not selected yet.'))
  24 + render :file => 'blocks/article', :locals => { :block => block }
30 25 end
31 26 end
32 27  
... ...
app/models/disabled_enterprise_message_block.rb
  Diff comments   View file @a73a2a7
... ... @@ -13,9 +13,9 @@ class DisabledEnterpriseMessageBlock < Block
13 13 end
14 14  
15 15 def content(args={})
16   - message = self.owner.environment.message_for_disabled_enterprise || ''
  16 + block = self
17 17 lambda do |_|
18   - render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
  18 + render :file => 'blocks/disabled_enterprise_message', :locals => { :block => block }
19 19 end
20 20 end
21 21  
... ...
app/models/feed_reader_block.rb
  Diff comments   View file @a73a2a7
... ... @@ -52,16 +52,6 @@ class FeedReaderBlock < Block
52 52 self.feed_title.nil? ? _('Feed Reader') : self.feed_title
53 53 end
54 54  
55   - def formatted_feed_content
56   - if error_message.blank?
57   - "<ul>\n".html_safe +
58   - self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
59   - "</ul>".html_safe
60   - else
61   - "<p>#{error_message}</p>".html_safe
62   - end
63   - end
64   -
65 55 def footer
66 56 if self.fetched_at.nil? or self.feed_items.empty?
67 57 _('Feed content was not loaded yet')
... ... @@ -86,7 +76,6 @@ class FeedReaderBlock &lt; Block
86 76 end
87 77  
88 78 def content(args={})
89   - block_title(title) + formatted_feed_content
90 79 end
91 80  
92 81 end
... ...
app/views/blocks/article.html.erb 0 → 100644
  Diff comments   View file @a73a2a7
... ... @@ -0,0 +1,12 @@
  1 +<%= block_title(block.title) %>
  2 +<% if block.article %>
  3 + <%=h
  4 + article_to_html(FilePresenter.for(block.article),
  5 + :gallery_view => false,
  6 + :inside_block => block, # For Blogs and folders
  7 + :format => block.visualization_format # For Articles and contents
  8 + )
  9 + %>
  10 +<% else %>
  11 + <%= _('Article not selected yet.') %>
  12 +<% end %>
... ...
app/views/blocks/disabled_enterprise_message.html.erb
  Diff comments   View file @a73a2a7
  1 +<% message = block.owner.environment.message_for_disabled_enterprise || '' %>
  2 +
1 3 <div id='enterprise-disabled'>
2 4 <%= message %>
3 5 <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
... ...
app/views/blocks/feed_reader.html.erb 0 → 100644
  Diff comments   View file @a73a2a7
... ... @@ -0,0 +1,12 @@
  1 +<%= block_title(title) %>
  2 +
  3 +<%
  4 +
  5 + if error_message.blank?
  6 + "<ul>\n".html_safe +
  7 + self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
  8 + "</ul>".html_safe
  9 + else
  10 + "<p>#{error_message}</p>".html_safe
  11 + end
  12 +%>
... ...