moved HTML out of all core blocks

Joenio Costa · Rafael Reggiani Manzo
1 parent 2b143a6d
Showing 9 changed files with 77 additions and 65 deletions Show diff stats
app/models/blog_archives_block.rb
app/models/disabled_enterprise_message_block.rb
app/models/product_categories_block.rb
app/models/profile_list_block.rb
app/models/tags_block.rb
app/views/blocks/blog_archives.html.erb
app/views/blocks/product_categories.html.erb
app/views/blocks/profile_list.html.erb
app/views/blocks/tags.html.erb
@@ -22,7 +22,6 @@ class BlogArchivesBlock &lt; Block
   end
   def content(args={})
-    return nil unless self.blog
     block = self
     proc do
       render :file => 'blocks/blog_archives', :locals => { :block => block }
@@ -14,7 +14,7 @@ class DisabledEnterpriseMessageBlock &lt; Block
   def content(args={})
     block = self
-    lambda do |_|
+    proc do
        render :file => 'blocks/disabled_enterprise_message', :locals => { :block => block }
     end
   end
@@ -14,22 +14,9 @@ class ProductCategoriesBlock &lt; Block
   end
   def content(args={})
-    profile = owner
+    block = self
     proc do
-      if @categories.nil? or @categories.length == 0
-        categories = ProductCategory.on_level(nil).order(:name)
-        if @categories and @categories.length == 0
-          notice = _('There are no sub-categories for %s') % @category.name
-        end
-      else
-        categories = @categories
-      end
-      render :file => 'blocks/product_categories',
-             :locals => {
-               :profile => profile,
-               :categories => categories,
-               :notice => notice
-             }
+      render :file => 'blocks/product_categories', :locals => { :block => block }
     end
   end
@@ -41,22 +41,9 @@ result = public_profiles.all(:limit =&gt; get_limit, :order =&gt; &#39;profiles.updated_at
   end
   def content(args={})
-    profiles = self.profile_list
-    title = self.view_title
-    nl = "\n"
-    proc do |context|
-      count=0
-      list = profiles.map {|item|
-               count+=1
-               send(:profile_image_link, item, :minor )
-             }.join("\n  ")
-      if list.empty?
-        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
-      else
-        list = content_tag 'ul', nl +'  '+ list + nl
-      end
-      block_title(title) + nl +
-      content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))
+    block = self
+    proc do
+      render :file => 'blocks/profile_list', :locals => { :block => block }
     end
   end
@@ -29,24 +29,10 @@ class TagsBlock &lt; Block
   end
   def content(args={})
-    is_env = owner.class == Environment
-    tags = is_env ? owner.tag_counts : owner.article_tags
-    return '' if tags.empty?
-
-    if limit
-      tags_tmp = tags.sort_by{ |k,v| -v }[0..(limit-1)]
-      tags = {}
-      tags_tmp.map{ |k,v| tags[k] = v }
+    block = self
+    proc do
+      render :file => 'blocks/tags', :locals => { :block => block }
     end
-
-    url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
-          owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged')
-    tagname_option = is_env ? :tag : :id
-
-    block_title(title) +
-    "\n<div class='tag_cloud'>\n".html_safe+
-    tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
-    "\n</div><!-- end class='tag_cloud' -->\n".html_safe
   end
   def footer
-<%= block_title(block.title) %>
+<% if block.blog %>
+  <%= block_title(block.title) %>
-<ul class='blog-archives'>
-  <% block.blog.total_number_of_posts(:by_year).each do |year, count| %>
-    <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
-    <ul class='<%= year.to_i %>-archive'>
-      <% block.blog.total_number_of_posts(:by_month, year).each do |month, count| %>
-        <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
-      <% end %>
-    </ul>
-  <% end %>
-</ul>
+  <ul class='blog-archives'>
+    <% block.blog.total_number_of_posts(:by_year).each do |year, count| %>
+      <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
+      <ul class='<%= year.to_i %>-archive'>
+        <% block.blog.total_number_of_posts(:by_month, year).each do |month, count| %>
+          <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
+        <% end %>
+      </ul>
+    <% end %>
+  </ul>
-<%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
+  <%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
+<% end %>
-<%= link_to _('Catalog start'), profile.catalog_url, :class=>'catalog-home-link' %>
+<%
+  if @categories.nil? or @categories.length == 0
+    categories = ProductCategory.on_level(nil).order(:name)
+  else
+    categories = @categories
+  end
+%>
+
+<%= link_to _('Catalog start'), block.owner.catalog_url, :class=>'catalog-home-link' %>
 <ul class="catalog-categories-list">
   <% categories.each do |category| %>
     <%= category_with_sub_list(category) %>
   <% end %>
 </ul>
