fix conflit with next

Leandro Santos
2 parents 2f177970 6edafc75
Showing 54 changed files with 1004 additions and 127 deletions Show diff stats
Gemfile
HACKING.themes.md
app/assets/designs/icons
app/assets/designs/themes
app/assets/images
app/assets/javascripts
app/assets/plugins
app/assets/stylesheets
app/controllers/application_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/layout_helper.rb
app/helpers/macros_helper.rb
app/helpers/plugins_helper.rb
app/helpers/search_helper.rb
app/models/comment.rb
app/models/organization.rb
app/models/profile.rb
app/views/content_viewer/_article_toolbar.html.erb
app/views/layouts/_javascript.html.erb
@@ -27,6 +27,11 @@ gem &#39;grape-swagger&#39;
 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
 # with their GEM names (not the Debian package names)
+group :assets do
+  gem 'uglifier', '>= 1.0.3'
+  gem 'sass-rails'
+end
+
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
@@ -0,0 +1,60 @@
+Noosfero Instructions for Theme Developers
+==========================================
+
+To build Noosfero themes you must to know HTML and CSS. You may also get some advantages with Ruby and Noosfero hacking knowledge because all customizable pieces of the theme's HTML structure are [erb](http://en.wikipedia.org/wiki/ERuby) files.
+
+
+Organization Basics
+-------------------
+
+A theme is a directory and must inside `noosfero/public/designs/themes`, and you will find tis themes in a fresh installation:
+`noosfero`, `aluminium`, `base`, `butter`, `chameleon`, `chocolate`, `orange`, `plum`, `scarletred` and `skyblue`. The `default` is only a link to `noosfero` and you can change this link to any other.
+
+`noosfero` is the default theme with a big header. All other are colored themes with a thin header. That colored ones can be used as additional themes for any environment, as they will search for `/images/thin-logo.png` inside the current environment.theme, to use as top left logo.
+
+Inside a theme we can found:
+* `theme.yml` — Theme description with some nice configuration options.
+* `preview.png` — A 100x100 screenshot of this theme to the theme selection UI.
+* `style.css` — The main file. The magic happens here.
+* `errors.css` — Change the error page look. (only if this theme is linked by `defaut`)
+* `favicon.ico` — The identifier icon for your web site.
+* `images` — Another name can be found by your CSS, but will not allow to reuse the logo.
+  * `thin-logo.png` — The logo to be reused by the colored themes.
+  * *many images...*
+* `site_title.html.erb` — A nice place to put your logo, any code here will be placed inside `h1#site-title`.
+* `header.html.erb` — That goes inside `div#theme-header`.
+* `navigation.html.erb` — That goes inside `div#navigation ul`, so use `<li>`s.
+* `footer.html.erb` — That goes inside `div#theme-footer`.
+
+You can add more files like javascript and modularized CSS, but you must to refer that by the described files above.
+
+To refer one of this files trough the web the path is `<domain>/designs/themes/<thistheme>/<somefile>`.
+
+
+theme.yml
+---------
+
+A simple definition file. See this example:
+```yml
+name: "My Cool Theme"
+layout: "application-ng"
+jquery_theme: "smoothness"
+icon_theme: [default, pidgin]
+gravatar: "retro"
+```
+
+About non obvious:
+* `layout` is about the theme structure to use. The `application-ng` is enough for 99.97358% use cases. If you want to use another structure, you must add a new `*.html.erb` file at `app/views/layouts/`.
+* `icon_theme` point to something inside `public/designs/icons/`.
+* `gravatar` set the default gravatar *(avatar picture)* for people without picture.
+
+
+Theme Intervention from Environment Theme
+-----------------------------------------
+
+Sometimes an environment (as instace http://cirandas.net) wants to allow profiles to set its own theme, but with some environment identification or functions, like a top bar with the social network logo and a top menu (as instace http://cirandas.net/rango-vegan).
+To make the magic happens you can add some files to the environment theme.
+All are optional:
+* `global.css` — this must be used to style all extra html added by your intervention partials. As it is a free form css file you can style anything, but this is a conflict risk.
+* `global_header.html.erb` — Will add content to `#global-header`.
+* `global_footer.html.erb` — Will add content to `#global-footer`.
@@ -0,0 +1 @@
+../../../public/designs/icons
 \ No newline at end of file
@@ -0,0 +1 @@
+../../../public/designs/themes
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/images
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/javascripts
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/plugins
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/stylesheets
 \ No newline at end of file
@@ -179,6 +179,7 @@ class ApplicationController &lt; ActionController::Base
   include SearchTermHelper
   def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
+    scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
     search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
     register_search_term(query, scope.count, search[:results].count, context, asset)
     search
@@ -9,6 +9,7 @@ class SearchController &lt; PublicController
   before_filter :load_search_assets, :except => :suggestions
   before_filter :load_query, :except => :suggestions
   before_filter :load_order, :except => :suggestions
+  before_filter :load_templates, :except => :suggestions
   # Backwards compatibility with old URLs
   def redirect_asset_param
@@ -210,6 +211,11 @@ class SearchController &lt; PublicController
     end
   end
+  def load_templates
+    @templates = {}
+    @templates[@asset] = environment.send(@asset.to_s).templates if [:people, :enterprises, :communities].include?(@asset)
+  end
+
   def limit
     if map_search?(@searches)
       MAP_SEARCH_LIMIT
@@ -230,7 +236,7 @@ class SearchController &lt; PublicController
   end
   def full_text_search
-    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order})
+    @searches[@asset] = find_by_contents(@asset, environment, @scope, @query, paginate_options, {:category => @category, :filter => @order, :template_id => params[:template_id]})
   end
   private
@@ -212,6 +212,7 @@ module ApplicationHelper
   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]
@@ -398,19 +399,27 @@ module ApplicationHelper
       end
   end
-  def theme_view_file(template)
+  def theme_view_file(template, theme=nil)
     # Since we cannot control what people are doing in external themes, we
     # will keep looking for the deprecated .rhtml extension here.
-    file = Rails.root.join('public', theme_path[1..-1], template + '.html.erb')
+    addr = theme ? "designs/themes/#{theme}" : theme_path[1..-1]
+    file = Rails.root.join('public', addr, template + '.html.erb')
     return file if File.exists?(file)
     nil
   end
   def theme_include(template, options = {})
-    file = theme_view_file(template)
-    options.merge!({:file => file, :use_full_path => false})
+    from_theme_include(nil, template, options)
+  end
+
+  def env_theme_include(template, options = {})
+    from_theme_include(environment.theme, template, options)
+  end
+
+  def from_theme_include(theme, template, options = {})
+    file = theme_view_file(template, theme)
     if file
-      render options
+      render options.merge(file: file, use_full_path: false)
     else
       nil
     end
@@ -446,6 +455,14 @@ module ApplicationHelper
     @theme_extra_navigation ||= theme_include 'navigation'
   end
+  def global_header
+    @global_header ||= env_theme_include 'global_header'
+  end
+
+  def global_footer
+    @global_footer ||= env_theme_include 'global_footer'
+  end
+
   def is_testing_theme
     !controller.session[:theme].nil?
   end
@@ -902,18 +919,6 @@ module ApplicationHelper
     end
   end
