Merge remote-tracking branch 'origin/master'

Weblate
2 parents 95cb82f9 e568ca79
Showing 92 changed files with 910 additions and 794 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/boxes_helper.rb
app/helpers/buttons_helper.rb
app/models/article_block.rb
app/models/blog.rb
app/models/blog_archives_block.rb
app/models/categories_block.rb
app/models/communities_block.rb
app/models/disabled_enterprise_message_block.rb
app/models/enterprises_block.rb
app/models/fans_block.rb
app/models/favorite_enterprises_block.rb
app/models/featured_products_block.rb
app/models/feed_reader_block.rb
app/models/highlights_block.rb
app/models/link_list_block.rb
app/models/location_block.rb
app/models/login_block.rb
app/models/main_block.rb
@@ -48,6 +48,8 @@ module ApplicationHelper
  
   include PluginsHelper
  
+  include ButtonsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -209,52 +211,6 @@ module ApplicationHelper
     result
   end
  
-  def button(type, label, url, html_options = {})
-    html_options ||= {}
-    the_class = 'with-text'
-    if html_options.has_key?(:class)
-      the_class << ' ' << html_options[:class]
-    end
-    button_without_text type, label, url, html_options.merge(:class => the_class)
-  end
-
-  def button_without_text(type, label, url, html_options = {})
-    the_class = "button icon-#{type}"
-    if html_options.has_key?(:class)
-      the_class << ' ' << html_options[:class]
-    end
-    the_title = html_options[:title] || label
-    if html_options[:disabled]
-      content_tag('a', '&nbsp;'+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
-    else
-      link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
-    end
-  end
-
-  def button_to_function(type, label, js_code, html_options = {}, &block)
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_function(label, js_code, html_options, &block)
-  end
-
-  def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_function(content_tag('span', label), js_code, html_options, &block)
-  end
-
-  def button_to_remote(type, label, options, html_options = {})
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_remote(label, options, html_options)
-  end
-
-  def button_to_remote_without_text(type, label, options, html_options = {})
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
-  end
-
   def icon(icon_name, html_options = {})
     the_class = "button #{icon_name}"
     if html_options.has_key?(:class)
@@ -934,13 +890,6 @@ module ApplicationHelper
     content_for(:head) { stylesheet_link_tag(*args) }
   end
  
-  def article_to_html(article, options = {})
-    options.merge!(:page => params[:npage])
-    content = article.to_html(options)
-    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
-    filter_html(content, article)
-  end
-
   # Please, use link_to by default!
   # This method was created to work around to inexplicable
   # chain of problems when display_short_format was called
@@ -1365,16 +1314,6 @@ module ApplicationHelper
     @no_design_blocks = true
   end
  
-  def filter_html(html, source)
-    if @plugins && source && source.has_macro?
-      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
-      #TODO This parse should be done through the macro infra, but since there
-      #     are old things that do not support it we are keeping this hot spot.
-      html = @plugins.pipeline(:parse_content, html, source).first
-    end
-    html && html.html_safe
-  end
-
   def convert_macro(html, source)
     doc = Nokogiri::HTML.fragment html
     #TODO This way is more efficient but do not support macro inside of
@@ -181,4 +181,21 @@ module ArticleHelper
     end
   end
  
+  def filter_html(html, source)
+    if @plugins && source && source.has_macro?
+      html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
+      #TODO This parse should be done through the macro infra, but since there
+      #     are old things that do not support it we are keeping this hot spot.
+      html = @plugins.pipeline(:parse_content, html, source).first
+    end
+    html && html.html_safe
+  end
+
+  def article_to_html(article, options = {})
+    options.merge!(:page => params[:npage])
+    content = article.to_html(options)
+    content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
+    filter_html(content, article)
+  end
+
 end
@@ -87,10 +87,30 @@ module BoxesHelper
     box_decorator == DontMoveBlocks
   end
  
-  def display_block_content(block, person, main_content = nil)
-    content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
+  def render_block_content(block)
+    template_name = block.class.name.underscore.gsub('_block', '')
+    template_filename = "#{template_name}.html.erb"
+    if File.exists? Rails.root.join('app', 'views', 'blocks', template_filename)
+      render :file => "blocks/#{template_name}", :locals => { :block => block }
+    else
+      nil
+    end
+  end
+
+  def render_block_footer(block)
+    template_name = block.class.name.underscore.gsub('_block', '')
+    template_filename = "#{template_name}.html.erb"
+    if File.exists? Rails.root.join('app', 'views', 'blocks', 'footers', template_filename)
+      render :file => "blocks/footers/#{template_name}", :locals => { :block => block }
+    else
+      nil
+    end
+  end
+
+  def display_block_content(block, main_content = nil)
+    content = block.main? ? wrap_main_content(main_content) : render_block_content(block)
     result = extract_block_content(content)
-    footer_content = extract_block_content(block.footer)
+    footer_content = extract_block_content(render_block_footer(block))
     unless footer_content.blank?
       footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
     end
@@ -0,0 +1,47 @@
+module ButtonsHelper
+  def button(type, label, url, html_options = {})
+    html_options ||= {}
+    the_class = 'with-text'
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    button_without_text type, label, url, html_options.merge(:class => the_class)
+  end
+
+  def button_without_text(type, label, url, html_options = {})
+    the_class = "button icon-#{type}"
+    if html_options.has_key?(:class)
+      the_class << ' ' << html_options[:class]
+    end
+    the_title = html_options[:title] || label
+    if html_options[:disabled]
+      content_tag('a', '&nbsp;'+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
+    else
+      link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
+    end
+  end
+
+  def button_to_function(type, label, js_code, html_options = {}, &block)
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_function(label, js_code, html_options, &block)
+  end
+
+  def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " button icon-#{type}"
+    link_to_function(content_tag('span', label), js_code, html_options, &block)
+  end
+
+  def button_to_remote(type, label, options, html_options = {})
+    html_options[:class] = "button with-text" unless html_options[:class]
+    html_options[:class] << " icon-#{type}"
+    link_to_remote(label, options, html_options)
+  end
+
+  def button_to_remote_without_text(type, label, options, html_options = {})
+    html_options[:class] = "" unless html_options[:class]
+    html_options[:class] << " button icon-#{type}"
+    link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
+  end
+end
@@ -18,18 +18,6 @@ class ArticleBlock &lt; Block
     _('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
   end
  
-  def content(args={})
-    block = self
-    proc do
-      block_title(block.title) +
-      (block.article ? article_to_html(FilePresenter.for(block.article),
-          :gallery_view => false,
-          :inside_block => block,               # For Blogs and folders
-          :format => block.visualization_format # For Articles and contents
-        ).html_safe : _('Article not selected yet.'))
-    end
-  end
-
   def article_id
     self.settings[:article_id]
   end
@@ -93,4 +93,20 @@ class Blog &lt; Folder
     posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
   end
  
+  def total_number_of_posts(group_by, year = nil)
+    case group_by
+      when :by_year
+        posts.published.native_translations
+          .except(:order)
+          .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
+          .sort_by {|year, count| -year.to_i}
+      when :by_month
+        posts.published.native_translations
+          .except(:order)
+          .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
+          .group('EXTRACT(MONTH FROM published_at)')
+          .count
+          .sort_by {|month, count| -month.to_i}
+    end
+  end
 end
@@ -21,30 +21,6 @@ class BlogArchivesBlock &lt; Block
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
   end
  
-  def visible_posts(person)
-    #FIXME Performance issues with display_to. Must convert it to a scope.
-    # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
-    blog.posts.published.native_translations #.select {|post| post.display_to?(person)}
-  end
-
-  def content(args={})
-    owner_blog = self.blog
-    return nil unless owner_blog
-    results = ''
-    posts = visible_posts(args[:person])
-    posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
-      results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
-      results << "<ul class='#{year.to_i}-archive'>"
-      posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {|month, count| -month.to_i}.each do |month, count|
-        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
-      end
-      results << "</ul>"
-    end
-    block_title(title) +
-    content_tag('ul', results, :class => 'blog-archives') +
-    content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
-  end
-
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
@@ -30,13 +30,6 @@ class CategoriesBlock &lt; Block
     Category.top_level_for(self.owner).from_types(self.category_types)
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/categories', :locals => { :block => block }
-    end
-  end
-
   def self.expire_on
       { :profile => [], :environment => [:category] }
   end
@@ -27,15 +27,6 @@ class CommunitiesBlock &lt; ProfileListBlock
     owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
   end
  
-  def footer
-    owner = self.owner
-    suggestions = self.suggestions
-    return '' unless owner.kind_of?(Profile) || owner.kind_of?(Environment)
-    proc do
-      render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
-    end
-  end
-
   def profiles
     owner.communities
   end
@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock &lt; Block
     _('Message')
   end
  
-  def content(args={})
-    message = self.owner.environment.message_for_disabled_enterprise || ''
-    lambda do |_|
-       render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
-    end
-  end
-
   def editable?(user=nil)
     false
   end
@@ -12,22 +12,6 @@ class EnterprisesBlock &lt; ProfileListBlock
     _('Enterprises')
   end
  
-  def footer
-    owner = self.owner
-    case owner
-    when Profile
-      proc do
-        link_to s_('enterprises|View all'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
-      end
-    when Environment
-      proc do
-        link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
-      end
-    else
-      ''
-    end
-  end
-
   def profiles
     owner.enterprises
   end
@@ -12,14 +12,6 @@ class FansBlock &lt; ProfileListBlock
     _('This block presents the fans of an enterprise.')
   end
  
-  def footer
-    profile = self.owner
-    proc do
-      link_to _('View all'), :profile => profile.identifier, :controller =>
-      'profile', :action => 'fans'
-    end
-  end
-
   def profiles
     owner.fans
   end
@@ -12,14 +12,6 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
     _('Favorite Enterprises')
   end
  
-  def footer
-    owner = self.owner
-    return '' unless owner.kind_of?(Person)
-    proc do
-      link_to _('enterprises|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all'
-    end
-  end
-
   def profiles
     owner.favorite_enterprises
   end
@@ -32,11 +32,4 @@ class FeaturedProductsBlock &lt; Block
     self.owner.highlighted_products_with_image
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/featured_products', :locals => { :block => block }
-    end
-  end
-
 end
@@ -52,24 +52,6 @@ class FeedReaderBlock &lt; Block
     self.feed_title.nil? ? _('Feed Reader') : self.feed_title
   end
  
-  def formatted_feed_content
-    if error_message.blank?
-      "<ul>\n".html_safe +
-      self.feed_items[0..(limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
-      "</ul>".html_safe
-    else
-      "<p>#{error_message}</p>".html_safe
-    end
-  end
-
-  def footer
-    if self.fetched_at.nil? or self.feed_items.empty?
-      _('Feed content was not loaded yet')
-    else
-      _("Updated: %s") % show_date(self.fetched_at)
-    end
-  end
-
   def add_item(title, link, date, content)
     self.feed_items.unshift( {:title => title, :link => link})
   end
@@ -85,8 +67,4 @@ class FeedReaderBlock &lt; Block
     self.save!
   end
  
-  def content(args={})
-    block_title(title) + formatted_feed_content
-  end
-
 end
@@ -43,13 +43,6 @@ class HighlightsBlock &lt; Block
     end
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/highlights', :locals => { :block => block }
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -59,20 +59,6 @@ class LinkListBlock &lt; Block
     _('Link list')
   end
  
-  def content(args={})
-    block_title(title) +
-    content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join
-    )
-  end
-
-  def link_html(link)
-    klass = 'icon-' + link[:icon] if link[:icon]
-    sanitize_link(
-      link_to(link[:name], expand_address(link[:address]), :target => link[:target], :class => klass, :title => link[:title])
-    )
-  end
-
   def expand_address(address)
     add = if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
@@ -99,8 +85,6 @@ class LinkListBlock &lt; Block
     end
   end
  
-  private
-
   def sanitize_link(text)
     sanitizer = HTML::WhiteListSanitizer.new
     sanitizer.sanitize(text)
@@ -13,12 +13,4 @@ class LocationBlock &lt; Block
     _('Shows where the profile is on the material world.')
   end
  
-  def content(args={})
-    block = self
-    profile = self.owner
-    proc do
-      render :file => 'blocks/location', :locals => {:block => block, :profile => profile}
-    end
-  end
-
 end
@@ -8,12 +8,6 @@ class LoginBlock &lt; Block
     _('This block presents a login/logout block.')
   end
  
-  def content(args={})
-    lambda do |context|
-      render :file => 'blocks/login_block'
-    end
-  end
-
   def cacheable?
     false
   end
@@ -8,10 +8,6 @@ class MainBlock &lt; Block
     _('This block presents the main content of your pages.')
   end
  
-  def content(args={})
-    nil
-  end
-
   def main?
     true
   end
@@ -14,16 +14,6 @@ class MyNetworkBlock &lt; Block
     _('This block displays some info about your networking.')
   end
  
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/my_network', :locals => {
-        :title => block.title,
-        :owner => block.owner
-      }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -13,26 +13,6 @@ class ProductCategoriesBlock &lt; Block
     _('Helps to filter the products catalog.')
   end
  
-  def content(args={})
-    profile = owner
-    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
-             }
-    end
-  end
-
   DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
  
   def display
@@ -19,26 +19,6 @@ class ProductsBlock &lt; Block
     _('This block presents a list of your products.')
   end
  
-  def content(args={})
-    block_title(title) +
-    content_tag(
-      'ul',
-      products.map {|product|
-        content_tag('li',
-          link_to( product.name,
-                   product.url,
-                   :style => 'background-image:url(%s)' % product.default_image('minor')
-                 ),
-          :class => 'product'
-        )
-      }.join
-    )
-  end
-
-  def footer
-    link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
-  end
-
   settings_items :product_ids, type: Array
   def product_ids=(array)
     self.settings[:product_ids] = array
@@ -12,17 +12,6 @@ class ProfileImageBlock &lt; Block
     _('This block presents the profile image')
   end
  
-  def content(args={})
-    block = self
-    s = show_name
-    lambda do |object|
-      render(
-        :file => 'blocks/profile_image',
-        :locals => { :block => block, :show_name => s }
-      )
-    end
-  end
-
   def cacheable?
     false
   end
@@ -16,13 +16,6 @@ class ProfileInfoBlock &lt; Block
     _('Basic information about <i>%{user}</i>: how long <i>%{user}</i> is part of <i>%{env}</i> and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() }
   end
  
-  def content(args={})
-    block = self
-    lambda do |_|
-      render :file => 'blocks/profile_info', :locals => { :block => block }
-    end
-  end
-
   def cacheable?
     false
   end
@@ -40,26 +40,6 @@ result = public_profiles.all(:limit =&gt; get_limit, :order =&gt; &#39;profiles.updated_at
     _('Clicking on the people or groups will take you to their home page.')
   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'))
-    end
-  end
-
   def view_title
     title.gsub('{#}', profile_count.to_s)
   end
@@ -4,11 +4,4 @@ class ProfileSearchBlock &lt; Block
     _('Display a form to search the profile')
   end
  
-  def content(args={})
-    title = self.title
-    lambda do |_|
-      render :file => 'blocks/profile_search', :locals => { :title => title }
-    end
-  end
-
 end
@@ -12,10 +12,6 @@ class RawHTMLBlock &lt; Block
  
   attr_accessible :html
  
-  def content(args={})
-    (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
-  end
-
   def has_macro?
     true
   end
@@ -22,24 +22,6 @@ class RecentDocumentsBlock &lt; Block
  
   settings_items :limit, :type => :integer, :default => 5
  
-  def content(args={})
-    docs = self.docs
-    title = self.title
-    proc do
-      block_title(title) +
-        content_tag('ul', docs.map {|item| content_tag('li', link_to(h(item.title), item.url))}.join("\n"))
-    end
-  end
-
-  def footer
-    return nil unless self.owner.is_a?(Profile)
-
-    profile = self.owner
-    proc do
-      link_to _('All content'), :profile => profile.identifier, :controller => 'profile', :action => 'sitemap'
-    end
-  end
-
   def docs
     self.limit.nil? ? owner.recent_documents(nil, {}, false) : owner.recent_documents(self.get_limit, {}, false)
   end
@@ -22,10 +22,4 @@ class SellersSearchBlock &lt; Block
     _('This block presents a search engine for products.')
   end
  
-  def content(args={})
-    title = self.title
-    lambda do |object|
-      render :file => 'search/_sellers_form', :locals => { :title => title }
-    end
-  end
 end
@@ -33,23 +33,6 @@ class SlideshowBlock &lt; Block
     gallery.images.reject {|item| item.folder?}
   end
  
-  def content(args={})
-    block = self
-    if gallery
-      images = block_images
-      if shuffle
-        images = images.shuffle
-      end
-      proc do
-        render :file => 'blocks/slideshow', :locals => { :block => block, :images => images }
-      end
-    else
-      proc do
-        render :file => 'blocks/slideshow', :locals => { :block => block, :images => nil }
-      end
-    end
-  end
-
   def folder_choices
     owner.image_galleries
   end
@@ -28,42 +28,6 @@ class TagsBlock &lt; Block
        Try to add some tags to some articles and you'l see your tag cloud growing.")
   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 }
-    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
-    if owner.class == Environment
-      proc do
-        link_to s_('tags|View all'),
-          :controller => 'search', :action => 'tags'
-      end
-    else
-      owner_id = owner.identifier
-      proc do
-        link_to s_('tags|View all'),
-          :profile => owner_id, :controller => 'profile', :action => 'tags'
-      end
-    end
-  end
-
   def timeout
     15.minutes
   end
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+<% if block.article %>
+  <%=
+    h(article_to_html(FilePresenter.for(block.article),
+        :gallery_view => false,
+        :inside_block => block,               # For Blogs and folders
+        :format => block.visualization_format # For Articles and contents
+    ))
+  %>
+<% else %>
+  <%= _('Article not selected yet.') %>
+<% end %>
@@ -0,0 +1,16 @@
+<% 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>
+
+  <%= content_tag('div', link_to(_('Subscribe RSS Feed'), block.blog.feed.url), :class => 'subscribe-feed') %>
+<% end %>
@@ -1,17 +0,0 @@
-<% if owner.kind_of?(Profile) %>
-  <%= link_to s_('communities|View all'), {:profile => owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
-<% elsif owner.kind_of?(Environment) %>
-  <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
-<% end %>
-
-<% if user && user == profile && suggestions && !suggestions.empty? %>
-  <div class='suggestions-block common-profile-list-block'>
-    <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
-    <div class='profiles-suggestions'>
-      <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
-    </div>
-    <div class='more-suggestions'>
-      <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
-    </div>
-  </div>
-<% end %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
+<% message = block.owner.environment.message_for_disabled_enterprise || '' %>
+
 <div id='enterprise-disabled'>
   <%= message %>
   <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1 @@
+profile_list.html.erb
 \ No newline at end of file
@@ -0,0 +1,11 @@
+<%= block_title(block.title) %>
+
+<%=
+    if block.error_message.blank?
+      "<ul>\n".html_safe +
+      block.feed_items[0..(block.limit-1)].map{ |item| "<li><a href='#{item[:link]}'>#{item[:title]}</a></li>" }.join("\n").html_safe +
+      "</ul>".html_safe
+    else
+      "<p>#{block.error_message}</p>".html_safe
+    end
+%>
@@ -0,0 +1,19 @@
+<% if block.owner.kind_of?(Profile) || block.owner.kind_of?(Environment) %>
+  <% if block.owner.kind_of?(Profile) %>
+    <%= link_to s_('communities|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'communities'}, :class => 'view-all' %>
+  <% elsif block.owner.kind_of?(Environment) %>
+    <%= link_to s_('communities|View all'), {:controller => 'search', :action => 'communities'}, :class => 'view-all' %>
+  <% end %>
+
+  <% if user && user == profile && block.suggestions && !block.suggestions.empty? %>
+    <div class='suggestions-block common-profile-list-block'>
+      <h4 class='block-subtitle'><%= _('Some suggestions for you') %></h4>
+      <div class='profiles-suggestions'>
+        <%= render :partial => 'shared/profile_suggestions_list', :locals => { :suggestions => block.suggestions, :collection => :communities_suggestions, :per_page => 3 } %>
+      </div>
+      <div class='more-suggestions'>
+        <%= link_to _('See all suggestions'), profile.communities_suggestions_url %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to s_('enterprises|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'enterprises' %>
+<% elsif block.owner.is_a?(Environment) %>
+  <%= link_to s_('enterprises|View all'), :controller => 'search', :action => 'assets', :asset => 'enterprises' %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to _('View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'fans' %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Person) %>
+  <%= link_to _('enterprises|View all'), {:profile => block.owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'}, :class => 'view-all' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.fetched_at.nil? or block.feed_items.empty? %>
+  <%= _('Feed content was not loaded yet') %>
+<% else %>
+  <%= _("Updated: %s") % show_date(block.fetched_at) %>
+<% end %>
@@ -0,0 +1 @@
+<%= link_to(_('View all products'), block.owner.public_profile_url.merge(:controller => 'catalog', :action => 'index')) %>
@@ -0,0 +1,3 @@
+<% if block.owner.is_a?(Profile) %>
+  <%= link_to _('All content'), :profile => block.owner.identifier, :controller => 'profile', :action => 'sitemap' %>
+<% end %>
@@ -0,0 +1,5 @@
+<% if block.owner.is_a?(Environment) %>
+  <%= link_to s_('tags|View all'), :controller => 'search', :action => 'tags' %>
+<% else %>
+  <%= link_to s_('tags|View all'), :profile => block.owner.identifier, :controller => 'profile', :action => 'tags' %>
+<% end %>
@@ -0,0 +1,12 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.links.select{|i| !i[:name].blank? and !i[:address].blank?}.each do |link| %>
+    <li>
+      <%= block.sanitize_link(link_to(link[:name], block.expand_address(link[:address]),
+                :target => link[:target],
+                :class => (link[:icon] ? "icon-#{link[:icon]}" : ''),
+                :title => link[:title])) %>
+    </li>
+  <% end %>
+</ul>
-<% if profile.lat %>
+<% if block.owner.lat %>
   <%= block_title block.title %>
   <div class='the-localization-map'>
-    <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+    <img src="https://maps.google.com/maps/api/staticmap?center=<%=block.owner.lat%>,<%=block.owner.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=block.owner.lat%>,<%=block.owner.lng%>&sensor=false"/>
   </div>
 <% else %>
   <i><%= _('This profile has no geographical position registered.') %></i>
@@ -0,0 +1,16 @@
+<% if user.present? %>
+  <div class="logged-user-info">
+    <h2><%= _('Logged in as %s') % user.identifier %></h2>
+    <ul>
+      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
+      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
+    </ul>
+    <div class="user-actions">
+      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
+    </div>
+  </div>
+<% else %>
+  <div class='not-logged-user'>
+    <%= render :file => 'account/login_block' %>
+  </div>
+<% end%>
@@ -1,16 +0,0 @@
-<% if user.present? %>
-  <div class="logged-user-info">
-    <h2><%= _('Logged in as %s') % user.identifier %></h2>
-    <ul>
-      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
-      <li><%= link_to _('Homepage'), user.public_profile_url %></li>
-    </ul>
-    <div class="user-actions">
-      <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>
-    </div>
-  </div>
-<% else %>
-  <div class='not-logged-user'>
-    <%= render :file => 'account/login_block' %>
-  </div>
-<% end%>
-<%= block_title(title) %>
+<%= block_title(block.title) %>
  
 <ul>
-  <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
-  <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
-  <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
+  <li><%= link_to(_('Homepage'), block.owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('View profile'), block.owner.public_profile_url) %></li>
+  <% if !user.nil? and block.owner.organization? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
   <% end %>
 </ul>
  
 <div class="my-network-actions">
-  <%= render_profile_actions owner.class %>
+  <%= render_profile_actions block.owner.class %>
 </div>
-<%= 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,9 @@
+<%= block_title(block.title) %>
+
+<ul>
+  <% block.products.each do |product| %>
+    <li class='product'>
+      <%= link_to(product.name, product.url, :style => 'background-image:url(%s)' % product.default_image('minor')) %>
+    </li>
+  <% end %>
+</ul>
@@ -12,7 +12,7 @@
   </div>
 </div>
...	...	@@ -48,6 +48,8 @@ module ApplicationHelper
48	48
49	49	include PluginsHelper
50	50
	51	+ include ButtonsHelper
	52	+
51	53	def locale
52	54	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
53	55	end
...	...	@@ -209,52 +211,6 @@ module ApplicationHelper
209	211	result
210	212	end
211	213
212		- def button(type, label, url, html_options = {})
213		- html_options \|\|= {}
214		- the_class = 'with-text'
215		- if html_options.has_key?(:class)
216		- the_class << ' ' << html_options[:class]
217		- end
218		- button_without_text type, label, url, html_options.merge(:class => the_class)
219		- end
220		-
221		- def button_without_text(type, label, url, html_options = {})
222		- the_class = "button icon-#{type}"
223		- if html_options.has_key?(:class)
224		- the_class << ' ' << html_options[:class]
225		- end
226		- the_title = html_options[:title] \|\| label
227		- if html_options[:disabled]
228		- content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
229		- else
230		- link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
231		- end
232		- end
233		-
234		- def button_to_function(type, label, js_code, html_options = {}, &block)
235		- html_options[:class] = "button with-text" unless html_options[:class]
236		- html_options[:class] << " icon-#{type}"
237		- link_to_function(label, js_code, html_options, &block)
238		- end
239		-
240		- def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
241		- html_options[:class] = "" unless html_options[:class]
242		- html_options[:class] << " button icon-#{type}"
243		- link_to_function(content_tag('span', label), js_code, html_options, &block)
244		- end
245		-
246		- def button_to_remote(type, label, options, html_options = {})
247		- html_options[:class] = "button with-text" unless html_options[:class]
248		- html_options[:class] << " icon-#{type}"
249		- link_to_remote(label, options, html_options)
250		- end
251		-
252		- def button_to_remote_without_text(type, label, options, html_options = {})
253		- html_options[:class] = "" unless html_options[:class]
254		- html_options[:class] << " button icon-#{type}"
255		- link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
256		- end
257		-
258	214	def icon(icon_name, html_options = {})
259	215	the_class = "button #{icon_name}"
260	216	if html_options.has_key?(:class)
...	...	@@ -934,13 +890,6 @@ module ApplicationHelper
934	890	content_for(:head) { stylesheet_link_tag(*args) }
935	891	end
936	892
937		- def article_to_html(article, options = {})
938		- options.merge!(:page => params[:npage])
939		- content = article.to_html(options)
940		- content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
941		- filter_html(content, article)
942		- end
943		-
944	893	# Please, use link_to by default!
945	894	# This method was created to work around to inexplicable
946	895	# chain of problems when display_short_format was called
...	...	@@ -1365,16 +1314,6 @@ module ApplicationHelper
1365	1314	@no_design_blocks = true
1366	1315	end
1367	1316
1368		- def filter_html(html, source)
1369		- if @plugins && source && source.has_macro?
1370		- html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
1371		- #TODO This parse should be done through the macro infra, but since there
1372		- # are old things that do not support it we are keeping this hot spot.
1373		- html = @plugins.pipeline(:parse_content, html, source).first
1374		- end
1375		- html && html.html_safe
1376		- end
1377		-
1378	1317	def convert_macro(html, source)
1379	1318	doc = Nokogiri::HTML.fragment html
1380	1319	#TODO This way is more efficient but do not support macro inside of
...	...
...	...	@@ -181,4 +181,21 @@ module ArticleHelper
181	181	end
182	182	end
183	183
	184	+ def filter_html(html, source)
	185	+ if @plugins && source && source.has_macro?
	186	+ html = convert_macro(html, source) unless @plugins.enabled_macros.blank?
	187	+ #TODO This parse should be done through the macro infra, but since there
	188	+ # are old things that do not support it we are keeping this hot spot.
	189	+ html = @plugins.pipeline(:parse_content, html, source).first
	190	+ end
	191	+ html && html.html_safe
	192	+ end
	193	+
	194	+ def article_to_html(article, options = {})
	195	+ options.merge!(:page => params[:npage])
	196	+ content = article.to_html(options)
	197	+ content = content.kind_of?(Proc) ? self.instance_exec(&content).html_safe : content.html_safe
	198	+ filter_html(content, article)
	199	+ end
	200	+
184	201	end
...	...
...	...	@@ -87,10 +87,30 @@ module BoxesHelper
87	87	box_decorator == DontMoveBlocks
88	88	end
89	89
90		- def display_block_content(block, person, main_content = nil)
91		- content = block.main? ? wrap_main_content(main_content) : block.content({:person => person})
	90	+ def render_block_content(block)
	91	+ template_name = block.class.name.underscore.gsub('_block', '')
	92	+ template_filename = "#{template_name}.html.erb"
	93	+ if File.exists? Rails.root.join('app', 'views', 'blocks', template_filename)
	94	+ render :file => "blocks/#{template_name}", :locals => { :block => block }
	95	+ else
	96	+ nil
	97	+ end
	98	+ end
	99	+
	100	+ def render_block_footer(block)
	101	+ template_name = block.class.name.underscore.gsub('_block', '')
	102	+ template_filename = "#{template_name}.html.erb"
	103	+ if File.exists? Rails.root.join('app', 'views', 'blocks', 'footers', template_filename)
	104	+ render :file => "blocks/footers/#{template_name}", :locals => { :block => block }
	105	+ else
	106	+ nil
	107	+ end
	108	+ end
	109	+
	110	+ def display_block_content(block, main_content = nil)
	111	+ content = block.main? ? wrap_main_content(main_content) : render_block_content(block)
92	112	result = extract_block_content(content)
93		- footer_content = extract_block_content(block.footer)
	113	+ footer_content = extract_block_content(render_block_footer(block))
94	114	unless footer_content.blank?
95	115	footer_content = content_tag('div', footer_content, :class => 'block-footer-content' )
96	116	end
...	...
...	...	@@ -0,0 +1,47 @@
	1	+module ButtonsHelper
	2	+ def button(type, label, url, html_options = {})
	3	+ html_options \|\|= {}
	4	+ the_class = 'with-text'
	5	+ if html_options.has_key?(:class)
	6	+ the_class << ' ' << html_options[:class]
	7	+ end
	8	+ button_without_text type, label, url, html_options.merge(:class => the_class)
	9	+ end
	10	+
	11	+ def button_without_text(type, label, url, html_options = {})
	12	+ the_class = "button icon-#{type}"
	13	+ if html_options.has_key?(:class)
	14	+ the_class << ' ' << html_options[:class]
	15	+ end
	16	+ the_title = html_options[:title] \|\| label
	17	+ if html_options[:disabled]
	18	+ content_tag('a', ' '+content_tag('span', label), html_options.merge(:class => the_class, :title => the_title))
	19	+ else
	20	+ link_to(' '+content_tag('span', label), url, html_options.merge(:class => the_class, :title => the_title))
	21	+ end
	22	+ end
	23	+
	24	+ def button_to_function(type, label, js_code, html_options = {}, &block)
	25	+ html_options[:class] = "button with-text" unless html_options[:class]
	26	+ html_options[:class] << " icon-#{type}"
	27	+ link_to_function(label, js_code, html_options, &block)
	28	+ end
	29	+
	30	+ def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
	31	+ html_options[:class] = "" unless html_options[:class]
	32	+ html_options[:class] << " button icon-#{type}"
	33	+ link_to_function(content_tag('span', label), js_code, html_options, &block)
	34	+ end
	35	+
	36	+ def button_to_remote(type, label, options, html_options = {})
	37	+ html_options[:class] = "button with-text" unless html_options[:class]
	38	+ html_options[:class] << " icon-#{type}"
	39	+ link_to_remote(label, options, html_options)
	40	+ end
	41	+
	42	+ def button_to_remote_without_text(type, label, options, html_options = {})
	43	+ html_options[:class] = "" unless html_options[:class]
	44	+ html_options[:class] << " button icon-#{type}"
	45	+ link_to_remote(content_tag('span', label), options, html_options.merge(:title => label))
	46	+ end
	47	+end
...	...
...	...	@@ -18,18 +18,6 @@ class ArticleBlock < Block
18	18	_('This block displays one of your articles. You can edit the block to select which one of your articles is going to be displayed in the block.')
19	19	end
20	20
21		- def content(args={})
22		- block = self
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.'))
30		- end
31		- end
32		-
33	21	def article_id
34	22	self.settings[:article_id]
35	23	end
...	...
...	...	@@ -93,4 +93,20 @@ class Blog < Folder
93	93	posts.where("type != 'RssFeed'").order(:updated_at).limit(limit)
94	94	end
95	95
	96	+ def total_number_of_posts(group_by, year = nil)
	97	+ case group_by
	98	+ when :by_year
	99	+ posts.published.native_translations
	100	+ .except(:order)
	101	+ .count(:all, :group => 'EXTRACT(YEAR FROM published_at)')
	102	+ .sort_by {\|year, count\| -year.to_i}
	103	+ when :by_month
	104	+ posts.published.native_translations
	105	+ .except(:order)
	106	+ .where('EXTRACT(YEAR FROM published_at)=?', year.to_i)
	107	+ .group('EXTRACT(MONTH FROM published_at)')
	108	+ .count
	109	+ .sort_by {\|month, count\| -month.to_i}
	110	+ end
	111	+ end
96	112	end
...	...
...	...	@@ -21,30 +21,6 @@ class BlogArchivesBlock < Block
21	21	blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
22	22	end
23	23
24		- def visible_posts(person)
25		- #FIXME Performance issues with display_to. Must convert it to a scope.
26		- # Checkout this page for further information: http://noosfero.org/Development/ActionItem2705
27		- blog.posts.published.native_translations #.select {\|post\| post.display_to?(person)}
28		- end
29		-
30		- def content(args={})
31		- owner_blog = self.blog
32		- return nil unless owner_blog
33		- results = ''
34		- posts = visible_posts(args[:person])
35		- posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {\|year, count\| -year.to_i}.each do \|year, count\|
36		- results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
37		- results << "<ul class='#{year.to_i}-archive'>"
38		- posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {\|month, count\| -month.to_i}.each do \|month, count\|
39		- results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
40		- end
41		- results << "</ul>"
42		- end
43		- block_title(title) +
44		- content_tag('ul', results, :class => 'blog-archives') +
45		- content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
46		- end
47		-
48	24	def self.expire_on
49	25	{ :profile => [:article], :environment => [:article] }
50	26	end
...	...
...	...	@@ -30,13 +30,6 @@ class CategoriesBlock < Block
30	30	Category.top_level_for(self.owner).from_types(self.category_types)
31	31	end
32	32
33		- def content(args={})
34		- block = self
35		- proc do
36		- render :file => 'blocks/categories', :locals => { :block => block }
37		- end
38		- end
39		-
40	33	def self.expire_on
41	34	{ :profile => [], :environment => [:category] }
42	35	end
...	...
...	...	@@ -27,15 +27,6 @@ class CommunitiesBlock < ProfileListBlock
27	27	owner.profile_suggestions.of_community.enabled.limit(3).includes(:suggestion)
28	28	end
29	29
30		- def footer
31		- owner = self.owner
32		- suggestions = self.suggestions
33		- return '' unless owner.kind_of?(Profile) \|\| owner.kind_of?(Environment)
34		- proc do
35		- render :file => 'blocks/communities', :locals => { :owner => owner, :suggestions => suggestions }
36		- end
37		- end
38		-
39	30	def profiles
40	31	owner.communities
41	32	end
...	...
...	...	@@ -12,13 +12,6 @@ class DisabledEnterpriseMessageBlock < Block
12	12	_('Message')
13	13	end
14	14
15		- def content(args={})
16		- message = self.owner.environment.message_for_disabled_enterprise \|\| ''
17		- lambda do \|_\|
18		- render :file => 'blocks/disabled_enterprise_message', :locals => {:message => message}
19		- end
20		- end
21		-
22	15	def editable?(user=nil)
23	16	false
24	17	end
...	...