-<% if notice %>
-  <div class="catalog-categories-notice"><%= notice %></div>
+<% if @categories and @categories.length == 0 %>
+  <div class="catalog-categories-notice">
+    <%= _('There are no sub-categories for %s') % @category.name %>
+  </div>
 <% end %>
@@ -0,0 +1,16 @@
+<%= block_title(block.view_title) %>
+
+<%
+  count=0
+  list = block.profile_list.map {|item| count+=1 block.send(:profile_image_link, item, :minor)}.join("\n  ")
+%>
+
+<div>
+  <% if list.empty? %>
+    <div class='common-profile-list-block-none'><%= _('None') %></div>
+  <% else %>
+    <ul><%= list %></ul>
+  <% end %>
+</div>
+ 
+<br style='clear:both'/>
@@ -0,0 +1,25 @@
+<%= block_title(block.title) %>
+
+<%
+  is_env = block.owner.class == Environment
+  tags = is_env ? block.owner.tag_counts : block.owner.article_tags
+  if block.limit
+    tags_tmp = tags.sort_by{ |k,v| -v }[0..(block.limit-1)]
+    tags = {}
+    tags_tmp.map{ |k,v| tags[k] = v }
+  end
+%>
+
+<% unless tags.empty? %>
+  <div class='tag_cloud'>
+    <% if is_env %>
+      <%= tag_cloud(tags, :tag,
+                    {:host=>block.owner.default_hostname, :controller=>'search', :action => 'tag'},
+                    :max_size => 16, :min_size => 9) %>
+    <% else %>
+      <%= tag_cloud(tags, :id,
+                    owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged'),
+                    :max_size => 16, :min_size => 9) %>
+  <% end %>
+  </div>
+<% end %>
	@@ -22,7 +22,6 @@ class BlogArchivesBlock < Block		@@ -22,7 +22,6 @@ class BlogArchivesBlock < Block
22	end	22	end
23		23
24	def content(args={})	24	def content(args={})
25	- return nil unless self.blog
26	block = self	25	block = self
27	proc do	26	proc do
28	render :file => 'blocks/blog_archives', :locals => { :block => block }	27	render :file => 'blocks/blog_archives', :locals => { :block => block }
	@@ -14,7 +14,7 @@ class DisabledEnterpriseMessageBlock < Block		@@ -14,7 +14,7 @@ class DisabledEnterpriseMessageBlock < Block
14		14
15	def content(args={})	15	def content(args={})
16	block = self	16	block = self
17	- lambda do \|_\|	17	+ proc do
18	render :file => 'blocks/disabled_enterprise_message', :locals => { :block => block }	18	render :file => 'blocks/disabled_enterprise_message', :locals => { :block => block }
19	end	19	end
20	end	20	end
	@@ -14,22 +14,9 @@ class ProductCategoriesBlock < Block		@@ -14,22 +14,9 @@ class ProductCategoriesBlock < Block
14	end	14	end
15		15
16	def content(args={})	16	def content(args={})
17	- profile = owner	17	+ block = self
18	proc do	18	proc do
19	- if @categories.nil? or @categories.length == 0
20	- categories = ProductCategory.on_level(nil).order(:name)
21	- if @categories and @categories.length == 0
22	- notice = _('There are no sub-categories for %s') % @category.name
23	- end
24	- else
25	- categories = @categories
26	- end
27	- render :file => 'blocks/product_categories',
28	- :locals => {
29	- :profile => profile,
30	- :categories => categories,
31	- :notice => notice
32	- }	19	+ render :file => 'blocks/product_categories', :locals => { :block => block }
33	end	20	end
34	end	21	end
35		22
	@@ -41,22 +41,9 @@ result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at		@@ -41,22 +41,9 @@ result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at
41	end	41	end
42		42
43	def content(args={})	43	def content(args={})
44	- profiles = self.profile_list
45	- title = self.view_title
46	- nl = "\n"
47	- proc do \|context\|
48	- count=0
49	- list = profiles.map {\|item\|
50	- count+=1
51	- send(:profile_image_link, item, :minor )
52	- }.join("\n ")
53	- if list.empty?
54	- list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
55	- else
56	- list = content_tag 'ul', nl +' '+ list + nl
57	- end
58	- block_title(title) + nl +
59	- content_tag('div', nl + list + nl + tag('br', :style => 'clear:both'))	44	+ block = self
		45	+ proc do
		46	+ render :file => 'blocks/profile_list', :locals => { :block => block }
60	end	47	end
61	end	48	end
62		49
	@@ -29,24 +29,10 @@ class TagsBlock < Block		@@ -29,24 +29,10 @@ class TagsBlock < Block