-  def icon_theme_stylesheet_path
-    icon_themes = []
-    theme_icon_themes = theme_option(:icon_theme) || []
-    for icon_theme in theme_icon_themes do
-      theme_path = "/designs/icons/#{icon_theme}/style.css"
-      if File.exists?(Rails.root.join('public', theme_path[1..-1]))
-        icon_themes << theme_path
-      end
-    end
-    icon_themes
-  end
-
   def page_title
     CGI.escapeHTML(
       (@page ? @page.title + ' - ' : '') +
@@ -28,12 +28,12 @@ module LayoutHelper
   end
   def noosfero_javascript
-    plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
+    plugins_javascripts = @plugins.flat_map{ |plugin| plugin.js_files.map{ |js| plugin.class.public_path(js, true) } }.flatten
     output = ''
     output += render 'layouts/javascript'
     unless plugins_javascripts.empty?
-      output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
+      output += javascript_include_tag *plugins_javascripts
     end
     output += theme_javascript_ng.to_s
     output += javascript_tag 'render_all_jquery_ui_widgets()'
@@ -42,35 +42,27 @@ module LayoutHelper
   end
   def noosfero_stylesheets
-    standard_stylesheets = [
-      'application',
-      'search',
-      'colorbox',
-      'selectordie',
-      'inputosaurus',
-      'chat',
-      pngfix_stylesheet_path,
-    ] + tokeninput_stylesheets
-    plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
-
-    output = ''
-    output += stylesheet_link_tag standard_stylesheets, :cache => 'cache/application'
-    output += stylesheet_link_tag template_stylesheet_path
-    output += stylesheet_link_tag icon_theme_stylesheet_path
-    output += stylesheet_link_tag jquery_ui_theme_stylesheet_path
+    plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
+      plugin.class.public_path('style.css', true)
+    }
+    global_css_pub = "/designs/themes/#{environment.theme}/global.css"
+    global_css_at_fs = Rails.root.join 'public' + global_css_pub
+
+    output = []
+    output << stylesheet_link_tag('application')
+    output << stylesheet_link_tag(template_stylesheet_path)
+    output << stylesheet_link_tag(*icon_theme_stylesheet_path)
+    output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path)
     unless plugins_stylesheets.empty?
-      output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+      # FIXME: caching does not work with asset pipeline
+      #cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+      output << stylesheet_link_tag(*plugins_stylesheets)
     end
-    output += stylesheet_link_tag theme_stylesheet_path
-    output
-  end
-
-  def pngfix_stylesheet_path
-    'iepngfix/iepngfix.css'
-  end
-
-  def tokeninput_stylesheets
-    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
+    if File.exists? global_css_at_fs
+      output << stylesheet_link_tag(global_css_pub)
+    end
+    output << stylesheet_link_tag(theme_stylesheet_path)
+    output.join "\n"
   end
   def noosfero_layout_features
@@ -90,7 +82,7 @@ module LayoutHelper
     icon_themes = []
     theme_icon_themes = theme_option(:icon_theme) || []
     for icon_theme in theme_icon_themes do
-      theme_path = "/designs/icons/#{icon_theme}/style.css"
+      theme_path = "designs/icons/#{icon_theme}/style.css"
       if File.exists?(Rails.root.join('public', theme_path))
         icon_themes << theme_path
       end
@@ -103,7 +95,7 @@ module LayoutHelper
   end
   def theme_stylesheet_path
-    theme_path + '/style.css'
+    "/assets#{theme_path}/style.css"
   end
   def layout_template
@@ -42,7 +42,9 @@ module MacrosHelper
         [macro.configuration[:js_files]].flatten.map { |js| plugins_javascripts << macro.plugin.public_path(js) }
       end
     end
-    javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty?
+    unless plugins_javascripts.empty?
+      javascript_include_tag *plugins_javascripts
+    end
   end
   def macro_css_files
@@ -6,4 +6,11 @@ module PluginsHelper
     end
   end
+  def plugins_toolbar_actions_for_article(article)
+    toolbar_actions = Array.wrap(@plugins.dispatch(:article_extra_toolbar_buttons, article))
+    toolbar_actions.each do |action|
+      [:title, :url, :icon].each { |param| raise "No #{param} was passed as parameter for #{action}" unless action.has_key?(param) }
+    end
+  end
+
 end
@@ -148,4 +148,11 @@ module SearchHelper
     link_to(@enabled_searches[asset], "/search/#{asset}")
   end
+  def assets_submenu(asset)
+    return '' if @templates[asset].blank? || @templates[asset].length == 1
+    options = @templates[asset].map {|template| [template.name, template.id]}
+    options = options_for_select([[_('Choose a template'), nil]] + options, selected: (params[:template_id]))
+    select_tag('template_id', options, :id => 'submenu')
+  end
+
 end
@@ -44,6 +44,8 @@ class Comment &lt; ActiveRecord::Base
     end
   end
+  acts_as_having_settings
+
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
   def comment_root
@@ -188,4 +188,9 @@ class Organization &lt; Profile
   def allow_invitation_from?(person)
     (followed_by?(person) && self.allow_members_to_invite) || person.has_permission?('invite-members', self)
   end
+
+  def is_admin?(user)
+    self.admins.where(:id => user.id).exists?
+  end
+
 end
@@ -85,7 +85,15 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :templates, {:conditions => {:is_template => true}}
+  scope :templates, lambda { |template_id = nil|
+    conditions = {:conditions => {:is_template => true}}
+    conditions[:conditions].merge!({:id => template_id}) unless template_id.nil?
+    conditions
+  }
+
+  scope :with_templates, lambda { |templates|
+    {:conditions => {:template_id => templates}}
+  }
   scope :no_templates, {:conditions => {:is_template => false}}
   #FIXME make this test
@@ -46,6 +46,10 @@
       <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
     <% end %>
+    <% plugins_toolbar_actions_for_article(@page).each do |plugin_button| %>
+      <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url], plugin_button[:html_options] %>
+    <% end %>
+
     <%= report_abuse(profile, :link, @page) %>
   </div>
-<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1', 'jrails', 'rails.js',
-  'jquery.cycle.all.min.js', 'jquery.colorbox-min.js',
-  'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-  'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',
-  'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'inputosaurus.js', 'select-or-die/_src/selectordie',
-  # noosfero libraries
-  'application.js', 'modal.js',
-  'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
-  :cache => 'cache/application' %>
+<%= javascript_include_tag 'application.js' %>
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -25,7 +25,7 @@
       end.join("\n")
     %>
-    <script type='text/javascript'>
+    <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
     </script>
@@ -38,9 +38,12 @@
         if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
       end.join("\n")
     %>
+    <div id="global-header">
+      <%= global_header %>
+    </div>
     <div id="wrap-1">
-      <div id='theme-header'>
+      <div id="theme-header">
         <%= theme_header %>
       </div>
       <div id="wrap-2">
@@ -60,9 +63,14 @@
       </div><!-- end id="wrap-2" -->
     </div><!-- end id="wrap-1" -->
     <%= render_environment_features(:logged_in) if logged_in? %>
-    <div id="theme-footer">
-      <%= theme_footer %>
-    </div><!-- end id="theme-footer" -->
+    <div id="footer">
+      <div id="theme-footer">
+        <%= theme_footer %>
+      </div><!-- end id="theme-footer" -->
+      <div id="global-footer">
+        <%= global_footer %>
+      </div><!-- end id="global-footer" -->
+    </div><!-- end id="footer" -->
     <%= noosfero_layout_features %>
     <%= addthis_javascript %>
     <%=
