Commit a73a2a756792efd78c29655b04f4c53f1f1bafd1
Committed by
Rafael Reggiani Manzo
Rafael Reggiani Manzo
1 parent
ccc53a30
Exists in
web_steps_improvements
and in
9 other branches
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
| @@ -21,12 +21,7 @@ class ArticleBlock < Block | @@ -21,12 +21,7 @@ class ArticleBlock < Block | ||
| 21 | def content(args={}) | 21 | def content(args={}) |
| 22 | block = self | 22 | block = self |
| 23 | proc do | 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 | end | 25 | end |
| 31 | end | 26 | end |
| 32 | 27 |
app/models/disabled_enterprise_message_block.rb
| @@ -13,9 +13,9 @@ class DisabledEnterpriseMessageBlock < Block | @@ -13,9 +13,9 @@ class DisabledEnterpriseMessageBlock < Block | ||
| 13 | end | 13 | end |
| 14 | 14 | ||
| 15 | def content(args={}) | 15 | def content(args={}) |
| 16 | - message = self.owner.environment.message_for_disabled_enterprise || '' | 16 | + block = self |
| 17 | lambda do |_| | 17 | lambda do |_| |
| 18 | - render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message} | 18 | + render :file => 'blocks/disabled_enterprise_message', :locals => { :block => block } |
| 19 | end | 19 | end |
| 20 | end | 20 | end |
| 21 | 21 |
app/models/feed_reader_block.rb
| @@ -52,16 +52,6 @@ class FeedReaderBlock < Block | @@ -52,16 +52,6 @@ class FeedReaderBlock < Block | ||
| 52 | self.feed_title.nil? ? _('Feed Reader') : self.feed_title | 52 | self.feed_title.nil? ? _('Feed Reader') : self.feed_title |
| 53 | end | 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 | def footer | 55 | def footer |
| 66 | if self.fetched_at.nil? or self.feed_items.empty? | 56 | if self.fetched_at.nil? or self.feed_items.empty? |
| 67 | _('Feed content was not loaded yet') | 57 | _('Feed content was not loaded yet') |
| @@ -86,7 +76,6 @@ class FeedReaderBlock < Block | @@ -86,7 +76,6 @@ class FeedReaderBlock < Block | ||
| 86 | end | 76 | end |
| 87 | 77 | ||
| 88 | def content(args={}) | 78 | def content(args={}) |
| 89 | - block_title(title) + formatted_feed_content | ||
| 90 | end | 79 | end |
| 91 | 80 | ||
| 92 | end | 81 | end |
| @@ -0,0 +1,12 @@ | @@ -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
| 1 | +<% message = block.owner.environment.message_for_disabled_enterprise || '' %> | ||
| 2 | + | ||
| 1 | <div id='enterprise-disabled'> | 3 | <div id='enterprise-disabled'> |
| 2 | <%= message %> | 4 | <%= message %> |
| 3 | <% if profile.blocked? && user && user.is_admin?(profile.environment) %> | 5 | <% if profile.blocked? && user && user.is_admin?(profile.environment) %> |
| @@ -0,0 +1,12 @@ | @@ -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 | +%> |