29	end	29	end
30		30
31	def content(args={})	31	def content(args={})
32	- is_env = owner.class == Environment
33	- tags = is_env ? owner.tag_counts : owner.article_tags
34	- return '' if tags.empty?
35	-
36	- if limit
37	- tags_tmp = tags.sort_by{ \|k,v\| -v }[0..(limit-1)]
38	- tags = {}
39	- tags_tmp.map{ \|k,v\| tags[k] = v }	32	+ block = self
		33	+ proc do
		34	+ render :file => 'blocks/tags', :locals => { :block => block }
40	end	35	end
41	-
42	- url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
43	- owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged')
44	- tagname_option = is_env ? :tag : :id
45	-
46	- block_title(title) +
47	- "\n<div class='tag_cloud'>\n".html_safe+
48	- tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
49	- "\n</div><!-- end class='tag_cloud' -->\n".html_safe
50	end	36	end
51		37
52	def footer	38	def footer
1	-<%= block_title(block.title) %>	1	+<% if block.blog %>
		2	+ <%= block_title(block.title) %>
2		3
3	-<ul class='blog-archives'>
4	- <% block.blog.total_number_of_posts(:by_year).each do \|year, count\| %>
5	- <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
6	- <ul class='<%= year.to_i %>-archive'>
7	- <% block.blog.total_number_of_posts(:by_month, year).each do \|month, count\| %>
8	- <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
9	- <% end %>
10	- </ul>
11	- <% end %>
12	-</ul>	4	+ <ul class='blog-archives'>
		5	+ <% block.blog.total_number_of_posts(:by_year).each do \|year, count\| %>
		6	+ <%= content_tag('li', content_tag('strong', "#{year.to_i} (#{count})")) %>
		7	+ <ul class='<%= year.to_i %>-archive'>
		8	+ <% block.blog.total_number_of_posts(:by_month, year).each do \|month, count\| %>
		9	+ <%= content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", block.blog.url.merge(year: year.to_i, month: month.to_i))) %>
		10	+ <% end %>
		11	+ </ul>
		12	+ <% end %>
		13	+ </ul>
13		14
14	-<%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>	15	+ <%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
		16	+<% end %>
1	-<%= link_to _('Catalog start'), profile.catalog_url, :class=>'catalog-home-link' %>	1	+<%
		2	+ if @categories.nil? or @categories.length == 0
		3	+ categories = ProductCategory.on_level(nil).order(:name)
		4	+ else
		5	+ categories = @categories
		6	+ end
		7	+%>
		8	+
		9	+<%= link_to _('Catalog start'), block.owner.catalog_url, :class=>'catalog-home-link' %>
2	<ul class="catalog-categories-list">	10	<ul class="catalog-categories-list">
3	<% categories.each do \|category\| %>	11	<% categories.each do \|category\| %>
4	<%= category_with_sub_list(category) %>	12	<%= category_with_sub_list(category) %>
5	<% end %>	13	<% end %>
6	</ul>	14	</ul>
7	-<% if notice %>
8	- <div class="catalog-categories-notice"><%= notice %></div>	15	+<% if @categories and @categories.length == 0 %>
		16	+ <div class="catalog-categories-notice">
		17	+ <%= _('There are no sub-categories for %s') % @category.name %>
		18	+ </div>
9	<% end %>	19	<% end %>
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<%= block_title(block.view_title) %>
	2	+
	3	+<%
	4	+ count=0
	5	+ list = block.profile_list.map {\|item\| count+=1 block.send(:profile_image_link, item, :minor)}.join("\n ")
	6	+%>
	7	+
	8	+<div>
	9	+ <% if list.empty? %>
	10	+ <div class='common-profile-list-block-none'><%= _('None') %></div>
	11	+ <% else %>
	12	+ <ul><%= list %></ul>
	13	+ <% end %>
	14	+</div>
	15	+
	16	+<br style='clear:both'/>
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+<%= block_title(block.title) %>
	2	+
	3	+<%
	4	+ is_env = block.owner.class == Environment
	5	+ tags = is_env ? block.owner.tag_counts : block.owner.article_tags
	6	+ if block.limit
	7	+ tags_tmp = tags.sort_by{ \|k,v\| -v }[0..(block.limit-1)]
	8	+ tags = {}
	9	+ tags_tmp.map{ \|k,v\| tags[k] = v }
	10	+ end
	11	+%>
	12	+
	13	+<% unless tags.empty? %>
	14	+ <div class='tag_cloud'>
	15	+ <% if is_env %>
	16	+ <%= tag_cloud(tags, :tag,
	17	+ {:host=>block.owner.default_hostname, :controller=>'search', :action => 'tag'},
	18	+ :max_size => 16, :min_size => 9) %>
	19	+ <% else %>
	20	+ <%= tag_cloud(tags, :id,
	21	+ owner.public_profile_url.merge(:controller => 'profile', :action => 'content_tagged'),
	22	+ :max_size => 16, :min_size => 9) %>
	23	+ <% end %>
	24	+ </div>
	25	+<% end %>