@@ -21,7 +21,7 @@
       import_controller_stylesheets(:themed_source => true)
     %>
     <%= stylesheet_link_tag template_stylesheet_path %>
-    <%= stylesheet_link_tag icon_theme_stylesheet_path %>
+    <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
     <%# Add custom tags/styles/etc via content_for %>
@@ -52,6 +52,9 @@
       registerDocumentSize();
       // -->
     </script>
+    <div id="global-header">
+      <%= global_header %>
+    </div>
     <div id="accessibility_menu">
       <a href="#content" id="link_go_content"><span><%= _('Go to content') %></span></a>
@@ -112,8 +115,13 @@
     </div><!-- id="wrap" -->
     <div id="footer">
-      <%= theme_footer %>
-    </div><!-- id="footer" -->
+      <div id="theme-footer">
+        <%= theme_footer %>
+      </div><!-- end id="theme-footer" -->
+      <div id="global-footer">
+        <%= global_footer %>
+      </div><!-- end id="global-footer" -->
+    </div><!-- end id="footer" -->
     <%# if you need to add HTML stuff to the layout, include it in
     app/views/shared/noosfero_layout_features.html.erb! %>
@@ -11,7 +11,7 @@
     %></title>
     <%= stylesheet_import "slideshow" %>
-    <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose', :cache => 'cache/slideshow' %>
+    <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose' %>
     <script type="text/javascript">
       $(document).ready(function (){
         $("#slideshow").PikaChoose({
 <div id='search-content'>
+  <div class='total'>
+    <%= _('Total of %s results ') % @searches[@asset][:results].total_entries.inspect %>
+  </div>
+
 <%= display_results(@searches, @asset) %>
 <% if params[:display] != 'map' %>
   <%= pagination_links @searches[@asset][:results] %>
@@ -5,8 +5,12 @@
     <div id='search-header'>
       <%= assets_menu(@asset) %>
       <%= filters(@asset) %>
+      <div class="clear"></div>
     </div>
+    <div id='search-subheader'>
+      <%= assets_submenu(@asset) %>
+    </div>
     <div class="search-field">
       <span class="formfield">
         <%= search_input_with_suggestions('query', @asset, @query, {:id => 'search-input', :size => 50, :placeholder => hint}) %>
@@ -88,11 +88,25 @@ module Noosfero
     config.active_record.whitelist_attributes = true
     # Enable the asset pipeline
-    config.assets.enabled = false
+    config.assets.enabled = true
+
+    # don't let rails prepend app/assets to config.assets.paths
+    # as we are doing it
+    config.paths['app/assets'] = ''
+
+    config.assets.paths =
+      Dir.glob("app/assets/plugins/*/{,stylesheets,javascripts}") +
+      Dir.glob("app/assets/{,stylesheets,javascripts}") +
+      # no precedence over core
+      Dir.glob("app/assets/designs/{icons,themes,user_themes}/*")
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+    config.sass.preferred_syntax = :scss
+    config.sass.cache = true
+    config.sass.line_comments = false
+
     def noosfero_session_secret
       require 'fileutils'
       target_dir = File.join(File.dirname(__FILE__), '../tmp')
@@ -14,12 +14,15 @@ Noosfero::Application.configure do
   # Compress JavaScripts and CSS
   config.assets.compress = true
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
   # Generate digests for assets URLs
   config.assets.digest = true
+  # pre-compile every asset
+  config.assets.precompile = Dir.glob("app/assets/**/*").map do |file|
+    next unless File.exists?(file) and File.file?(file)
+    File.basename file
+  end.compact
+
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
@@ -52,7 +52,6 @@ Noosfero::Application.routes.draw do
   # categories index
   match 'cat/*category_path' => 'search#category_index', :as => :category
-  match 'assets/:asset(/*category_path)' => 'search#assets', :as => :assets
   # search
   match 'search(/:action(/*category_path))', :controller => 'search'
@@ -0,0 +1,5 @@
+class AddSettingsToComments < ActiveRecord::Migration
+  def change
+    add_column :comments, :settings, :text
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150223180807) do
+ActiveRecord::Schema.define(:version => 20150408231524) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -263,6 +263,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150223180807) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
+    t.text     "settings"
   end
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -22,8 +22,12 @@ public/user_themes
 public/designs/themes/default
 public/designs/themes/*
 public/designs/icons/default
+
+public/assets
+.sass-cache
 public/javascripts/cache*
 public/stylesheets/cache*
+
 public/plugins
 db/development.db
 db/production.db
@@ -150,8 +150,8 @@ class Noosfero::Plugin
       self.name.underscore.gsub('_plugin','')
     end
-    def public_path(file = '')
-      File.join('/plugins', public_name, file)
+    def public_path file = '', relative=false
+      File.join "#{if relative then '' else  '/' end}plugins", public_name, file
     end
     def root_path
@@ -430,6 +430,19 @@ class Noosfero::Plugin
     []
   end
+  # -> Adds aditional action buttons to article
+  # returns = { :title => title, :icon => icon, :url => url, :html_options => {} }
+  #   title         = name that will be displayed.
+  #   icon          = css class name (for customized icons include them in a css file).
+  #   url           = url or route to which the button will redirect.
+  #   html_options  = Html options for customization
+  #
+  # Multiple values could be passed as parameter.
+  # returns = [{:title => title, :icon => icon}, {:title => title, :icon => icon}]
+  def article_extra_toolbar_buttons(article)
+    []
+  end
+
   # -> Adds adicional content to article
   # returns = lambda block that creates html code
   def article_extra_contents(article)
@@ -678,6 +691,8 @@ class Noosfero::Plugin
     # returns = string with reason of expiration
     elsif method.to_s =~ /^content_expire_(#{content_actions.join('|')})$/
       nil
+    elsif context.respond_to?(method)
+      context.send(method)
     else
       super
     end
@@ -0,0 +1,32 @@
+require "test_helper"
+
+class SearchControllerTest < ActionController::TestCase
+
+  def setup
+    environment = Environment.default
+    environment.enable_plugin(PgSearchPlugin)
+  end
+
+  should 'list all communities' do
+    plugin = PgSearchPlugin.new
+    c1 = fast_create(Community, :name => 'Testing community 1')
+    c2 = fast_create(Community, :name => 'Testing community 3')
+    c3 = fast_create(Community, :name => 'Testing community 3')
+
+    get :communities
+    assert_equivalent [c1, c2, c3], assigns(:searches)[:communities][:results]
+  end
+
+  should 'list communities of a specific template' do
+    plugin = PgSearchPlugin.new
+    t1 = fast_create(Community, :is_template => true)
+    t2 = fast_create(Community, :is_template => true)
+    c1 = fast_create(Community, :template_id => t1.id, :name => 'Testing community 1')
+    c2 = fast_create(Community, :template_id => t2.id, :name => 'Testing community 2')
+    c3 = fast_create(Community, :template_id => t1.id, :name => 'Testing community 3')
+    c4 = fast_create(Community, :name => 'Testing community 3')
+
+    get :communities, :template_id => t1.id
+    assert_equivalent [c1, c3], assigns(:searches)[:communities][:results]
+  end
+end
@@ -8,7 +8,7 @@ pjax = {
   themes: {},
   load: function() {
-    var target = jQuery('#content');
+    var target = jQuery('#wrap-1');
     var content = jQuery('#content-inner');
     var loadingTarget = jQuery('#content');
@@ -52,7 +52,7 @@ pjax = {
       from_state = this.current_state || this.initial_state;
     if (state.layout_template != from_state.layout_template) {
-      var lt_css = jQuery('head link[href^="/designs/templates"]');
+      var lt_css = jQuery('head link[href*="designs/templates"]');
       lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets'));
     }
@@ -78,7 +78,7 @@ pjax = {
       return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css');
     });
-    var css = jQuery('head link[href^="/designs/themes/'+from_state.theme.id+'/style"]');
+    var css = jQuery('head link[href*="designs/themes/'+from_state.theme.id+'/style"]');
     css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style'));
     jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon);
@@ -88,7 +88,7 @@ pjax = {
     jQuery('#navigation ul').html(state.theme.extra_navigation);
     jQuery('#theme-footer').html(state.theme.footer);
-    jQuery('head script[src^="/designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
+    jQuery('head script[src*="designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
     if (state.theme.js_src) {
       var script = document.createElement('script');
       script.type = 'text/javascript', script.src = state.theme.js_src;
 <%
-  update_js = render(:file => "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
+  update_js = render(file: "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
 %>
 <title><%= h page_title %></title>
-<%= render :file => "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
+<%= render file: "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
     render "layouts/content" %>
 <%= javascript_tag do %>
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
+/*
+* third party libraries
+*= require jquery-2.1.1.min.js
+*= require jquery-migrate-1.2.1.js
+*= require jquery.cycle.all.min.js
+*= require jquery.colorbox-min.js
+*= require jquery-ui-1.10.4/js/jquery-ui-1.10.4.min.js
+*= require jquery.scrollTo.js
+*= require jquery.form.js
+*= require jquery-validation/jquery.validate.js
+*= require jquery.cookie.js
+*= require jquery.ba-bbq.min.js
+*= require jquery.tokeninput.js
+*= require jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js
+*= require inputosaurus.js
+*= require reflection.js
+*= require rails.js
+*= require jrails.js
+* noosfero libraries
+*= require_self
+*= require modal.js
+* views speficics
+*= require add-and-join.js
+*= require report-abuse.js
+*= require manage-products.js
+*= require catalog.js
+*= require autogrow.js
+*/
 // scope for noosfero stuff
 noosfero = {
@@ -6,7 +6,7 @@
 b {
 	color:#000080;
-} 
+}
 /* comments */
 big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {
 	color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
 	color:gray;
 	font-weight:normal;
 }
- /* attributes */ 
+ /* attributes */
 s, s b, span s u, span s cite, strong span s {
 	color:#5656fa ;
 	font-weight:normal;
 }
- /* strings */ 
+ /* strings */
 strong s,strong s b, strong s u, strong s cite {
 	color:#009900;
 	font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{
  /* Syntax */
 strong a, strong a u {
 	color:#0000FF;
-	font-weight:;
 }
  /* Native Keywords */
 strong u {
@@ -58,7 +57,7 @@ em {
 	color:#800080;
 	font-style:normal;
 }
- /* script */ 
+ /* script */
 ins {
 	color:#800000;
 	font-weight:bold;
@@ -68,4 +67,4 @@ ins {
 cite, s cite {
 	color:red;
 	font-weight:bold;
-}
 \ No newline at end of file
+}
 /*
- * CodePress color styles for ASP-VB syntax highlighting 
+ * CodePress color styles for ASP-VB syntax highlighting
  * By Martin D. Kirk
  */
 /* tags */
 b {
 	color:#000080;
-} 
+}
 /* comments */
 big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {
 	color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
 	color:gray;
 	font-weight:normal;
 }
- /* attributes */ 
+ /* attributes */
 s, s b, span s u, span s cite, strong span s {
 	color:#5656fa ;
 	font-weight:normal;
 }
- /* strings */ 
+ /* strings */
 strong s,strong s b, strong s u, strong s cite {
 	color:#009900;
 	font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{
  /* Syntax */
 strong a, strong a u {
 	color:#0000FF;
-	font-weight:;
 }
  /* Native Keywords */
 strong u {
@@ -58,7 +57,7 @@ em {
 	color:#800080;
 	font-style:normal;
 }
- /* script */ 
+ /* script */
 ins {
 	color:#800000;
 	font-weight:bold;
@@ -68,4 +67,4 @@ ins {
 cite, s cite {
 	color:red;
 	font-weight:bold;
-}
 \ No newline at end of file
+}
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-04-02
-* http://jqueryui.com
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-undefined
 \ No newline at end of file
@@ -15,9 +15,17 @@
     $('form.search_form').submit();
   });
+  // Filter submenu
+  $('#search-subheader select').change(function(){
+    $('form.search_form').submit();
+  });
+
   // Custom styled select
   $('#search-filters select').selectOrDie();
+  // Custom styled select
+  $('#search-subheader select').selectOrDie();
+
   // Form Ajax submission
   $('form.search_form').submit(function () {
     $.ajax({
+/*
+ * thidparty libraries
+ *= require colorbox
+ *= require selectordie
+ *= require selectordie-theme
+ *= require inputosaurus
+ *= require token-input
+ *= require token-input-facebook
+ *= require token-input-mac
+ *= require token-input-facet
+ * noosfero libraries
+ *= require_self
+ *= require iepngfix/iepngfix
+ * views specifics
+ *= require chat
+ *= require search
+ */
+
 /* browser fixes */
 img:-moz-broken {
@@ -77,19 +95,6 @@ div#errorExplanation h2 {
 #footer_content {
   clear: both;
 }
-#footer {
-  text-align: center;
-  clear: both;
-  font-size: 10px;
-  color: #777;
-}
-#footer a {
-  color: #777;
-  text-decoration: none;
-}
-#footer a:hover {
-  color: #555;
-}
 div#profile-disabled {
   border: 2px solid #944;
   text-align: center;
@@ -4427,7 +4432,8 @@ h1#agenda-title {
 #groups-list li {
   display: block;
   list-style: none;
-  margin-bottom: 20px background-color: #B8CFE7;
+  margin-bottom: 20px;
+  background-color: #B8CFE7;
 }
 #groups-list li .vcard {
@@ -6932,8 +6938,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 }
 .fetching-overlay {
-  position: absolute; 
-  top: 0px; 
+  position: absolute;
+  top: 0px;
   left: 0px;
   right: 0px;
   bottom: 0px;
@@ -563,7 +563,8 @@ li.search-product-item {
 }
 li.search-product-item {
   display:block;
-  float:none overflow:visible;
+  float:none;
+  overflow:visible;
   padding:10px 0;
   margin:10px 0;
   border-bottom:1px solid #ccc;
@@ -953,7 +954,7 @@ ul#assets-menu {
   text-align: justify;
   text-justify: distribute-all-lines; /* distribute items in IE */
   list-style-type: none;
-  margin: 5px 0 13px;
+  margin: 5px 0px 10px 0px;
   padding: 0;
   width: 500px;
   float: left;
@@ -984,6 +985,15 @@ ul#assets-menu li.selected a {
   color: #EF2929;
   font-weight: bold;
 }
+ul#assets-links li.selected a {
+  border-bottom: 4px solid #dd4b39;
+  padding-bottom: 6px;
+}
+
+ul#assets-links li.selected a {
+  color: #dd4b39;
+  font-weight: bold;
+}
 #search-filters {
   float: right;
@@ -1037,3 +1047,13 @@ ul#assets-menu li.selected a {
   border-bottom:1px solid #ccc;
   margin-bottom: 10px;
 }
+
+#search-header{
+  border-bottom: 1px solid #ebebeb;
+}
+
+#search-content .total{
+  color: #808080;
+  line-height: 20px;
+  font-style: oblique;
+}
@@ -0,0 +1,75 @@
+/* Default custom select styles */
+
+#search-subheader div.sod_select {
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+  text-align: left;
+  background: #fff;
+  z-index: 100;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background: transparent;
+  max-width: 400px;
+}
+
+#search-subheader div.sod_select:focus {
+  outline: none; /* For better accessibility add a style for this in your skin */
+}
+
+#search-subheader .sod_select select {
+  display: none;
+}
+
+#search-subheader .sod_label::after {
+  font-family: Arial, 'Liberation Sans', sans-serif;
+  font-weight: bold;
+  content: '+';
+  left: 0px;
+  -webkit-transform: translate3d(0,-50%,0) rotate3d(0,0,1,0deg);;
+  transform: translate3d(0,-50%,0) rotate3d(0,0,1,0deg);;
+  -webkit-transition: -webkit-transform 0.5s;
+  transition: transform 0.5s;
+  position: absolute;
+  top: 50%;
+  font-size: 2.1em;
+}
+
+#search-subheader .sod_select.open .sod_label::after {
+  -webkit-transform: translate3d(0,-50%,0) rotate3d(0,0,1,225deg);
+  transform: translate3d(0,-50%,0) rotate3d(0,0,1,225deg);
+}
+
+/* Changes on select or die*/
+#search-subheader .sod_select{
+  border: none;
+  padding-top: 10px;
+  padding-left: 20px;
+  padding-bottom: 10px;
+  width: auto;
+  font-weight: normal;
+  text-transform: none;
+  font-size: 12px;
+}
+
+#search-subheader .sod_select.open{
+}
+
+#search-subheader .sod_select .sod_list{
+  border: 1px solid #ebebeb;
+  margin-left: -1px;
+  width: auto;
+}
+
+#search-subheader .sod_select:before,
+#search-subheader  .sod_select:after {
+  content: "";
+}
+
+#search-subheader .sod_select.focus {
+  box-shadow: none;
+}
@@ -1436,4 +1436,99 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'h1', :attributes => { :class => /title/ }, :content => article.name
   end
+
+  should 'add extra toolbar actions on article from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        {:title => 'some_title1', :icon => 'some_icon1', :url => {}}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :title => "some_title1" }}
+  end
+
+  should 'add more than one extra toolbar actions on article from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        {:title => 'some_title1', :icon => 'some_icon1', :url => {}}
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        {:title => 'some_title2', :icon => 'some_icon2', :url => {}}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+    Environment.default.enable_plugin(Plugin2.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :title => "some_title1" }}
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :title => "some_title2" }}
+  end
+
+  should 'add icon attribute in extra toolbar actions on article from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        {:title => 'some_title', :icon => 'some_icon', :url => {}}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :class => /some_icon/ }}
+  end
+
+  should 'add url attribute in extra toolbar actions on article from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        {:title => 'some_title', :icon => 'some_icon', :url => '/someurl'}
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/someurl" }}
+  end
+
+  should 'use context method in extra toolbar actions on article from plugins' do
+    class Plugin1 < Noosfero::Plugin
+      def article_extra_toolbar_buttons(article)
+        if current_person.public?
+          {:title => 'some_title', :icon => 'some_icon', :url => '/someurl'}
+        else
+          {:title => 'another_title', :icon => 'another_icon', :url => '/anotherurl'}
+        end
+      end
+    end
+    Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
+
+    Environment.default.enable_plugin(Plugin1.name)
+
+    page = profile.articles.create!(:name => 'myarticle', :body => 'the body of the text')
+
+    profile.public_profile = false
+    profile.save
+    login_as(profile.identifier)
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'div', :attributes => { :id => 'article-actions' }, :descendant => { :tag => 'a', :attributes => { :href => "/anotherurl" }}
+  end
+
 end
@@ -13,14 +13,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     @request.stubs(:ssl?).returns(false)
     @response   = ActionController::TestResponse.new
-    @category = Category.create!(:name => 'my-category', :environment => Environment.default)
+    @environment = Environment.default
+    @category = Category.create!(:name => 'my-category', :environment => @environment)
-    env = Environment.default
-    domain = env.domains.first
+    domain = @environment.domains.first
     if !domain
       domain = Domain.create!(:name => "127.0.0.1")
-      env.domains = [domain]
-      env.save!
+      @environment.domains = [domain]
+      @environment.save!
     end
     domain.google_maps_key = 'ENVIRONMENT_KEY'
     domain.save!
@@ -37,6 +37,8 @@ class SearchControllerTest &lt; ActionController::TestCase
     Person.any_instance.stubs(:user).returns(user)
   end
+  attr_reader :environment
+
   def create_article_with_optional_category(name, profile, category = nil)
     fast_create(Article, {:name => name, :profile_id => profile.id }, :search => true, :category => category)
   end
@@ -651,6 +653,122 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [st1,st2].to_json, response.body
   end
+  should 'templates variable be an hash in articles asset' do
+    get :articles
+    assert assigns(:templates).kind_of?(Hash)
+  end
+
+  should 'not load people templates in articles asset' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :articles
+    assert_nil assigns(:templates)[:people]
+  end
+
+  should 'not load communities templates in articles asset' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :articles
+    assert_nil assigns(:templates)[:communities]
+  end
+
+  should 'not load enterprises templates in articles asset' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :articles
+    assert_nil assigns(:templates)[:enterprises]
+  end
+
+  should 'templates variable be equals to people templates in people assert' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :people
+
+    assert_equivalent [t1,t2], assigns(:templates)[:people]
+  end
+
+  should 'not load communities templates in people asset' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :people
+    assert_nil assigns(:templates)[:communities]
+  end
+
+  should 'not load enterprises templates in people asset' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :people
+    assert_nil assigns(:templates)[:enterprises]
+  end
+
+  should 'templates variable be equals to communities templates in communities assert' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :communities
+
+    assert_equivalent [t1,t2], assigns(:templates)[:communities]
+  end
+
+  should 'not load people templates in communities asset' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :communities
+    assert_nil assigns(:templates)[:people]
+  end
+
+  should 'not load enterprises templates in communities asset' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :communities
+    assert_nil assigns(:templates)[:enterprises]
+  end
+
+  should 'templates variable be equals to enterprises templates in enterprises assert' do
+    t1 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Enterprise, :is_template => true, :environment_id => environment.id)
+    get :enterprises
+
+    assert_equivalent [t1,t2], assigns(:templates)[:enterprises]
+  end
+
+  should 'not load communities templates in enterprises asset' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    get :enterprises
+    assert_nil assigns(:templates)[:communities]
+  end
+
+  should 'not load people templates in enterprises asset' do
+    t1 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Person, :is_template => true, :environment_id => environment.id)
+    get :enterprises
+    assert_nil assigns(:templates)[:people]
+  end
+
+  should 'list all community of on specific template' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    c1 = fast_create(Community, :template_id => t1.id, :name => 'Testing community 1', :created_at => DateTime.now - 2)
+    c2 = fast_create(Community, :template_id => t2.id, :name => 'Testing community 2', :created_at => DateTime.now - 1)
+    c3 = fast_create(Community, :template_id => t1.id, :name => 'Testing community 3')
+    c4 = fast_create(Community, :name => 'Testing community 3')
+
+    get :communities, :template_id => t1.id
+    assert_equivalent [c1,c3] , assigns(:searches)[:communities][:results]
+  end
+
+  should 'list all communities of no template is passed' do
+    t1 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    t2 = fast_create(Community, :is_template => true, :environment_id => environment.id)
+    c1 = create(Community, :template_id => t1.id, :name => 'Testing community 1', :created_at => DateTime.now - 2)
+    c2 = create(Community, :template_id => t2.id, :name => 'Testing community 2', :created_at => DateTime.now - 1)
+    c3 = create(Community, :template_id => t1.id, :name => 'Testing community 3')
+    c4 = create(Community, :name => 'Testing community 3')
+
+    get :communities, :template_id => nil
+    assert_equivalent [t1,t2,c1,c2,c3,c4] , assigns(:searches)[:communities][:results]
+  end
+
   protected
   def create_event(profile, options)
@@ -463,13 +463,13 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   should 'base theme uses default icon theme' do
     stubs(:current_theme).returns('base')
-    assert_equal "/designs/icons/default/style.css", icon_theme_stylesheet_path.first
+    assert_equal "designs/icons/default/style.css", icon_theme_stylesheet_path.first
   end
   should 'base theme uses config to specify more then an icon theme' do
     stubs(:current_theme).returns('base')
-    assert_includes icon_theme_stylesheet_path, "/designs/icons/default/style.css"
-    assert_includes icon_theme_stylesheet_path, "/designs/icons/pidgin/style.css"
+    assert_includes icon_theme_stylesheet_path, "designs/icons/default/style.css"
+    assert_includes icon_theme_stylesheet_path, "designs/icons/pidgin/style.css"
   end
   should 'not display active field if only required' do
@@ -961,6 +961,47 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal '', manage_communities
   end
+  should 'include file from current theme out of a profile page' do
+    def profile; nil; end
+    def environment; e={}; def e.theme; 'env-theme'; end; e; end
+    def render(opt); opt; end
+    File.stubs(:exists?).returns(false)
+    file = Rails.root.join 'public/designs/themes/env-theme/somefile.html.erb'
+    assert_nil theme_include('somefile') # exists? = false
+    File.expects(:exists?).with(file).returns(true).at_least_once
+    assert_equal file, theme_include('somefile')[:file] # exists? = true
+  end
+
+  should 'include file from current theme inside a profile page' do
+    def profile; p={}; def p.theme; 'my-theme'; end; p; end
+    def render(opt); opt; end
+    File.stubs(:exists?).returns(false)
+    file = Rails.root.join 'public/designs/themes/my-theme/otherfile.html.erb'
+    assert_nil theme_include('otherfile') # exists? = false
+    File.expects(:exists?).with(file).returns(true).at_least_once
+    assert_equal file, theme_include('otherfile')[:file] # exists? = true
+  end
+
+  should 'include file from env theme' do
+    def profile; p={}; def p.theme; 'my-theme'; end; p; end
+    def environment; e={}; def e.theme; 'env-theme'; end; e; end
+    def render(opt); opt; end
+    File.stubs(:exists?).returns(false)
+    file = Rails.root.join 'public/designs/themes/env-theme/afile.html.erb'
+    assert_nil env_theme_include('afile') # exists? = false
+    File.expects(:exists?).with(file).returns(true).at_least_once
+    assert_equal file, env_theme_include('afile')[:file] # exists? = true
+  end
+
+  should 'include file from some theme' do
+    def render(opt); opt; end
+    File.stubs(:exists?).returns(false)
+    file = Rails.root.join 'public/designs/themes/atheme/afile.html.erb'
+    assert_nil from_theme_include('atheme', 'afile') # exists? = false
+    File.expects(:exists?).with(file).returns(true).at_least_once
+    assert_equal file, from_theme_include('atheme', 'afile')[:file] # exists? = true
+  end
+
   protected
   include NoosferoTestHelper
@@ -393,4 +393,30 @@ class CommunityTest &lt; ActiveSupport::TestCase
     assert_not_includes community.activities.map { |a| a.klass.constantize.find(a.id) }, article.activity
   end
+ 
+  should 'check if a community admin user is really a community admin' do
+    c = fast_create(Community, :name => 'my test profile', :identifier => 'mytestprofile')
+    admin = create_user('adminuser').person
+    c.add_admin(admin)
+   
+    assert c.is_admin?(admin)
+  end
+
+  should 'a member user not be a community admin' do
+    c = fast_create(Community, :name => 'my test profile', :identifier => 'mytestprofile')
+    admin = create_user('adminuser').person
+    c.add_admin(admin)
+
+    member = create_user('memberuser').person
+    c.add_member(member)
+    assert !c.is_admin?(member)
+  end
+
+  should 'a moderator user not be a community admin' do
+    c = fast_create(Community, :name => 'my test profile', :identifier => 'mytestprofile')
+    moderator = create_user('moderatoruser').person
+    c.add_moderator(moderator)
+    assert !c.is_admin?(moderator)
+  end
+
 end
@@ -499,5 +499,30 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
     assert_equal({:profile => enterprise.identifier, :controller => 'catalog'}, enterprise.catalog_url)
   end
+  should 'check if a community admin user is really a community admin' do
+    c = fast_create(Enterprise, :name => 'my test profile', :identifier => 'mytestprofile')
+    admin = create_user('adminuser').person
+    c.add_admin(admin)
+   
+    assert c.is_admin?(admin)
+  end
+
+  should 'a member user not be a community admin' do
+    c = fast_create(Enterprise, :name => 'my test profile', :identifier => 'mytestprofile')
+    admin = create_user('adminuser').person
+    c.add_admin(admin)
+
+    member = create_user('memberuser').person
+    c.add_member(member)
+    assert !c.is_admin?(member)
+  end
+
+  should 'a moderator user not be a community admin' do
+    c = fast_create(Enterprise, :name => 'my test profile', :identifier => 'mytestprofile')
+    moderator = create_user('moderatoruser').person
+    c.add_moderator(moderator)
+    assert !c.is_admin?(moderator)
+  end
+
 end
 require_relative "../test_helper"
 class LayoutHelperTest < ActionView::TestCase
+  include ApplicationHelper
   should 'append logged-in class in body when user is logged-in' do
     expects(:logged_in?).returns(true)
@@ -14,4 +15,19 @@ class LayoutHelperTest &lt; ActionView::TestCase
     assert_not_includes body_classes.split, 'logged-in'
   end
+  should 'add global.css to noosfero_stylesheets if env theme has it' do
+    env = fast_create Environment
+    env.theme = 'my-theme'
+    @plugins = []
+    expects(:profile).returns(nil).at_least_once
+    expects(:environment).returns(env).at_least_once
+    expects(:theme_option).with(:icon_theme).returns(['my-icons']).at_least_once
+    expects(:jquery_theme).returns('jquery-nice').at_least_once
+    global_css = Rails.root.join "public/designs/themes/#{env.theme}/global.css"
+    File.stubs(:exists?).returns(false)
+    File.expects(:exists?).with(global_css).returns(true).at_least_once
+    css = noosfero_stylesheets
+    assert_match /<link [^<]*href="\/designs\/themes\/my-theme\/global.css"/, css
+  end
+
 end
@@ -452,4 +452,29 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'check if a community admin user is really a community admin' do
+    c = fast_create(Organization, :name => 'my test profile', :identifier => 'mytestprofile')
+    admin = create_user('adminuser').person
+    c.add_admin(admin)
+   
+    assert c.is_admin?(admin)
+  end
+
+  should 'a member user not be a community admin' do
+    c = fast_create(Organization, :name => 'my test profile', :identifier => 'mytestprofile')
+    admin = create_user('adminuser').person
+    c.add_admin(admin)
+
+    member = create_user('memberuser').person
+    c.add_member(member)
+    assert !c.is_admin?(member)
+  end
+
+  should 'a moderator user not be a community admin' do
+    c = fast_create(Organization, :name => 'my test profile', :identifier => 'mytestprofile')
+    moderator = create_user('moderatoruser').person
+    c.add_moderator(moderator)
+    assert !c.is_admin?(moderator)
+  end
+
 end
@@ -560,4 +560,11 @@ class PluginTest &lt; ActiveSupport::TestCase
     assert_equivalent [st4.term, st2.term], limited_suggestions
   end
+  should 'article_extra_toolbar_buttons return an empty array by default' do
+    class Plugin1 < Noosfero::Plugin
+    end
+    p = Plugin1.new
+    assert_equal [], p.article_extra_toolbar_buttons(nil)
+  end
+
 end
@@ -0,0 +1,47 @@
+require_relative "../test_helper"
+
+class PluginsHelperTest < ActionView::TestCase
+
+  def setup
+    @environment = Environment.default
+    @plugins = mock
+  end
+
+  attr_accessor :environment, :plugins
+
+  should 'plugins_toolbar_actions_for_article return an array if the plugin return a single hash' do
+    hash = {:title => 'some title', :url => 'some_url', :icon => 'some icon'}
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns(hash)
+    assert_equal [hash], plugins_toolbar_actions_for_article(nil)
+  end
+
+  should 'plugins_toolbar_actions_for_article return an empty array if an array is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns([])
+    assert_equal [], plugins_toolbar_actions_for_article(nil)
+  end
+
+  should 'plugins_toolbar_actions_for_article throw raise if no title is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:url => 'some_url', :icon => 'some icon'})
+
+    assert_raise(RuntimeError) do
+      plugins_toolbar_actions_for_article(nil)
+    end
+  end
+
+  should 'plugins_toolbar_actions_for_article throw raise if no icon is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:title => 'some title', :url => 'some_url'})
+
+    assert_raise(RuntimeError) do
+      plugins_toolbar_actions_for_article(nil)
+    end
+  end
+
+  should 'plugins_toolbar_actions_for_article throw raise if no url is passed as parameter' do
+    plugins.expects(:dispatch).with(:article_extra_toolbar_buttons, nil).returns({:title => 'some title', :icon => 'some icon'})
+
+    assert_raise(RuntimeError) do
+      plugins_toolbar_actions_for_article(nil)
+    end
+  end
+
+end
@@ -1416,6 +1416,71 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes environment.profiles.templates, profile
   end
+  should 'return an specific template when specified' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    profile = fast_create(Profile)
+
+    assert_equal [t1], environment.profiles.templates(t1)
+    assert_equal [t2], environment.profiles.templates(t2)
+  end
+
+  should 'not return a template when and invalid template is specified' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    t3 = fast_create(Profile)
+
+    assert_equal [], environment.profiles.templates(t3)
+  end
+
+  should 'return profiles of specified template passing object' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile, :template_id => t1.id)
+
+    assert_equivalent [p1,p3], environment.profiles.with_templates(t1)
+  end
+
+  should 'return profiles of specified template passing id' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile, :template_id => t1.id)
+
+    assert_equivalent [p1,p3], environment.profiles.with_templates(t1.id)
+  end
+
+  should 'return profiles of a list of specified templates' do
+    environment = Environment.default
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    t3 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile, :template_id => t3.id)
+
+    assert_equivalent [p1,p2], environment.profiles.with_templates([t1,t2])
+  end
+
+  should 'return all profiles without any template if nil is passed as parameter' do
+    environment = Environment.default
+    Profile.delete_all
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+    p1 = fast_create(Profile, :template_id => t1.id)
+    p2 = fast_create(Profile, :template_id => t2.id)
+    p3 = fast_create(Profile)
+
+    assert_equivalent [t1,t2,p3], environment.profiles.with_templates(nil)
+  end
+
   should 'return a list of profiles that are not templates' do
     environment = Environment.default
     p1 = fast_create(Profile, :is_template => false)
@@ -3,6 +3,9 @@ require_relative &quot;../test_helper&quot;
 class SearchHelperTest < ActiveSupport::TestCase
   include SearchHelper
+  include ActionView::Helpers::FormOptionsHelper
+  include ActionView::Helpers::FormTagHelper
+
   should 'return whether on a multiple search' do
     stubs(:params).returns({:action => 'index', :display => 'map'})
@@ -122,4 +125,84 @@ class SearchHelperTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'return an empty string in assets_submenu for articles assets' do
+    @templates = {}
+    assert_equal '', assets_submenu(:articles)
+    @templates = {:articles => nil}
+    assert_equal '', assets_submenu(:articles)
+  end
+
+  should 'return an empty string in assets_submenu for people asset without template' do
+    @templates = {:people => nil}
+    assert_equal '', assets_submenu(:people)
+
+    @templates = {:people => []}
+    assert_equal '', assets_submenu(:people)
+  end
+
+  should 'return an empty string in assets_submenu for people asset with only one template' do
+    t = fast_create(Person, :is_template => true)
+    @templates = {:people => [t]}
+    assert_equal '', assets_submenu(:people)
+  end
+
+  should 'return a select of templates for people asset with more then one template' do
+    t1 = fast_create(Person, :is_template => true)
+    t2 = fast_create(Person, :is_template => true)
+    @templates = {:people => [t1,t2]}
+    SearchHelperTest.any_instance.stubs(:params).returns({})
+    assert_match /select/, assets_submenu(:people)
+    assert_match /#{t1.name}/, assets_submenu(:people)
+    assert_match /#{t2.name}/, assets_submenu(:people)
+  end
+
+  should 'return an empty string in assets_submenu for communities asset without template' do
+    @templates = {:communities => nil}
+    assert_equal '', assets_submenu(:communities)
+
+    @templates = {:communities => []}
+    assert_equal '', assets_submenu(:communities)
+  end
+
+  should 'return an empty string in assets_submenu for communities asset with only one template' do
+    t = fast_create(Community, :is_template => true)
+    @templates = {:communities => [t]}
+    assert_equal '', assets_submenu(:communities)
+  end
+
+  should 'return a select of templates for communities asset with more then one template' do
+    t1 = fast_create(Community, :is_template => true)
+    t2 = fast_create(Community, :is_template => true)
+    @templates = {:communities => [t1,t2]}
+    SearchHelperTest.any_instance.stubs(:params).returns({})
+    assert_match /select/, assets_submenu(:communities)
+    assert_match /#{t1.name}/, assets_submenu(:communities)
+    assert_match /#{t2.name}/, assets_submenu(:communities)
+  end
+
+  should 'return an empty string in assets_submenu for enterprises asset without template' do
+    @templates = {:enterprises => nil}
+    assert_equal '', assets_submenu(:enterprises)
+
+    @templates = {:enterprises => []}
+    assert_equal '', assets_submenu(:enterprises)
+  end
+
+  should 'return an empty string in assets_submenu for enterprises asset with only one template' do
+    t = fast_create(Enterprise, :is_template => true)
+    @templates = {:enterprises => [t]}
+    assert_equal '', assets_submenu(:enterprises)
+  end
+
+  should 'return a select of templates for enterprises asset with more then one template' do
+    t1 = fast_create(Enterprise, :is_template => true)
+    t2 = fast_create(Enterprise, :is_template => true)
+    @templates = {:enterprises => [t1,t2]}
+    SearchHelperTest.any_instance.stubs(:params).returns({})
+    assert_match /select/, assets_submenu(:enterprises)
+    assert_match /#{t1.name}/, assets_submenu(:enterprises)
+    assert_match /#{t2.name}/, assets_submenu(:enterprises)
+  end
+
+
 end
@@ -0,0 +1,60 @@		@@ -0,0 +1,60 @@
	1	+Noosfero Instructions for Theme Developers
	2	+==========================================
	3	+
	4	+To build Noosfero themes you must to know HTML and CSS. You may also get some advantages with Ruby and Noosfero hacking knowledge because all customizable pieces of the theme's HTML structure are [erb](http://en.wikipedia.org/wiki/ERuby) files.
	5	+
	6	+
	7	+Organization Basics
	8	+-------------------
	9	+
	10	+A theme is a directory and must inside `noosfero/public/designs/themes`, and you will find tis themes in a fresh installation:
	11	+`noosfero`, `aluminium`, `base`, `butter`, `chameleon`, `chocolate`, `orange`, `plum`, `scarletred` and `skyblue`. The `default` is only a link to `noosfero` and you can change this link to any other.
	12	+
	13	+`noosfero` is the default theme with a big header. All other are colored themes with a thin header. That colored ones can be used as additional themes for any environment, as they will search for `/images/thin-logo.png` inside the current environment.theme, to use as top left logo.
	14	+
	15	+Inside a theme we can found:
	16	+* `theme.yml` — Theme description with some nice configuration options.
	17	+* `preview.png` — A 100x100 screenshot of this theme to the theme selection UI.
	18	+* `style.css` — The main file. The magic happens here.
	19	+* `errors.css` — Change the error page look. (only if this theme is linked by `defaut`)
	20	+* `favicon.ico` — The identifier icon for your web site.
	21	+* `images` — Another name can be found by your CSS, but will not allow to reuse the logo.
	22	+ * `thin-logo.png` — The logo to be reused by the colored themes.
	23	+ * many images...
	24	+* `site_title.html.erb` — A nice place to put your logo, any code here will be placed inside `h1#site-title`.
	25	+* `header.html.erb` — That goes inside `div#theme-header`.
	26	+* `navigation.html.erb` — That goes inside `div#navigation ul`, so use `<li>`s.
	27	+* `footer.html.erb` — That goes inside `div#theme-footer`.
	28	+
	29	+You can add more files like javascript and modularized CSS, but you must to refer that by the described files above.
	30	+
	31	+To refer one of this files trough the web the path is `<domain>/designs/themes/<thistheme>/<somefile>`.
	32	+
	33	+
	34	+theme.yml
	35	+---------
	36	+
	37	+A simple definition file. See this example:
	38	+```yml
	39	+name: "My Cool Theme"
	40	+layout: "application-ng"
	41	+jquery_theme: "smoothness"
	42	+icon_theme: [default, pidgin]
	43	+gravatar: "retro"
	44	+```
	45	+
	46	+About non obvious:
	47	+* `layout` is about the theme structure to use. The `application-ng` is enough for 99.97358% use cases. If you want to use another structure, you must add a new `*.html.erb` file at `app/views/layouts/`.
	48	+* `icon_theme` point to something inside `public/designs/icons/`.
	49	+* `gravatar` set the default gravatar (avatar picture) for people without picture.
	50	+
	51	+
	52	+Theme Intervention from Environment Theme
	53	+-----------------------------------------
	54	+
	55	+Sometimes an environment (as instace http://cirandas.net) wants to allow profiles to set its own theme, but with some environment identification or functions, like a top bar with the social network logo and a top menu (as instace http://cirandas.net/rango-vegan).
	56	+To make the magic happens you can add some files to the environment theme.
	57	+All are optional:
	58	+* `global.css` — this must be used to style all extra html added by your intervention partials. As it is a free form css file you can style anything, but this is a conflict risk.
	59	+* `global_header.html.erb` — Will add content to `#global-header`.
	60	+* `global_footer.html.erb` — Will add content to `#global-footer`.
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../../public/designs/icons
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../../public/designs/themes
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/images
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/javascripts
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/plugins
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/stylesheets
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -179,6 +179,7 @@ class ApplicationController < ActionController::Base		@@ -179,6 +179,7 @@ class ApplicationController < ActionController::Base
179	include SearchTermHelper	179	include SearchTermHelper
180		180
181	def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})	181	def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
		182	+ scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
182	search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)	183	search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
183	register_search_term(query, scope.count, search[:results].count, context, asset)	184	register_search_term(query, scope.count, search[:results].count, context, asset)
184	search	185	search
	@@ -6,4 +6,11 @@ module PluginsHelper		@@ -6,4 +6,11 @@ module PluginsHelper
6	end	6	end
7	end	7	end
8		8
		9	+ def plugins_toolbar_actions_for_article(article)
		10	+ toolbar_actions = Array.wrap(@plugins.dispatch(:article_extra_toolbar_buttons, article))
		11	+ toolbar_actions.each do \|action\|
		12	+ [:title, :url, :icon].each { \|param\| raise "No #{param} was passed as parameter for #{action}" unless action.has_key?(param) }
		13	+ end
		14	+ end
		15	+
9	end	16	end
	@@ -148,4 +148,11 @@ module SearchHelper		@@ -148,4 +148,11 @@ module SearchHelper
148	link_to(@enabled_searches[asset], "/search/#{asset}")	148	link_to(@enabled_searches[asset], "/search/#{asset}")
149	end	149	end
150		150
		151	+ def assets_submenu(asset)
		152	+ return '' if @templates[asset].blank? \|\| @templates[asset].length == 1
		153	+ options = @templates[asset].map {\|template\| [template.name, template.id]}
		154	+ options = options_for_select([[_('Choose a template'), nil]] + options, selected: (params[:template_id]))
		155	+ select_tag('template_id', options, :id => 'submenu')
		156	+ end
		157	+
151	end	158	end