Merge branch 'noosfero' into rails4

Braulio Bhavamitra
2 parents f3ac17d4 492c3d63
Showing 183 changed files with 5419 additions and 573 deletions Show diff stats
app/controllers/public/account_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/helpers/events_helper.rb
app/helpers/forms_helper.rb
app/helpers/layout_helper.rb
app/models/article.rb
app/models/category.rb
app/models/enterprise_homepage.rb
app/models/environment.rb
app/models/event.rb
app/models/profile.rb
app/models/text_article.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
app/models/user.rb
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
@@ -46,8 +46,12 @@ class AccountController &lt; ApplicationController
     self.current_user = plugins_alternative_authentication
-    self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
-
+    begin
+      self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
+    rescue User::UserNotActivated => e
+      session[:notice] = e.message
+      return
+    end
     if logged_in?
       check_join_in_community(self.current_user)
@@ -92,10 +92,10 @@ class SearchController &lt; PublicController
   def events
     if params[:year].blank? && params[:year].blank? && params[:day].blank?
-      @date = Date.today
+      @date = DateTime.now
     else
-      year = (params[:year] ? params[:year].to_i : Date.today.year)
-      month = (params[:month] ? params[:month].to_i : Date.today.month)
+      year = (params[:year] ? params[:year].to_i : DateTime.now.year)
+      month = (params[:month] ? params[:month].to_i : DateTime.now.month)
       day = (params[:day] ? params[:day].to_i : 1)
       @date = build_date(year, month, day)
     end
@@ -106,9 +106,7 @@ class SearchController &lt; PublicController
       @events = @category ?
         environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
         environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
-    end
-
-    if params[:year] || params[:month]
+    elsif params[:year] || params[:month]
       @events = @category ?
         environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
         environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
@@ -903,7 +903,7 @@ module ApplicationHelper
   end
   def base_url
-    environment.top_url(request.scheme)
+    profile ? profile.top_url(request.scheme) : environment.top_url(request.scheme)
   end
   alias :top_url :base_url
@@ -6,7 +6,13 @@ module BlogHelper
     @article = article
     hidden_field_tag('article[published]', 1) +
     hidden_field_tag('article[accept_comments]', 0) +
-    visibility_options(article,tokenized_children)
+    visibility_options(article,tokenized_children) +
+    content_tag('h4', _('Visualization of posts')) +
+    content_tag(
+      'div',
+      check_box(:article, :display_preview) +
+      content_tag('label', _('I want to display the preview of posts before the text'), :for => 'article_display_preview')
+    )
   end
   def cms_label_for_new_children
@@ -51,7 +51,7 @@ module ContentViewerHelper
     elsif date_format == 'past_time'
       left_time = true
     end
-    content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
+    content_tag('span', show_time(article.published_at, use_numbers , year, left_time), :class => 'date')
   end
   def link_to_comments(article, args = {})
@@ -43,9 +43,14 @@ module DatesHelper
   end
   # formats a datetime for displaying.
-  def show_time(time)
-    if time
-      _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
+  def show_time(time, use_numbers = false, year = true, left_time = false)
+    if time && use_numbers
+      _('%{month}/%{day}/%{year}, %{hour}:%{minutes}') % { :year => (year ? time.year : ''), :month => time.month, :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
+    elsif time && left_time
+      date_format = time_ago_in_words(time)
+    elsif time
+      date_format = year ? _('%{month_name} %{day}, %{year} %{hour}:%{minutes}') : _('%{month_name} %{day} %{hour}:%{minutes}')
+      date_format % { :day => time.day, :month_name => month_name(time.month), :year => time.year, :hour => time.hour, :minutes => time.strftime("%M") }
     else
       ''
     end
@@ -53,7 +58,7 @@ module DatesHelper
   def show_period(date1, date2 = nil, use_numbers = false)
     if (date1 == date2) || (date2.nil?)
-      show_date(date1, use_numbers)
+      show_time(date1, use_numbers)
     else
       if date1.year == date2.year
         if date1.month == date2.month
@@ -72,8 +77,8 @@ module DatesHelper
         end
       else
         _('from %{date1} to %{date2}') % {
-          :date1 => show_date(date1, use_numbers),
-          :date2 => show_date(date2, use_numbers)
+          :date1 => show_time(date1, use_numbers),
+          :date2 => show_time(date2, use_numbers)
         }
       end
     end
@@ -106,18 +111,18 @@ module DatesHelper
   def build_date(year, month, day = 1)
     if year.blank? and month.blank? and day.blank?
-      Date.today
+      DateTime.now
     else
       if year.blank?
-        year = Date.today.year
+        year = DateTime.now.year
       end
       if month.blank?
-        month = Date.today.month
+        month = DateTime.now.month
       end
       if day.blank?
         day = 1
       end
-      Date.new(year.to_i, month.to_i, day.to_i)
+      DateTime.new(year.to_i, month.to_i, day.to_i)
     end
   end
@@ -16,7 +16,7 @@ module EventsHelper
     content_tag( 'tr',
       content_tag('td',
-        content_tag('div', show_date(article.start_date) + ( article.end_date.nil? ?  '' : (_(" to ") + show_date(article.end_date))),:class => 'event-date' ) +
+        content_tag('div', show_time(article.start_date) + ( article.end_date.nil? ?  '' : (_(" to ") + show_time(article.end_date))),:class => 'event-date' ) +
         content_tag('div',link_to(article.name,article.url),:class => 'event-title') +
         content_tag('div',(article.address.nil? or article.address == '')  ? '' : (_('Place: ') + article.address),:class => 'event-place')
       )
@@ -30,7 +30,7 @@ module EventsHelper
         # the day itself
         date,
         # is there any events in this date?
-        events.any? {|event| event.date_range.include?(date)},
+        events.any? {|event| event.date_range.cover?(date)},
         # is this date in the current month?
         true
       ]
@@ -151,7 +151,7 @@ module FormsHelper
     datepicker_options[:close_text] ||= _('Done')
     datepicker_options[:constrain_input] ||= true
     datepicker_options[:current_text] ||= _('Today')
-    datepicker_options[:date_format] ||= 'mm/dd/yy'
+    datepicker_options[:date_format] ||= 'yy/mm/dd'
     datepicker_options[:day_names] ||= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
     datepicker_options[:day_names_min] ||= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
     datepicker_options[:day_names_short] ||= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
@@ -236,7 +236,7 @@ module FormsHelper
         weekHeader: #{datepicker_options[:week_header].to_json},
         yearRange: #{datepicker_options[:year_range].to_json},
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
-      })
+      }).datepicker('setDate', new Date('#{value}'))
     </script>
     ".html_safe
     result
@@ -86,7 +86,7 @@ module LayoutHelper
   end
   def theme_stylesheet_path
-    "/assets#{theme_path}/style.css"
+    "#{theme_path}/style.css".gsub(%r{^/}, '')
   end
   def layout_template
@@ -9,7 +9,7 @@ class Article &lt; ActiveRecord::Base
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers,
-                  :author
+                  :author, :display_preview
   acts_as_having_image
@@ -637,6 +637,20 @@ class Article &lt; ActiveRecord::Base
     can_display_hits? && display_hits
   end
+  def display_media_panel?
+    can_display_media_panel? && environment.enabled?('media_panel')
+  end
+
+  def can_display_media_panel?
+    false
+  end
+
+  settings_items :display_preview, :type => :boolean, :default => false
+
+  def display_preview?
+    false
+  end
+
   def image?
     false
   end
@@ -745,9 +759,10 @@ class Article &lt; ActiveRecord::Base
   end
   def body_images_paths
-    require 'uri'
     Nokogiri::HTML.fragment(self.body.to_s).css('img[src]').collect do |i|
-      (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, URI.escape(i['src'])).to_s : i['src']
+      src = i['src']
+      src = URI.escape src if self.new_record? # xss_terminate runs on save
+      (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, src).to_s : src
     end
   end
@@ -81,7 +81,7 @@ class Category &lt; ActiveRecord::Base
   end
   def upcoming_events(limit = 10)
-    self.events.where('start_date >= ?', Date.today).reorder('start_date').paginate(:page => 1, :per_page => limit)
+    self.events.where('start_date >= ?', DateTime.now.beginning_of_day).order('start_date').paginate(page: 1, per_page: limit)
   end
   def display_in_menu?
@@ -35,4 +35,8 @@ class EnterpriseHomepage &lt; Article
     false
   end
+  def can_display_media_panel?
+    true
+  end
+
 end
@@ -13,7 +13,7 @@ class Environment &lt; ActiveRecord::Base
                   :reports_lower_bound, :noreply_email,
                   :signup_welcome_screen_body, :members_whitelist_enabled,
                   :members_whitelist, :highlighted_news_amount,
-                  :portal_news_amount, :date_format
+                  :portal_news_amount, :date_format, :signup_intro
   has_many :users
@@ -23,7 +23,7 @@ class Event &lt; Article
   def initialize(*args)
     super(*args)
-    self.start_date ||= Date.today
+    self.start_date ||= DateTime.now
   end
   validates_presence_of :title, :start_date
@@ -35,8 +35,9 @@ class Event &lt; Article
   end
   scope :by_day, -> (date) {
+    where('start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)',
+          {:start_date => date.beginning_of_day, :end_date => date.end_of_day}).
     order('start_date ASC')
-    .where('start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date})
   }
   scope :next_events_from_month, -> (date) {
@@ -75,7 +76,7 @@ class Event &lt; Article
   def self.date_range(year, month)
     if year.nil? || month.nil?
-      today = Date.today
+      today = DateTime.now
       year = today.year
       month = today.month
     else
@@ -83,7 +84,7 @@ class Event &lt; Article
       month = month.to_i
     end
-    first_day = Date.new(year, month, 1)
+    first_day = DateTime.new(year, month, 1)
     last_day = first_day + 1.month - 1.day
     first_day..last_day
@@ -109,7 +110,7 @@ class Event &lt; Article
   end
   def duration
-    ((self.end_date || self.start_date) - self.start_date).to_i
+    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24)
   end
   alias_method :article_lead, :lead
@@ -129,6 +130,10 @@ class Event &lt; Article
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
@@ -579,6 +579,14 @@ class Profile &lt; ActiveRecord::Base
     options.merge(Noosfero.url_options)
   end
+  def top_url(scheme = 'http')
+    url = scheme + '://'
+    url << url_options[:host]
+    url << ':' << url_options[:port].to_s if url_options.key?(:port)
+    url << Noosfero.root('')
+    url
+  end
+
 private :generate_url, :url_options
   def default_hostname
@@ -33,12 +33,16 @@ class TextArticle &lt; Article
   end
   def change_element_path(el, attribute)
-    fullpath = /(https?):\/\/(#{environment.default_hostname})(:\d+)?(\/.*)/.match(el[attribute])
+    fullpath = /(https?):\/\/(#{profile.default_hostname})(:\d+)?(\/.*)/.match(el[attribute])
     if fullpath
       domain = fullpath[2]
       path = fullpath[4]
-      el[attribute] = path if domain == environment.default_hostname
+      el[attribute] = path if domain == profile.default_hostname
     end
   end
+  def display_preview?
+    parent && parent.kind_of?(Blog) && parent.display_preview
+  end
+
 end
@@ -24,6 +24,10 @@ class TextileArticle &lt; TextArticle
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
   protected
   def convert_to_html(textile)
@@ -28,4 +28,8 @@ class TinyMceArticle &lt; TextArticle
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
 end
@@ -121,11 +121,17 @@ class User &lt; ActiveRecord::Base
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
+  scope :has_login?, lambda { |login,email,environment_id|
+    where('login = ? OR email = ?', login, email).
+    where(environment_id: environment_id)
+  }
+
   # Authenticates a user by their login name or email and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password, environment = nil)
     environment ||= Environment.default
-    u = self.where('(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
-                   login, login, environment.id).first # need to get the salt
+
+    u = self.has_login?(login, login, environment.id)
+    u = u.first if u.is_a?(ActiveRecord::Relation)
     u && u.authenticated?(password) ? u : nil
   end
@@ -237,7 +243,23 @@ class User &lt; ActiveRecord::Base
     password.crypt(salt)
   end
+  class UserNotActivated < StandardError
+    attr_reader :user
+
+    def initialize(message, user = nil)
+      @user = user
+
+      super(message)
+    end
+  end
+
   def authenticated?(password)
+
+    unless self.activated?
+      message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
+      raise UserNotActivated.new(message, self)
+    end
+
     result = (crypted_password == encrypt(password))
     if (encryption_method != User.system_encryption_method) && result
       self.password_type = User.system_encryption_method.to_s
@@ -276,9 +298,15 @@ class User &lt; ActiveRecord::Base
   #   current password.
   # * Saves the record unless it is a new one.
   def change_password!(current, new, confirmation)
-    unless self.authenticated?(current)
-      self.errors.add(:current_password, _('does not match.'))
-      raise IncorrectPassword
+
+    begin
+      unless self.authenticated?(current)
+        self.errors.add(:current_password, _('does not match.'))
+        raise IncorrectPassword
+      end
+    rescue UserNotActivated => e
+      self.errors.add(:current_password, e.message)
+      raise UserNotActivated
     end
     self.force_change_password!(new, confirmation)
   end
@@ -11,7 +11,7 @@
           class: 'join-community',
           style: 'position: relative; display: none;' %>
       <% else %>
-        <%= button :add, _('Join this community'), profile.join_url %>
+        <%= button :add, _('Join this community'), profile.join_url, class: 'join-community' %>
       <% end %>
     <% end %>
   <% else %>
@@ -8,9 +8,8 @@
 <%= render :partial => 'general_fields' %>
 <%= render :partial => 'translatable' %>
-<%= labelled_form_field(_('Start date'), pick_date(:article, :start_date)) %>
+<%= date_range_field('article[start_date]', 'article[end_date]', @article.start_date, @article.end_date, _('%Y-%m-%d %H:%M'), {:time => true}, {:id => 'article_start_date'} ) %>
-<%= labelled_form_field(_('End date'), pick_date(:article, :end_date)) %>
 <%= labelled_form_field(_('Event website:'), text_field(:article, :link)) %>
 <%= error_messages_for 'article' %>
-<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
-
-<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
+<div class='<%= (@article.display_media_panel? ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
   <%= hidden_field_tag("type", @type) if @type %>
@@ -68,7 +66,7 @@
 <% end %>
 </div>
-<% if show_media_panel %>
+<% if @article.display_media_panel? %>
   <%= render :partial => 'text_editor_sidebar' %>
 <% end %>
@@ -7,7 +7,7 @@
     <% end %>
   </h1>
   <%= render :partial => "publishing_info" %>
-  <% unless @page.abstract.blank? %>
+  <% if @page.display_preview? %>
     <div class="preview">
       <%= @page.lead %>
     </div>
 <span class="publishing-info">
   <span class="date">
-    <%= show_date(@page.published_at) %>
+    <%= show_time(@page.published_at) %>
   </span>
   <span class="author">
     <%= _(", by %s") % (@page.author ? link_to(@page.author_name, @page.author_url) : @page.author_name) %>
@@ -2,7 +2,7 @@
   <%= link_to '',
         uploaded_file.view_url,
         :class => 'image',
-        :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb)
+        :style => 'background-image: url(%s)'% [Noosfero.root, uploaded_file.public_filename(:thumb)].join
   %>
   <span><%=h uploaded_file.title %></span>
 <% else %>
@@ -0,0 +1,27 @@
+class ChangeArticleDateToDatetime < ActiveRecord::Migration
+
+  def up
+    change_table :articles do |t|
+      t.change :start_date, :datetime
+      t.change :end_date, :datetime
+    end
+
+    change_table :article_versions do |t|
+      t.change :start_date, :datetime
+      t.change :end_date, :datetime
+    end
+  end
+
+  def down
+    change_table :articles do |t|
+      t.change :start_date, :date
+      t.change :end_date, :date
+    end
+
+    change_table :article_versions do |t|
+      t.change :start_date, :date
+      t.change :end_date, :date
+    end
+  end
+
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150712130827) do
+ActiveRecord::Schema.define(:version => 20150722042714) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -75,8 +75,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150712130827) do
     t.integer  "comments_count"
     t.boolean  "advertise",            :default => true
     t.boolean  "published",            :default => true
-    t.date     "start_date"
-    t.date     "end_date"
+    t.datetime "start_date"
+    t.datetime "end_date"
     t.integer  "children_count",       :default => 0
     t.boolean  "accept_comments",      :default => true
     t.integer  "reference_article_id"
@@ -127,8 +127,8 @@ ActiveRecord::Schema.define(:version =&gt; 20150712130827) do
     t.integer  "comments_count",       :default => 0
     t.boolean  "advertise",            :default => true
     t.boolean  "published",            :default => true
-    t.date     "start_date"
-    t.date     "end_date"
+    t.datetime "start_date"
+    t.datetime "end_date"
     t.integer  "children_count",       :default => 0
     t.boolean  "accept_comments",      :default => true
     t.integer  "reference_article_id"
@@ -223,7 +223,7 @@ Feature: events
       | owner     | name         | start_date | end_date   |
       | josesilva | WikiSym 2009 | 2009-10-25 | 2009-10-27 |
     When I am on /profile/josesilva/events/2009/10/26
-    Then I should see "October 25, 2009 to October 27, 2009"
+    Then I should see "October 25, 2009 0:00 to October 27, 2009 0:00"
   Scenario: show place of the event
     Given I am on /profile/josesilva/events/2009/10
@@ -239,12 +239,12 @@ EOF
       end
     end
-    Rake::Task['noosfero:upload'].invoke
     if confirm('Upload the packages')
       puts "==> Uploading debian packages..."
       Rake::Task['noosfero:upload_packages'].invoke(target)
     else
-      puts "I: please upload the package manually!"
+      puts "I: please upload the package manually later by running"
+      puts "I: $ rake noosfero:upload_packages"
     end
     rm_f "tmp/pending-release"
@@ -0,0 +1,21 @@
+class AnalyticsPlugin::StatsController < MyProfileController
+
+  no_design_blocks
+
+  before_filter :skip_page_view
+
+  def index
+  end
+
+  protected
+
+  def default_url_options
+    # avoid rails' use_relative_controller!
+    {use_route: '/'}
+  end
+
+  def skip_page_view
+    @analytics_skip_page_view = true
+  end
+
+end
 module AnalyticsPlugin
-  TimeOnPageUpdateInterval = 2.minutes * 1000
+  TimeOnPageUpdateInterval = 2.minutes
+  TimeOnPageUpdateIntervalMs = TimeOnPageUpdateInterval * 1000
   extend Noosfero::Plugin::ParentMethods
@@ -38,4 +38,12 @@ class AnalyticsPlugin::Base &lt; Noosfero::Plugin
     }]
   end
+  def control_panel_buttons
+    {
+      title: I18n.t('analytics_plugin.lib.plugin.panel_button'),
+      icon: 'analytics-access',
+      url: {controller: 'analytics_plugin/stats', action: :index}
+    }
+  end
+
 end
@@ -13,7 +13,7 @@ end
 class Profile
   def analytics_settings attrs = {}
-    @analytics_settings ||= Noosfero::Plugin::Settings.new self, AnalyticsPlugin, attrs
+    @analytics_settings ||= Noosfero::Plugin::Settings.new self, ::AnalyticsPlugin, attrs
     attrs.each{ |a, v| @analytics_settings.send "#{a}=", v }
     @analytics_settings
   end
@@ -5,6 +5,13 @@ en: &amp;en
       plugin:
         name: 'Access tracking'
         description: 'Register the access of selected profiles'
+        panel_button: 'Access tracking'
+
+    views:
+      stats:
+        user: 'User'
+        initial_time: 'Time'
+        pages: 'Pages'
 en-US:
   <<: *en
@@ -5,6 +5,13 @@ pt: &amp;pt
       plugin:
         name: 'Rastreio de accesso'
         description: 'Registra o acesso de perfis selecionados'
+        panel_button: 'Rastreio de accesso'
+
+    views:
+      stats:
+        user: 'Usuário'
+        initial_time: 'Horário'
+        pages: 'Páginas'
 pt-BR:
   <<: *pt
@@ -25,10 +25,24 @@ class AnalyticsPlugin::PageView &lt; ActiveRecord::Base
   before_validation :fill_referer_page_view, on: :create
   before_validation :fill_visit, on: :create
+  scope :latest, -> { order 'request_started_at DESC' }
+
   def request_duration
     self.request_finished_at - self.request_started_at
   end
+  def initial_time
+    self.page_loaded_at || self.request_finished_at
+  end
+
+  def user_last_time_seen
+    self.initial_time + self.time_on_page
+  end
+
+  def user_on_page?
+    Time.now < self.user_last_time_seen + AnalyticsPlugin::TimeOnPageUpdateInterval
+  end
+
   def page_load!
     self.page_loaded_at = Time.now
     self.update_column :page_loaded_at, self.page_loaded_at
@@ -36,10 +50,9 @@ class AnalyticsPlugin::PageView &lt; ActiveRecord::Base
   def increase_time_on_page!
     now = Time.now
-    initial_time = self.page_loaded_at || self.request_finished_at
-    return unless now > initial_time
+    return unless now > self.initial_time
-    self.time_on_page = now - initial_time
+    self.time_on_page = now - self.initial_time
     self.update_column :time_on_page, self.time_on_page
   end
@@ -59,7 +72,7 @@ class AnalyticsPlugin::PageView &lt; ActiveRecord::Base
   end
   def fill_visit
-    self.visit = self.referer_page_view.visit if self.referer_page_view
+    self.visit = self.referer_page_view.visit if self.referer_page_view and self.referer_page_view.user_on_page?
     self.visit ||= AnalyticsPlugin::Visit.new profile: profile
   end
@@ -3,9 +3,17 @@ class AnalyticsPlugin::Visit &lt; ActiveRecord::Base
   attr_accessible *self.column_names
   attr_accessible :profile
-  default_scope -> { includes :page_views }
-
   belongs_to :profile
   has_many :page_views, class_name: 'AnalyticsPlugin::PageView', dependent: :destroy
+  default_scope -> { joins(:page_views).includes :page_views }
+
+  scope :latest, -> { order 'analytics_plugin_page_views.request_started_at DESC' }
+
+  def first_page_view
+    self.page_views.first
+  end
+
+  delegate :user, :initial_time, to: :first_page_view
+
 end
@@ -31,6 +31,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     first_page_view = @community.page_views.order(:id).first
     assert_equal @request.referer, first_page_view.referer_url
+    assert_equal @user, first_page_view.user
+    assert first_page_view.request_duration > 0 and first_page_view.request_duration < 1
     @request.env['HTTP_REFERER'] = first_url
     get :view_page, profile: @community.identifier, page: @community.articles.last.path.split('/')
@@ -40,9 +42,13 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     second_page_view = @community.page_views.order(:id).last
     assert_equal first_page_view, second_page_view.referer_page_view
-    assert_equal @user, second_page_view.user
-
-    assert second_page_view.request_duration > 0 and second_page_view.request_duration < 1
+    # another visit, the referer is set but should be ignored because
+    # the user didn't report to be on the page until now
+    @request.env['HTTP_REFERER'] = first_url
+    future = Time.now + 2*AnalyticsPlugin::TimeOnPageUpdateInterval
+    Time.stubs(:now).returns(future)
+    get :view_page, profile: @community.identifier, page: @community.articles.last.path.split('/')
+    assert_equal 2, @community.visits.count
   end
 end
 javascript:
   analytics.timeOnPage.baseUrl = #{url_for(controller: 'analytics_plugin/time_on_page').to_json}
-  analytics.timeOnPage.updateInterval = #{AnalyticsPlugin::TimeOnPageUpdateInterval.to_json}
+  analytics.timeOnPage.updateInterval = #{AnalyticsPlugin::TimeOnPageUpdateIntervalMs.to_json}
   analytics.requestId = #{request.env['action_dispatch.request_id'].to_json}
   analytics.init()
@@ -0,0 +1,38 @@
+
+table#analytics-stats.table data-toggle='table' data-striped='true' data-sortable='true' data-icons-prefix='fa'
+  thead
+    - unless profile.analytics_anonymous?
+      th= t'analytics_plugin.views.stats.user'
+    th= t'analytics_plugin.views.stats.initial_time'
+    th= t'analytics_plugin.views.stats.pages'
+
+  tbody
+    - profile.visits.each do |visit|
+      tr
+        td= link_to visit.user.name, visit.user.url
+        td
+          div data-toggle="tooltip" data-title='#{l visit.initial_time}'
+            = time_ago_in_words(visit.initial_time)
+            |&nbsp
+            = _'ago'
+        td
+          - visit.page_views.each do |page_view|
+            = link_to page_view.url, page_view.url
+            |&nbsp;
+            = "(#{distance_of_time_in_words page_view.time_on_page})"
+            |&nbsp;->&nbsp;
+
+javascript:
+  $('#analytics-stats').bootstrapTable({
+    striped: true,
+    columns: [
+      {sortable: true},
+      {sortable: true},
+      {sortable: true},
+    ],
+  })
+
+  $(document).ready(function() {
+    $('[data-toggle="tooltip"]').tooltip()
+  })
+
@@ -0,0 +1,5 @@
+- content_for :head
+  = javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.8.1/bootstrap-table-all.min.js'
+  = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.8.1/bootstrap-table.css'
+
+= render 'table'
@@ -29,8 +29,8 @@ class CommunityTrackPlugin::Step &lt; Folder
   def initialize(*args)
     super(*args)
-    self.start_date ||= Date.today
-    self.end_date ||= Date.today + 1.day
+    self.start_date ||= DateTime.now
+    self.end_date ||= DateTime.now + 1.day
   end
   def set_hidden_position
@@ -72,20 +72,20 @@ class CommunityTrackPlugin::Step &lt; Folder
   end
   def active?
-    (start_date..end_date).include?(Date.today)
+    (start_date..end_date).cover?(DateTime.now)
   end
   def finished?
-    Date.today > end_date
+    DateTime.now > end_date
   end
   def waiting?
-    Date.today < start_date
+    DateTime.now < start_date
   end
   def schedule_activation
     return if !changes['start_date'] && !changes['end_date']
-    if Date.today <= end_date || accept_comments
+    if DateTime.now <= end_date || accept_comments
       schedule_date = !accept_comments ? start_date : end_date + 1.day
       CommunityTrackPlugin::ActivationJob.find(id).destroy_all
       Delayed::Job.enqueue(CommunityTrackPlugin::ActivationJob.new(self.id), :run_at => schedule_date)
@@ -5,7 +5,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   def setup
     @profile = Community.create!(:name => 'Sample community', :identifier => 'sample-community')
     @track = create_track('track', @profile)
-    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today, :tool_type => TinyMceArticle.name)
+    @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day, :tool_type => TinyMceArticle.name)
     user = create_user('testinguser')
     login_as(user.login)
@@ -9,7 +9,7 @@ class StepTest &lt; ActiveSupport::TestCase
     @track.add_category(@category)
     @track.save!
-    @step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    @step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day - 1.day)
     Delayed::Job.destroy_all
   end
@@ -22,39 +22,39 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'set accept_comments to false on create' do
-    today = Date.today
+    today = DateTime.now
     step = CommunityTrackPlugin::Step.create(:name => 'Step', :body => 'body', :profile => @profile, :parent => @track, :start_date => today, :end_date => today, :published => true)
     refute step.accept_comments
   end
   should 'do not allow step creation with a parent that is not a track' do
-    today = Date.today
+    today = DateTime.now
     blog = fast_create(Blog)
     step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => blog, :start_date => today, :end_date => today, :published => true)
     refute step.save
   end
   should 'do not allow step creation without a parent' do
-    today = Date.today
+    today = DateTime.now
     step = CommunityTrackPlugin::Step.new(:name => 'Step', :body => 'body', :profile => @profile, :parent => nil, :start_date => today, :end_date => today, :published => true)
     refute step.save
   end
   should 'create step if end date is equal to start date' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today
+    @step.start_date = DateTime.now
+    @step.end_date = DateTime.now
     assert @step.save
   end
   should 'create step if end date is after start date' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today + 1.day
+    @step.start_date = DateTime.now
+    @step.end_date = DateTime.now + 1.day
     assert @step.save
   end
   should 'do not create step if end date is before start date' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today - 1.day
+    @step.start_date = DateTime.now
+    @step.end_date = DateTime.now - 1.day
     refute @step.save
   end
@@ -71,20 +71,20 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'be active if today is between start and end dates' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today + 1.day
+    @step.start_date = DateTime.now
+    @step.end_date = DateTime.now + 1.day
     assert @step.active?
   end
   should 'be finished if today is after the end date' do
-    @step.start_date = Date.today - 2.day
-    @step.end_date = Date.today - 1.day
+    @step.start_date = DateTime.now - 2.day
+    @step.end_date = DateTime.now - 1.day
     assert @step.finished?
   end
   should 'be waiting if today is before the end date' do
-    @step.start_date = Date.today + 1.day
-    @step.end_date = Date.today + 2.day
+    @step.start_date = DateTime.now + 1.day
+    @step.end_date = DateTime.now + 2.day
     assert @step.waiting?
   end
@@ -95,17 +95,17 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'create delayed job' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today
+    @step.start_date = DateTime.now.beginning_of_day
+    @step.end_date = DateTime.now.end_of_day
     @step.accept_comments = false
     @step.schedule_activation
     assert_equal 1, Delayed::Job.count
-    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+    assert_equal @step.start_date, Delayed::Job.first.run_at
   end
   should 'do not duplicate delayed job' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today
+    @step.start_date = DateTime.now
+    @step.end_date = DateTime.now
     @step.schedule_activation
     assert_equal 1, Delayed::Job.count
     @step.schedule_activation
@@ -113,30 +113,30 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'create delayed job when a step is saved' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today
+    @step.start_date = DateTime.now.beginning_of_day
+    @step.end_date = DateTime.now.end_of_day
     @step.save!
-    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+    assert_equal @step.start_date, Delayed::Job.first.run_at
   end
   should 'create delayed job even if start date has passed' do
-    @step.start_date = Date.today - 2.days
-    @step.end_date = Date.today
+    @step.start_date = DateTime.now - 2.days
+    @step.end_date = DateTime.now.end_of_day
     @step.accept_comments = false
     @step.schedule_activation
-    assert_equal @step.start_date, Delayed::Job.first.run_at.to_date
+    assert_equal @step.start_date, Delayed::Job.first.run_at
   end
   should 'create delayed job if end date has passed' do
-    @step.start_date = Date.today - 5.days
-    @step.end_date = Date.today - 2.days
+    @step.start_date = DateTime.now - 5.days
+    @step.end_date = DateTime.now - 2.days
     @step.schedule_activation
-    assert_equal @step.end_date + 1.day, Delayed::Job.first.run_at.to_date
+    assert_equal @step.end_date + 1.day, Delayed::Job.first.run_at
   end
   should 'do not schedule delayed job if save but do not modify date fields' do
-    @step.start_date = Date.today
-    @step.end_date = Date.today
+    @step.start_date = DateTime.now
+    @step.end_date = DateTime.now.end_of_day
     @step.save!
     assert_equal 1, Delayed::Job.count
     Delayed::Job.destroy_all
@@ -149,13 +149,13 @@ class StepTest &lt; ActiveSupport::TestCase
     refute @step.position
     @step.save!
     assert_equal 1, @step.position
-    step2 = CommunityTrackPlugin::Step.new(:name => 'Step2', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step2 = CommunityTrackPlugin::Step.new(:name => 'Step2', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day)
     step2.save!
     assert_equal 2, step2.position
   end
   should 'accept comments if step is active' do
-    @step.start_date = Date.today
+    @step.start_date = DateTime.now
     @step.save!
     refute @step.accept_comments
     @step.toggle_activation
@@ -164,8 +164,8 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'do not accept comments if step is not active' do
-    @step.start_date = Date.today + 2.days
-    @step.end_date = Date.today + 3.days
+    @step.start_date = DateTime.now + 2.days
+    @step.end_date = DateTime.now + 3.days
     @step.save!
     refute @step.published
     @step.toggle_activation
@@ -174,14 +174,14 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'do not accept comments if step is not active anymore' do
-    @step.start_date = Date.today
+    @step.end_date = DateTime.now.end_of_day
     @step.save!
     @step.toggle_activation
     @step.reload
     assert @step.accept_comments
-    @step.start_date = Date.today - 2.days
-    @step.end_date = Date.today - 1.day
+    @step.start_date = DateTime.now - 2.days
+    @step.end_date = DateTime.now - 1.day
     @step.save!
     @step.toggle_activation
     @step.reload
@@ -203,7 +203,7 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'change position to botton if a hidden step becomes visible' do
-    step1 = CommunityTrackPlugin::Step.new(:name => 'Step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step1 = CommunityTrackPlugin::Step.new(:name => 'Step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day)
     step1.save!
     @step.hidden = true
     @step.save!
@@ -215,7 +215,7 @@ class StepTest &lt; ActiveSupport::TestCase
   should 'decrement lower items positions if a step becomes hidden' do
     @step.save!
-    step1 = CommunityTrackPlugin::Step.new(:name => 'Step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
+    step1 = CommunityTrackPlugin::Step.new(:name => 'Step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => DateTime.now.end_of_day, :start_date => DateTime.now.beginning_of_day)
     step1.save!
     assert_equal 2, step1.position
     @step.hidden = true
@@ -225,7 +225,7 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'do not publish a hidden step' do
-    @step.start_date = Date.today
+    @step.start_date = DateTime.now
     @step.hidden = true
     @step.save!
     refute @step.published
@@ -266,7 +266,7 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'enable comments on children when step is activated' do
-    @step.start_date = Date.today
+    @step.start_date = DateTime.now
     @step.save!
     refute @step.accept_comments
     article = fast_create(Article, :parent_id => @step.id, :profile_id => @step.profile.id, :accept_comments => false)
@@ -276,8 +276,7 @@ class StepTest &lt; ActiveSupport::TestCase
   end
   should 'enable comments on children when step is active' do
-    @step.start_date = Date.today
-    @step.start_date = Date.today
+    @step.start_date = DateTime.now
     @step.save!
     refute @step.accept_comments
     @step.toggle_activation
@@ -30,13 +30,13 @@ class EventPlugin::EventBlock &lt; Block
     events = user.nil? ? events.is_public : events.display_filter(user,nil)
     if future_only
-      events = events.where('start_date >= ?', Date.today)
+      events = events.where('start_date >= ?', DateTime.now.beginning_of_day)
     end
     if date_distance_limit > 0
       events = events.by_range([
-        Date.today - date_distance_limit,
-        Date.today + date_distance_limit
+        DateTime.now.beginning_of_day - date_distance_limit,
+        DateTime.now.beginning_of_day + date_distance_limit
       ])
     end
@@ -7,7 +7,7 @@ class HomeControllerTest &lt; ActionController::TestCase
     @env.enable_plugin('EventPlugin')
     @p1  = fast_create(Person, :environment_id => @env.id)
-    @e1a = fast_create(Event, :name=>'Event p1 A', :profile_id=>@p1.id)
+    @e1a = Event.create!(:name=>'Event p1 A', :profile =>@p1)
     box = Box.create!(:owner => @env)
     @block = EventPlugin::EventBlock.create!(:box => box)
@@ -19,6 +19,7 @@ class HomeControllerTest &lt; ActionController::TestCase
   should 'see events microdata sturcture' do
     get :index
+#raise response.body.inspect
     assert_select '.event-plugin_event-block ul.events'
     assert_select ev
     assert_select ev + 'a[itemprop="url"]'
@@ -33,15 +34,15 @@ class HomeControllerTest &lt; ActionController::TestCase
   should 'see event duration' do
     @e1a.slug = 'event1a'
-    @e1a.start_date = Date.today
-    @e1a.end_date = Date.today + 1.day
+    @e1a.start_date = DateTime.now
+    @e1a.end_date = DateTime.now + 1.day
     @e1a.save!
     get :index
     assert_select ev + 'time.duration[itemprop="endDate"]', /1 day/
     @e1a.slug = 'event1a'
-    @e1a.start_date = Date.today
-    @e1a.end_date = Date.today + 2.day
+    @e1a.start_date = DateTime.now
+    @e1a.end_date = DateTime.now + 2.day
     @e1a.save!
     get :index
     assert_select ev + 'time.duration[itemprop="endDate"]', /2 days/
@@ -52,8 +53,8 @@ class HomeControllerTest &lt; ActionController::TestCase
     assert_select ev + 'time.duration[itemprop="endDate"]', false
     @e1a.slug = 'event1a'
-    @e1a.start_date = Date.today
-    @e1a.end_date = Date.today
+    @e1a.start_date = DateTime.now
+    @e1a.end_date = DateTime.now
     @e1a.save!
     get :index
     assert_select ev + 'time.duration[itemprop="endDate"]', false
@@ -2,7 +2,7 @@
 <ul class="events">
   <% block.events(user).map do |event| %>
-    <% days_left = ( event.start_date - Date.today ).round %>
+    <% days_left = ( (event.start_date - DateTime.now)/60/60/24 ).round %>
       <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Event" class="event">
         <%= render(
               :file => 'event_plugin/event_block_item',
@@ -0,0 +1,10 @@
+gem 'slim'
+
+# for backwards compatibility of serialized objects
+gem 'fb_graph'
+
+gem 'fb_graph2'
+
+gem 'facebook-signed-request'
+
+
@@ -0,0 +1,47 @@
+page_tab:
+  use_test_app: false
+timeline:
+  use_test_app: true
+
+test_users:
+  - identifier1
+  - identifier1
+
+app:
+  id: xxx
+  secret: xxx
+  domain: domainconfigured.net
+
+  open_graph:
+    namespace: app_name
+    objects:
+      blog_post: article
+      community: community
+      enterprise: sse_initiative
+      favorite_enterprise: sse_initiative
+      forum: discussion
+      event: event
+      friend: friend
+      gallery_image: picture
+      person: user
+      product: sse_product
+      uploaded_file: document
+    actions:
+      add: add 
+      comment: comment
+      create: create
+      favorite: favorite
+      like: like
+      make_friendship:  make_friendship
+      upload: upload
+      update: update
+      start: start
+      announce_creation: announce_creation
+      announce_new: announce_new
+      announce_update: announce_update
+      announce_news: announce_news
+
+test_app: 
+  test_id:  xxx
+  test_secret:  xxx
+
@@ -0,0 +1,59 @@
+class FbAppPluginMyprofileController < OpenGraphPlugin::MyprofileController
+
+  no_design_blocks
+
+  before_filter :load_provider
+  before_filter :load_auth
+
+  def index
+    if params[:tabs_added]
+      @page_tabs = FbAppPlugin::PageTab.create_from_tabs_added params[:tabs_added], params[:page_tab]
+      @page_tab = @page_tabs.first
+      redirect_to @page_tab.facebook_url
+    end
+  end
+
+  def show_login
+    @status = params[:auth].delete :status
+    @logged_auth = FbAppPlugin::Auth.new params[:auth]
+    @logged_auth.fetch_user
+    if @auth.connected?
+      render partial: 'identity', locals: {auth: @logged_auth}
+    else
+      render nothing: true
+    end
+  end
+
+  def save_auth
+    @status = params[:auth].delete :status rescue FbAppPlugin::Auth::Status::Unknown
+    if @status == FbAppPlugin::Auth::Status::Connected
+      @auth.attributes = params[:auth]
+      @auth.save! if @auth.changed?
+    else
+      @auth.destroy if @auth and @auth.persisted?
+      @auth = new_auth
+    end
+
+    render partial: 'settings'
+  end
+
+  protected
+
+  def load_provider
+    @provider = FbAppPlugin.oauth_provider_for environment
+  end
+
+  def load_auth
+    @auth = FbAppPlugin::Auth.where(profile_id: profile.id, provider_id: @provider.id).first
+    @auth ||= new_auth
+  end
+
+  def new_auth
+    FbAppPlugin::Auth.new profile: profile, provider: @provider
+  end
+
+  def context
+    :fb_app
+  end
+
+end
@@ -0,0 +1,24 @@
+class FbAppPluginController < PublicController
+
+  no_design_blocks
+
+  def index
+  end
+
+  def myprofile_config
+    if logged_in?
+      redirect_to controller: :fb_app_plugin_myprofile, profile: user.identifier
+    else
+      redirect_to controller: :account, action: :login, return_to: url_for(controller: :fb_app_plugin, action: :myprofile_config)
+    end
+  end
+
+  protected
+
+  # prevent session reset because X-CSRF not being passed by FB
+  # see also https://gist.github.com/toretore/911886
+  def handle_unverified_request
+  end
+
+end
+
@@ -0,0 +1,173 @@
+class FbAppPluginPageTabController < FbAppPluginController
+
+  no_design_blocks
+
+  before_filter :change_theme
+  before_filter :disable_cache
+
+  include CatalogHelper
+
+  helper ManageProductsHelper
+  helper FbAppPlugin::DisplayHelper
+
+  def index
+    return unless load_page_tabs
+
+    if params[:tabs_added]
+      @page_tabs = FbAppPlugin::PageTab.create_from_tabs_added params[:tabs_added]
+      @page_tab = @page_tabs.first
+      redirect_to @page_tab.facebook_url
+    elsif @signed_request or @page_id
+      if @page_tab.present?
+        if product_id = params[:product_id]
+          @product = environment.products.find product_id
+          @profile = @product.profile
+          @inputs = @product.inputs
+          @allowed_user = false
+          load_catalog
+
+          render action: 'product'
+        elsif @page_tab.config_type.in? [:profile, :own_profile]
+          @profile = @page_tab.value
+
+          load_catalog
+          render action: 'catalog' unless performed?
+        else
+          # fake profile for catalog controller
+          @profile = environment.enterprise_default_template
+          @profile.shopping_cart_settings.enabled = true
+
+          base_query = @page_tab.value
+          params[:base_query] = base_query
+          params[:scope] = 'all'
+
+          load_catalog
+          render action: 'catalog' unless performed?
+        end
+      else
+        render action: 'first_load'
+      end
+    else
+      # render template
+      render action: 'index'
+    end
+  end
+
+  def search_autocomplete
+    load_page_tabs
+    load_search_autocomplete
+    respond_to do |format|
+      format.json{ render 'catalog/search_autocomplete' }
+    end
+  end
+
+  def admin
+    return redirect_to '/plugin/fb_app/myprofile_config' if params[:page_id].blank? and params[:signed_request].blank?
+    return unless load_page_tabs
+
+    if request.put? and @page_id.present?
+      create_page_tabs if @page_tab.nil?
+
+      @page_tab.update_attributes! params[:page_tab]
+
+      respond_to do |format|
+        format.js{ render action: 'admin' }
+      end
+    end
+  end
+
+  def destroy
+    @page_tab = FbAppPlugin::PageTab.find params[:id]
+    return render_access_denied unless user.present? and (user.is_admin?(environment) or user.is_admin? @page_tab.profile)
+    @page_tab.destroy
+    render nothing: true
+  end
+
+  def uninstall
+    render text: params.to_yaml
+  end
+
+  def enterprise_search
+    scope = environment.enterprises.enabled.public
+    @query = params[:query]
+    @profiles = scope.limit(10).order('name ASC').
+      where(['name ILIKE ? OR name ILIKE ? OR identifier LIKE ?', "#{@query}%", "% #{@query}%", "#{@query}%"])
+    render partial: 'open_graph_plugin/myprofile/profile_search', locals: {profiles: @profiles}
+  end
+
+  # unfortunetely, this needs to be public
+  def profile
+    @profile
+  end
+
+  protected
+
+  def default_url_options
+    {profile: @profile.identifier} if @profile
+  end
+
+  def load_page_tabs
+    @signed_requests = read_param params[:signed_request]
+    if @signed_requests.present?
+      @datas = []
+      @page_ids = @signed_requests.map do |signed_request|
+        @data = FbAppPlugin::Auth.parse_signed_request signed_request
+        @datas << @data
+        page_id = @data[:page][:id] rescue nil
+        if page_id.blank?
+          render_not_found
+          return false
+        end
+        page_id
+      end
+    else
+      @page_ids = read_param params[:page_id]
+    end
+
+    @page_tabs = FbAppPlugin::PageTab.where page_id: @page_ids
+
+    @signed_request = @signed_requests.first
+    @page_id = @page_ids.first
+    @page_tab = @page_tabs.first
+    @new_request = @page_tab.blank?
+
+    true
+  end
+
+  def create_page_tabs
+    @page_tabs = FbAppPlugin::PageTab.create_from_page_ids @page_ids
+    @page_tab ||= @page_tabs.first
+  end
+
+  def change_theme
+    # move to config
+    unless theme_responsive?
+      @current_theme = 'ees'
+      @theme_responsive = true
+    end
+    @without_pure_chat = true
+  end
+  def get_layout
+    return nil if request.format == :js or request.xhr?
+
+    return 'application-responsive'
+  end
+
+  def disable_cache
+    @disable_cache_theme_navigation = true
+  end
+
+  def load_catalog options = {}
+    @use_show_more = true
+    catalog_load_index options
+  end
+
+  def read_param param
+    if param.is_a? Hash
+      param.values
+    else
+      Array(param).select{ |p| p.present? }
+    end
+  end
+
+end
@@ -0,0 +1,16 @@
+class CreateFbAppPageTabConfig < ActiveRecord::Migration
+
+  def change
+    create_table :fb_app_plugin_page_tab_configs do |t|
+      t.string :page_id
+      t.text :config, default: {}.to_yaml
+      t.integer :profile_id
+
+      t.timestamps
+    end
+    add_index :fb_app_plugin_page_tab_configs, [:profile_id]
+    add_index :fb_app_plugin_page_tab_configs, [:page_id]
+    add_index :fb_app_plugin_page_tab_configs, [:page_id, :profile_id]
+  end
+
+end
@@ -0,0 +1,3 @@
+system "script/noosfero-plugins -q enable oauth_client"
+system "script/noosfero-plugins -q enable open_graph"
+
@@ -0,0 +1,28 @@
+require_dependency 'profile'
+# hate to wrte this, but without Noosfero::Plugin::Settings is loaded instead
+require 'fb_app_plugin/settings'
+
+# attr_accessible must be defined on subclasses
+Profile.descendants.each do |subclass|
+  subclass.class_eval do
+    attr_accessible :fb_app_settings
+  end
+end
+
+class Profile
+
+  def fb_app_settings attrs = {}
+    @fb_app_settings ||= FbAppPlugin::Settings.new self, attrs
+    attrs.each{ |a, v| @fb_app_settings.send "#{a}=", v }
+    @fb_app_settings
+  end
+  alias_method :fb_app_settings=, :fb_app_settings
+
+  has_many :fb_app_page_tabs, class_name: 'FbAppPlugin::PageTab'
+
+  def fb_app_auth
+    provider = FbAppPlugin.oauth_provider_for self.environment
+    self.oauth_auths.where(provider_id: provider.id).first
+  end
+
+end
@@ -0,0 +1,87 @@
+module FbAppPlugin
+
+  extend Noosfero::Plugin::ParentMethods
+
+  def self.plugin_name
+    I18n.t 'fb_app_plugin.lib.plugin.name'
+  end
+
+  def self.plugin_description
+    I18n.t 'fb_app_plugin.lib.plugin.description'
+  end
+
+  def self.config
+    @config ||= HashWithIndifferentAccess.new(YAML.load File.read("#{File.dirname __FILE__}/../config.yml")) rescue {}
+  end
+
+  def self.test_users
+    @test_users ||= self.config[:test_users]
+  end
+  def self.test_user? user
+    user and (self.test_users.blank? or self.test_users.include? user.identifier)
+  end
+
+  def self.debug? actor=nil
+    self.test_user? actor
+  end
+
+  def self.scope user
+    if self.test_user? user then 'publish_actions' else '' end
+  end
+
+  def self.oauth_provider_for environment
+    return unless self.config.present?
+
+    @oauth_providers ||= {}
+    @oauth_providers[environment] ||= begin
+      app_id = self.timeline_app_credentials[:id].to_s
+      app_secret = self.timeline_app_credentials[:secret].to_s
+
+      client = environment.oauth_providers.where(client_id: app_id).first
+      # attributes that may be changed by the user
+      client ||= OauthClientPlugin::Provider.new strategy: 'facebook',
+        name: 'FB App', site: 'https://facebook.com'
+
+      # attributes that should not change
+      client.attributes = {
+        client_id: app_id, client_secret: app_secret,
+        environment_id: environment.id,
+      }
+      client.save! if client.changed?
+
+      client
+    end
+  end
+
+  def self.open_graph_config
+    return unless self.config.present?
+
+    @open_graph_config ||= begin
+      key = if self.config[:timeline][:use_test_app] then :test_app else :app end
+      self.config[key][:open_graph]
+    end
+  end
+
+  def self.credentials app = :app
+    return unless self.config.present?
+    {id: self.config[app][:id], secret: self.config[app][:secret]}
+  end
+
+  def self.timeline_app_credentials
+    return unless self.config.present?
+    @timeline_app_credentials ||= begin
+      key = if self.config[:timeline][:use_test_app] then :test_app else :app end
+      self.credentials key
+    end
+  end
+
+  def self.page_tab_app_credentials
+    return unless self.config.present?
+    @page_tab_app_credentials ||= begin
+      key = if self.config[:page_tab][:use_test_app] then :test_app else :app end
+      self.credentials key
+    end
+  end
+
+end
+
@@ -0,0 +1,35 @@
+class FbAppPlugin::Base < Noosfero::Plugin
+
+  def stylesheet?
+    true
+  end
+
+  def js_files
+    ['fb_app.js'].map{ |j| "javascripts/#{j}" }
+  end
+
+  def head_ending
+    return unless FbAppPlugin.config.present?
+    lambda do
+      tag 'meta', property: 'fb:app_id', content: FbAppPlugin.config[:app][:id]
+    end
+  end
+
+  def control_panel_buttons
+    return unless FbAppPlugin.config.present?
+    { title: FbAppPlugin.plugin_name, icon: 'fb-app', url: {host: FbAppPlugin.config[:app][:domain], profile: profile.identifier, controller: :fb_app_plugin_myprofile} }
+  end
+
+end
+
+ActiveSupport.on_load :open_graph_plugin do
+  OpenGraphPlugin::Stories.register_publisher FbAppPlugin::Publisher.default
+end
+ActiveSupport.on_load :metadata_plugin do
+  MetadataPlugin::Controllers.class_eval do
+    def fb_app_plugin_page_tab
+      :@product
+    end
+  end
+end
+
@@ -0,0 +1,51 @@
+module FbAppPlugin::DisplayHelper
+
+  extend CatalogHelper
+
+  def fb_url_options options
+    options.merge! page_id: @page_ids, signed_request: @signed_requests, id: nil
+  end
+
+  def url_for options = {}
+    return super unless options.is_a? Hash
+    if options[:controller] == :catalog
+      options[:controller] = :fb_app_plugin_page_tab
+      options = fb_url_options options
+    end
+    super
+  end
+
+  protected
+
+  def product_url_options product, options = {}
+    options = options.merge! product.url
+    options = options.merge! controller: :fb_app_plugin_page_tab, product_id: product.id, action: :index
+    options = fb_url_options options
+    unless Rails.env.development?
+      domain = FbAppPlugin.config[:app][:domain]
+      options[:host] = domain if domain.present?
+      options[:protocol] = '//'
+    end
+    options
+  end
+  def product_path product, options = {}
+    url = url_for product_url_options(product, options = {})
+    url
+  end
+
+  def link_to_product product, opts = {}
+    url_opts = opts.delete(:url_options) || {}
+    url_opts = product_url_options product, url_opts
+    url = params.merge url_opts
+    link_to content_tag('span', product.name), url,
+      opts.merge(target: '')
+  end
+
+  def link_to name = nil, options = nil, html_options = nil, &block
+    html_options ||= {}
+    options[:protocol] = '//' if options.is_a? Hash
+    html_options[:target] ||= '_parent'
+    super
+  end
+
+end
@@ -0,0 +1,14 @@
+# add target attribute to links
+class FbAppPlugin::LinkRenderer < WillPaginate::ActionView::LinkRenderer
+
+  def prepare collection, options, template
+    super
+  end
+
+  protected
+
+  def default_url_params
+    {target: ''}
+  end
+
+end
@@ -0,0 +1,17 @@
+# Publishing examples on console
+#   pub=FbAppPlugin::Publisher.default; u=Profile['brauliobo']; a=Article.find 307591
+#   pub.publish_story a, u, :announce_news_from_a_sse_initiative
+#
+#   pub=FbAppPlugin::Publisher.default; u=Profile['brauliobo']; f=FavoriteEnterprisePerson.last
+#   pub.publish_story f, u, :favorite_a_sse_initiative
+#
+class FbAppPlugin::Publisher < OpenGraphPlugin::Publisher
+
+  def publish_story object_data, actor, story
+    OpenGraphPlugin.context = FbAppPlugin::Activity.context
+    a = FbAppPlugin::Activity.new object_data: object_data, actor: actor, story: story
+    a.dispatch_publications
+    a.save
+  end
+
+end
@@ -0,0 +1,4 @@
+class FbAppPlugin::Settings < OpenGraphPlugin::Settings
+
+end
+
@@ -0,0 +1,83 @@
+
+"en-US": &en-US
+
+  fb_app_plugin:
+    lib:
+      plugin:
+        name: 'Facebook integration'
+        description: 'Use the app for Facebook!'
+    models:
+      page_tab:
+        types:
+          own_profile: 'Catalog from this enterprise'
+          profile: 'Catalog from a single SSE enterprise'
+          other_profile: 'Catalog from other SSE enterprise'
+          profiles: 'Catalog from more than one SSE enterprise'
+          query: 'Catalog of products chosen by filter or free search'
+    views:
+      myprofile:
+        checking_auth: 'Checking authorization'
+        different_login: 'But you are logged in on facebook as:'
+        current_login: 'You are logged in on facebook as:'
+        connect: 'I want to install the app for Facebook'
+        logged_connect: 'Connect this Facebook account with my user %{profile}'
+        disconnect: 'Disconnect'
+        connect_to_another: 'Conect to another Facebook account'
+        reconnect: 'Reconnect'
+
+        timeline:
+          heading: 'Publishing in your facebook'
+          add: 'Save timeline post settings'
+          explanation_title: 'Soon!'
+          explanation_text: 'In a short time, your actions will become new posts in your Facebook timeline!'
+          organization_redirect: '%{redirect_link} to post updates %{type}, conect your personal profile to Facebook.'
+          organization_from_enterprise: 'from this enterprise'
+          organization_from_community: 'from this community'
+          redirect_link: 'Click here'
+
+        catalogs:
+          heading: 'Solidarity Economy Catalog'
+          new: 'Add new catalog'
+          catalog_title_label: 'Title'
+          catalog_subtitle_label: 'Subtitle'
+          catalog_type_chooser_label: 'Type'
+          profile_chooser_label: 'Enterprise'
+          profiles_chooser_label: 'Enterprises'
+          query_label: "Criteria for the catalog's products"
+          query_help: "Write the words separated by space, and click at the button below to save."
+          edit_button: "Edit catalog '%{catalog_title}'"
+          remove_button: "Remove catalog '%{catalog_title}'"
+          cancel_button: 'Cancel'
+          confirm_removal: "<p>Warning: To really remove a catalog, you must go to the facebook page where it is, click at '<u>add or remove tabs</u>' and then remove the tab.</p><p>After that, you can come here and remove the catalog from our settings.</p><p>Are you sure you want to remove this catalog?</p>"
+          confirm_removal_button: 'Yes, I want to delete this catalog'
+          confirm_disconnect: "<p>Warning: If you disconnect your account to this Facebook profile, all your catalogs will also be removed</p><p>And then, to really remove your catalogs (if they were created), you must go to the facebook page where it is, click at '<u>add or remove tabs</u>' and then remove the tab.</p><p>After that, you can come here and disconnect.</p><p>Are you sure you want to disconnect your account to this Facebook profile?</p>"
+          confirm_disconnect_button: 'Yes, I want to disconnect my account from this Facebook profile'
+
+        catalog:
+          see_page: 'See page on Facebook'
+
+        error:
+          empty_title: 'Please add a title to your catalog.'
+          empty_settings: 'Please choose SSE enterprises or search terms or filters for your catalog.'
+
+      page_tab:
+        edit_catalog: 'Edit catalog'
+        add: 'Add catalog to one of my pages on Facebook'
+        save: 'Save'
+        added_notice: "Congratulations: You've just published a new SSE catalog in Facebook!"
+        profile:
+          placeholder: "select an enterprise"
+        profiles:
+          placeholder: "select the enterprises"
+        query:
+          placeholder: "select the category or type the search terms"
+        back_to_catalog: 'Back to catalog'
+        footer1: ""
+        footer2: ""
+
+
+'en_US':
+  <<: *en-US
+'en':
+  <<: *en-US
+
@@ -0,0 +1,82 @@
+
+"pt-BR": &pt-BR
+
+  fb_app_plugin:
+    lib:
+      plugin:
+        name: 'App Facebook'
+        description: 'Divulgue suas ações no Facebook!'
+    models:
+      page_tab:
+        types:
+          own_profile: 'Vitrine deste empreendimento'
+          profile: 'Vitrine de um único empreendimento'
+          other_profile: 'Vitrine de outro empreendimento'
+          profiles: 'Vitrine de mais de um empreendimento'
+          query: 'Vitrine de produtos ou serviços escolhidos por busca livre'
+    views:
+      myprofile:
+        checking_auth: 'Verificando autorização de acesso'
+        different_login: 'Mas você está logado no facebook como:'
+        current_login: 'Você está logado no facebook como:'
+        connect: 'Quero instalar o App Facebook'
+        logged_connect: 'Quero conectar esta conta do Facebook com meu usuário %{profile}'
+        disconnect: 'Desconectar'
+        connect_to_another: 'Conectar a outra conta do Facebook'
+        reconnect: 'Reconectar'
+
+        timeline:
+          heading: 'Postar ações no facebook automaticamente:'
+          add: 'Salvar configuração de postagens na timeline'
+          explanation_title: 'Aguarde!'
+          explanation_text: 'Em breve, este aplicativo poderá postar automaticamente no seu face as ações que você fizer! Por exemplo: quando você postar novos conteúdos no seu blog, enviar uma imagem, etc.'
+          organization_redirect: '%{redirect_link} para postar atualizações %{type}, conecte o seu perfil pessoal ao facebook.'
+          organization_from_enterprise: 'deste empreendimento'
+          organization_from_community: 'desta comunidade'
+          redirect_link: 'Clique aqui'
+
+        catalogs:
+          heading: 'Vitrine'
+          new: 'Criar nova vitrine'
+          catalog_title_label: 'Título'
+          catalog_subtitle_label: 'Subtítulo'
+          catalog_type_chooser_label: 'Tipo'
+          profile_chooser_label: 'Empreendimento'
+          profiles_chooser_label: 'Empreendimentos'
+          query_label: "Critérios para os produtos/serviços da vitrine"
+          query_help: "Escreva as palavras separadas por espaço, e clique no botão abaixo para salvar."
+          edit_button: "Editar vitrine '%{catalog_title}'"
+          remove_button: "Remover vitrine '%{catalog_title}'"
+          cancel_button: 'Cancelar'
+          confirm_removal: "<p><b>Atenção:</b> Para realmente apagar uma vitrine, você deve primeiro ir para a página do Facebook onde está a sua vitrine e seguir este roteiro:</p><ul><li>Clique em '<i>Mais</i>' na barra da página, depois em '<i>Gerenciar guias</i>', e então em  '<i>Adicionar ou remover guias</i>'.</li><li>. Clique no X para remover.</li></ul><p>Depois disso, você pode vir aqui e pedir para remover a vitrine.</p><p>Se você já removeu lá no Facebook, tem certeza que quer remover esta vitrine?</p>"
+          confirm_removal_button: 'Sim, quero remover esta vitrine'
+          confirm_disconnect: "<p><b>Atenção:</b> Se você desconectar, vai apagar todas as vitrines. Portanto, para realmente apagar suas vitrines, você deve primeiro ir para a página do Facebook onde está a sua vitrine e seguir este roteiro:</p><ul><li>Clique em '<i>Mais</i>' na barra da página, depois em '<i>Gerenciar guias</i>', e então em  '<i>Adicionar ou remover guias</i>'.</li><li>Clique no X para remover.</li></ul><p>Depois disso, você pode vir aqui e desconectar.</p><p>Tem certeza que quer desconectar?</p>"
+          confirm_disconnect_button: 'Sim, quero desconectar'
+
+        catalog:
+          see_page: 'Ver página no facebook'
+
+        error:
+          empty_title: 'Por favor, coloque um título para a sua vitrine.'
+          empty_settings: 'Por favor, selecione os empreendimentos solidários ou os termos de busca para sua vitrine.'
+
+      page_tab:
+        edit_catalog: 'Editar vitrine'
+        add: 'Criar vitrine em uma página sua no Facebook'
+        save: 'Salvar'
+        added_notice: 'Parabéns: você acaba de publicar uma nova vitrine da Economia Solidária no Facebook!'
+        profile:
+          placeholder: "selecione um empreendimento"
+        profiles:
+          placeholder: "selecione os empreendimentos"
+        query:
+          placeholder: "escolha os produtos e serviços por palavras de busca"
+        back_to_catalog: 'Voltar à vitrine'
+        footer1: ""
+        footer2: ""
+
+'pt_BR':
+  <<: *pt-BR
+'pt':
+  <<: *pt-BR
+
@@ -0,0 +1,54 @@
+class FbAppPlugin::Activity < OpenGraphPlugin::Activity
+
+  self.context = :fb_app
+  self.actions = FbAppPlugin.open_graph_config[:actions]
+  self.objects = FbAppPlugin.open_graph_config[:objects]
+
+  # this avoid to many saves for frequent fail cases
+  attr_accessor :should_save
+  validates_presence_of :should_save
+
+  def self.scrape object_data_url
+    params = {id: object_data_url, scrape: true, method: 'post'}
+    url = "http://graph.facebook.com?#{params.to_query}"
+    Net::HTTP.get URI.parse(url)
+  end
+  def scrape
+    self.class.scrape self.object_data_url
+  end
+
+  def publish! actor = self.actor
+    print_debug "fb_app: action #{self.action}, object_type #{self.object_type}" if debug? actor
+
+    auth = actor.fb_app_auth
+    return if auth.blank? or auth.expired?
+    print_debug "fb_app: Auth found and is valid" if debug? actor
+
+    # always update the object to expire facebook cache
+    Thread.new{ self.scrape }
+
+    return if self.defs[:on] == :update and self.recent_publish? actor, self.object_type, self.object_data_url
+    print_debug "fb_app: no recent publication found, making new" if debug? actor
+
+    self.should_save = true
+
+    namespace = FbAppPlugin.open_graph_config[:namespace]
+    # to_str is needed to ensure String, see https://github.com/nov/fb_graph2/issues/88
+    params = {self.object_type => self.object_data_url.to_str}
+    params['fb:explicitly_shared'] = 'true' unless self.defs[:tracker]
+    print_debug "fb_app: publishing with params #{params.inspect}" if debug? actor
+
+    me = FbGraph2::User.me auth.access_token
+    me.og_action! "#{namespace}:#{action}", params
+
+    self.published_at = Time.now
+    print_debug "fb_app: published with success" if debug? actor
+  end
+
+  protected
+
+  def debug? actor=nil
+    super or FbAppPlugin.debug? actor
+  end
+
+end
@@ -0,0 +1,89 @@
+class FbAppPlugin::Auth < OauthClientPlugin::Auth
+
+  module Status
+    Connected = 'connected'
+    NotAuthorized = 'not_authorized'
+    Unknown = 'unknown'
+  end
+
+  settings_items :signed_request
+  settings_items :fb_user
+
+  attr_accessible :provider_user_id, :signed_request
+
+  before_create :update_user
+  before_create :exchange_token
+  after_create :schedule_exchange_token
+  after_destroy :destroy_page_tabs
+  before_validation :set_enabled
+
+  validates_presence_of :provider_user_id
+  validates_uniqueness_of :provider_user_id, scope: :profile_id
+
+  def self.parse_signed_request signed_request, credentials = FbAppPlugin.page_tab_app_credentials
+    secret = credentials[:secret] rescue ''
+    request = Facebook::SignedRequest.new signed_request, secret: secret
+    request.data
+  end
+
+  def status
+    if self.access_token.present? and self.not_expired? then Status::Connected else Status::NotAuthorized end
+  end
+  def not_authorized?
+    self.status == Status::NotAuthorized
+  end
+  def connected?
+    self.status == Status::Connected
+  end
+
+  def exchange_token
+    app_id = FbAppPlugin.timeline_app_credentials[:id]
+    app_secret = FbAppPlugin.timeline_app_credentials[:secret]
+    fb_auth = FbGraph2::Auth.new app_id, app_secret
+    fb_auth.fb_exchange_token = self.access_token
+
+    access_token = fb_auth.access_token!
+    self.access_token = access_token.access_token
+    self.expires_in = access_token.expires_in
+    # refresh user and its stored access token
+    self.fetch_user
+  end
+
+  def exchange_token!
+    self.exchange_token
+    self.save!
+  end
+
+  def signed_request_data
+    self.class.parse_signed_request self.signed_request
+  end
+
+  def fetch_user
+    fb_user = FbGraph2::User.me self.access_token
+    self.fb_user = fb_user.fetch
+  end
+  def update_user
+    self.fb_user = self.fetch_user
+  end
+
+  protected
+
+  def destroy_page_tabs
+    self.profile.fb_app_page_tabs.destroy_all
+  end
+
+  def exchange_token_and_reschedule!
+    self.exchange_token!
+    self.schedule_exchange_token
+  end
+
+  def schedule_exchange_token
+    self.delay(run_at: self.expires_at - 2.weeks).exchange_token_and_reschedule!
+  end
+
+  def set_enabled
+    self.enabled = self.not_expired?
+  end
+
+end
+
@@ -0,0 +1,111 @@
+class FbAppPlugin::PageTab < ActiveRecord::Base
+
+  # FIXME: rename table to match model
+  self.table_name = :fb_app_plugin_page_tab_configs
+
+  attr_accessible :owner_profile, :profile_id, :page_id,
+    :config_type, :profile_ids, :query,
+    :title, :subtitle
+
+  belongs_to :owner_profile, foreign_key: :profile_id, class_name: 'Profile'
+
+  acts_as_having_settings field: :config
+
+  ConfigTypes = [:profile, :profiles, :query]
+  EnterpriseConfigTypes = [:own_profile] + ConfigTypes
+
+  validates_presence_of :page_id
+  validates_uniqueness_of :page_id
+  validates_inclusion_of :config_type, in: ConfigTypes + EnterpriseConfigTypes
+
+  def self.page_ids_from_tabs_added tabs_added
+    tabs_added.map{ |id, value| id }
+  end
+
+  def self.create_from_page_ids page_ids, attrs = {}
+    attrs.delete :page_id
+    page_ids.map do |page_id|
+      page_tab = FbAppPlugin::PageTab.where(page_id: page_id).first
+      page_tab ||= FbAppPlugin::PageTab.new page_id: page_id
+      page_tab.update_attributes! attrs
+      page_tab
+    end
+  end
+  def self.create_from_tabs_added tabs_added, attrs = {}
+    page_ids = self.page_ids_from_tabs_added tabs_added
+    self.create_from_page_ids page_ids, attrs
+  end
+
+  def self.facebook_url page_id
+    "https://facebook.com/#{page_id}?sk=app_#{FbAppPlugin.page_tab_app_credentials[:id]}"
+  end
+
+  def facebook_url
+    self.class.facebook_url self.page_id
+  end
+
+  def types
+    if self.owner_profile.present? and self.owner_profile.enterprise? then EnterpriseConfigTypes else ConfigTypes end
+  end
+
+  def config_type
+    self.config[:type] || (self.owner_profile ? :own_profile : :profile)
+  end
+  def config_type= value
+    self.config[:type] = value.to_sym
+  end
+
+  def value
+    case self.config_type
+    when :profiles
+      self.profiles.map(&:identifier).join(' OR ')
+    else
+      self.send self.config_type
+    end
+  end
+  def blank?
+    self.value.blank? rescue true
+  end
+
+  def own_profile
+    self.owner_profile
+  end
+  def profiles
+    Profile.where(id: self.config[:profile_ids])
+  end
+  def profile
+    self.profiles.first
+  end
+  def profile_ids
+    self.profiles.map(&:id)
+  end
+  def query
+    self.config[:query]
+  end
+
+  def title
+    self.config[:title]
+  end
+  def title= value
+    self.config[:title] = value
+  end
+
+  def subtitle
+    self.config[:subtitle]
+  end
+  def subtitle= value
+    self.config[:subtitle] = value
+  end
+
+  def profile_ids= ids
+    ids = ids.to_s.split(',')
+    self.config[:type] = if ids.size == 1 then :profile else :profiles end
+    self.config[:profile_ids] = ids
+  end
+
+  def query= value
+    self.config[:type] = :query
+    self.config[:query] = value
+  end
+
+end
@@ -0,0 +1,12 @@
+require_dependency 'action_tracker_model'
+
+class ActionTracker::Record
+
+  after_create :fb_app_publish
+
+  protected
+
+  def fb_app_publish
+    raise 'here'
+  end
+end
@@ -0,0 +1 @@
+FB-f-Logo__blue_48.png
 \ No newline at end of file
@@ -0,0 +1,1032 @@
+/*!
+ * bootstrap-tokenfield
+ * https://github.com/sliptree/bootstrap-tokenfield
+ * Copyright 2013-2014 Sliptree and other contributors; Licensed MIT
+ */
+
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // For CommonJS and CommonJS-like environments where a window with jQuery
+    // is present, execute the factory with the jQuery instance from the window object
+    // For environments that do not inherently posses a window with a document
+    // (such as Node.js), expose a Tokenfield-making factory as module.exports
+    // This accentuates the need for the creation of a real window or passing in a jQuery instance
+    // e.g. require("bootstrap-tokenfield")(window); or require("bootstrap-tokenfield")($);
+    module.exports = global.window && global.window.$ ?
+      factory( global.window.$ ) :
+      function( input ) {
+        if ( !input.$ && !input.fn ) {
+          throw new Error( "Tokenfield requires a window object with jQuery or a jQuery instance" );
+        }
+        return factory( input.$ || input );
+      };
+  } else {
+    // Browser globals
+    factory(jQuery, window);
+  }
+}(function ($, window) {
+
+  "use strict"; // jshint ;_;
+
+ /* TOKENFIELD PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Tokenfield = function (element, options) {
+    var _self = this
+
+    this.$element = $(element)
+    this.textDirection = this.$element.css('direction');
+
+    // Extend options
+    this.options = $.extend(true, {}, $.fn.tokenfield.defaults, { tokens: this.$element.val() }, this.$element.data(), options)
+
+    // Setup delimiters and trigger keys
+    this._delimiters = (typeof this.options.delimiter === 'string') ? [this.options.delimiter] : this.options.delimiter
+    this._triggerKeys = $.map(this._delimiters, function (delimiter) {
+      return delimiter.charCodeAt(0);
+    });
+    this._firstDelimiter = this._delimiters[0];
+
+    // Check for whitespace, dash and special characters
+    var whitespace = $.inArray(' ', this._delimiters)
+      , dash = $.inArray('-', this._delimiters)
+
+    if (whitespace >= 0)
+      this._delimiters[whitespace] = '\\s'
+
+    if (dash >= 0) {
+      delete this._delimiters[dash]
+      this._delimiters.unshift('-')
+    }
+
+    var specialCharacters = ['\\', '$', '[', '{', '^', '.', '|', '?', '*', '+', '(', ')']
+    $.each(this._delimiters, function (index, character) {
+      var pos = $.inArray(character, specialCharacters)
+      if (pos >= 0) _self._delimiters[index] = '\\' + character;
+    });
+
+    // Store original input width
+    var elRules = (window && typeof window.getMatchedCSSRules === 'function') ? window.getMatchedCSSRules( element ) : null
+      , elStyleWidth = element.style.width
+      , elCSSWidth
+      , elWidth = this.$element.width()
+
+    if (elRules) {
+      $.each( elRules, function (i, rule) {
+        if (rule.style.width) {
+          elCSSWidth = rule.style.width;
+        }
+      });
+    }
+
+    // Move original input out of the way
+    var hidingPosition = $('body').css('direction') === 'rtl' ? 'right' : 'left',
+        originalStyles = { position: this.$element.css('position') };
+    originalStyles[hidingPosition] = this.$element.css(hidingPosition);
+
+    this.$element
+      .data('original-styles', originalStyles)
+      .data('original-tabindex', this.$element.prop('tabindex'))
+      .css('position', 'absolute')
+      .css(hidingPosition, '-10000px')
+      .prop('tabindex', -1)
+
+    // Create a wrapper
+    this.$wrapper = $('<div class="tokenfield form-control" />')
+    if (this.$element.hasClass('input-lg')) this.$wrapper.addClass('input-lg')
+    if (this.$element.hasClass('input-sm')) this.$wrapper.addClass('input-sm')
+    if (this.textDirection === 'rtl') this.$wrapper.addClass('rtl')
+
+    // Create a new input
+    var id = this.$element.prop('id') || new Date().getTime() + '' + Math.floor((1 + Math.random()) * 100)
+    this.$input = $('<input type="'+this.options.inputType+'" class="token-input" autocomplete="off" />')
+                    .appendTo( this.$wrapper )
+                    .prop( 'placeholder',  this.$element.prop('placeholder') )
+                    .prop( 'id', id + '-tokenfield' )
+                    .prop( 'tabindex', this.$element.data('original-tabindex') )
+
+    // Re-route original input label to new input
+    var $label = $( 'label[for="' + this.$element.prop('id') + '"]' )
+    if ( $label.length ) {
+      $label.prop( 'for', this.$input.prop('id') )
+    }
+
+    // Set up a copy helper to handle copy & paste
+    this.$copyHelper = $('<input type="text" />').css('position', 'absolute').css(hidingPosition, '-10000px').prop('tabindex', -1).prependTo( this.$wrapper )
+
+    // Set wrapper width
+    if (elStyleWidth) {
+      this.$wrapper.css('width', elStyleWidth);
+    }
+    else if (elCSSWidth) {
+      this.$wrapper.css('width', elCSSWidth);
+    }
+    // If input is inside inline-form with no width set, set fixed width
+    else if (this.$element.parents('.form-inline').length) {
+      this.$wrapper.width( elWidth )
+    }
+
+    // Set tokenfield disabled, if original or fieldset input is disabled
+    if (this.$element.prop('disabled') || this.$element.parents('fieldset[disabled]').length) {
+      this.disable();
+    }
+
+    // Set tokenfield readonly, if original input is readonly
+    if (this.$element.prop('readonly')) {
+      this.readonly();
+    }
+
+    // Set up mirror for input auto-sizing
+    this.$mirror = $('<span style="position:absolute; top:-999px; left:0; white-space:pre;"/>');
+    this.$input.css('min-width', this.options.minWidth + 'px')
+    $.each([
+        'fontFamily',
+        'fontSize',
+        'fontWeight',
+        'fontStyle',
+        'letterSpacing',
+        'textTransform',
+        'wordSpacing',
+        'textIndent'
+    ], function (i, val) {
+        _self.$mirror[0].style[val] = _self.$input.css(val);
+    });
+    this.$mirror.appendTo( 'body' )
+
+    // Insert tokenfield to HTML
+    this.$wrapper.insertBefore( this.$element )
+    this.$element.prependTo( this.$wrapper )
+
+    // Calculate inner input width
+    this.update()
+
+    // Create initial tokens, if any
+    this.setTokens(this.options.tokens, false, ! this.$element.val() && this.options.tokens )
+
+    // Start listening to events
+    this.listen()
+
+    // Initialize autocomplete, if necessary
+    if ( ! $.isEmptyObject( this.options.autocomplete ) ) {
+      var side = this.textDirection === 'rtl' ? 'right' : 'left'
+       ,  autocompleteOptions = $.extend({
+            minLength: this.options.showAutocompleteOnFocus ? 0 : null,
+            position: { my: side + " top", at: side + " bottom", of: this.$wrapper }
+          }, this.options.autocomplete )
+
+      this.$input.autocomplete( autocompleteOptions )
+    }
+
+    // Initialize typeahead, if necessary
+    if ( ! $.isEmptyObject( this.options.typeahead ) ) {
+
+      var typeaheadOptions = this.options.typeahead
+        , defaults = {
+            minLength: this.options.showAutocompleteOnFocus ? 0 : null
+          }
+        , args = $.isArray( typeaheadOptions ) ? typeaheadOptions : [typeaheadOptions, typeaheadOptions]
+
+      args[0] = $.extend( {}, defaults, args[0] )
+
+      this.$input.typeahead.apply( this.$input, args )
+      this.typeahead = true
+    }
+  }
+
+  Tokenfield.prototype = {
+
+    constructor: Tokenfield
+
+  , createToken: function (attrs, triggerChange) {
+      var _self = this
+
+      if (typeof attrs === 'string') {
+        attrs = { value: attrs, label: attrs }
+      } else {
+        // Copy objects to prevent contamination of data sources.
+        attrs = $.extend( {}, attrs )
+      }
+
+      if (typeof triggerChange === 'undefined') {
+         triggerChange = true
+      }
+
+      // Normalize label and value
+      attrs.value = $.trim(attrs.value.toString());
+      attrs.label = attrs.label && attrs.label.length ? $.trim(attrs.label) : attrs.value
+
+      // Bail out if has no value or label, or label is too short
+      if (!attrs.value.length || !attrs.label.length || attrs.label.length <= this.options.minLength) return
+
+      // Bail out if maximum number of tokens is reached
+      if (this.options.limit && this.getTokens().length >= this.options.limit) return
+
+      // Allow changing token data before creating it
+      var createEvent = $.Event('tokenfield:createtoken', { attrs: attrs })
+      this.$element.trigger(createEvent)
+
+      // Bail out if there if attributes are empty or event was defaultPrevented
+      if (!createEvent.attrs || createEvent.isDefaultPrevented()) return
+
+      var $token = $('<div class="token" />')
+            .append('<span class="token-label" />')
+            .append('<a href="#" class="close" tabindex="-1">&times;</a>')
+            .data('attrs', attrs)
+
+      // Insert token into HTML
+      if (this.$input.hasClass('tt-input')) {
+        // If the input has typeahead enabled, insert token before it's parent
+        this.$input.parent().before( $token )
+      } else {
+        this.$input.before( $token )
+      }
+
+      // Temporarily set input width to minimum
+      this.$input.css('width', this.options.minWidth + 'px')
+
+      var $tokenLabel = $token.find('.token-label')
+        , $closeButton = $token.find('.close')
+
+      // Determine maximum possible token label width
+      if (!this.maxTokenWidth) {
+        this.maxTokenWidth =
+          this.$wrapper.width() - $closeButton.outerWidth() -
+          parseInt($closeButton.css('margin-left'), 10) -
+          parseInt($closeButton.css('margin-right'), 10) -
+          parseInt($token.css('border-left-width'), 10) -
+          parseInt($token.css('border-right-width'), 10) -
+          parseInt($token.css('padding-left'), 10) -
+          parseInt($token.css('padding-right'), 10)
+          parseInt($tokenLabel.css('border-left-width'), 10) -
+          parseInt($tokenLabel.css('border-right-width'), 10) -
+          parseInt($tokenLabel.css('padding-left'), 10) -
+          parseInt($tokenLabel.css('padding-right'), 10)
+          parseInt($tokenLabel.css('margin-left'), 10) -
+          parseInt($tokenLabel.css('margin-right'), 10)
+      }
+
+      //$tokenLabel.css('max-width', this.maxTokenWidth)
+      if (this.options.html)
+        $tokenLabel.html(attrs.label)
+      else
+        $tokenLabel.text(attrs.label)
+
+      // Listen to events on token
+      $token
+        .on('mousedown',  function (e) {
+          if (_self._disabled || _self._readonly) return false
+          _self.preventDeactivation = true
+        })
+        .on('click',    function (e) {
+          if (_self._disabled || _self._readonly) return false
+          _self.preventDeactivation = false
+
+          if (e.ctrlKey || e.metaKey) {
+            e.preventDefault()
+            return _self.toggle( $token )
+          }
+
+          _self.activate( $token, e.shiftKey, e.shiftKey )
+        })
+        .on('dblclick', function (e) {
+          if (_self._disabled || _self._readonly || !_self.options.allowEditing ) return false
+          _self.edit( $token )
+        })
+
+      $closeButton
+          .on('click',  $.proxy(this.remove, this))
+
+      // Trigger createdtoken event on the original field
+      // indicating that the token is now in the DOM
+      this.$element.trigger($.Event('tokenfield:createdtoken', {
+        attrs: attrs,
+        relatedTarget: $token.get(0)
+      }))
+
+      // Trigger change event on the original field
+      if (triggerChange) {
+        this.$element.val( this.getTokensList() ).trigger( $.Event('change', { initiator: 'tokenfield' }) )
+      }
+
+      // Update tokenfield dimensions
+      this.update()
+
+      // Return original element
+      return this.$element.get(0)
+    }
+
+  , setTokens: function (tokens, add, triggerChange) {
+      if (!tokens) return
+
+      if (!add) this.$wrapper.find('.token').remove()
+
+      if (typeof triggerChange === 'undefined') {
+          triggerChange = true
+      }
+
+      if (typeof tokens === 'string') {
+        if (this._delimiters.length) {
+          // Split based on delimiters
+          tokens = tokens.split( new RegExp( '[' + this._delimiters.join('') + ']' ) )
+        } else {
+          tokens = [tokens];
+        }
+      }
+
+      var _self = this
+      $.each(tokens, function (i, attrs) {
+        _self.createToken(attrs, triggerChange)
+      })
+
+      return this.$element.get(0)
+    }
+
+  , getTokenData: function($token) {
+      var data = $token.map(function() {
+        var $token = $(this);
+        return $token.data('attrs')
+      }).get();
+
+      if (data.length == 1) {
+        data = data[0];
+      }
+
+      return data;
+    }
+
+  , getTokens: function(active) {
+      var self = this
+        , tokens = []
+        , activeClass = active ? '.active' : '' // get active tokens only
+      this.$wrapper.find( '.token' + activeClass ).each( function() {
+        tokens.push( self.getTokenData( $(this) ) )
+      })
+      return tokens
+  }
+
+  , getTokensList: function(delimiter, beautify, active) {
+      delimiter = delimiter || this._firstDelimiter
+      beautify = ( typeof beautify !== 'undefined' && beautify !== null ) ? beautify : this.options.beautify
+
+      var separator = delimiter + ( beautify && delimiter !== ' ' ? ' ' : '')
+      return $.map( this.getTokens(active), function (token) {
+        return token.value
+      }).join(separator)
+  }
+
+  , getInput: function() {
+    return this.$input.val()
+  }
+
+  , listen: function () {
+      var _self = this
+
+      this.$element
+        .on('change',   $.proxy(this.change, this))
+
+      this.$wrapper
+        .on('mousedown',$.proxy(this.focusInput, this))
+
+      this.$input
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('paste',    $.proxy(this.paste, this))
+        .on('keydown',  $.proxy(this.keydown, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      this.$copyHelper
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keydown',  $.proxy(this.keydown, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      // Secondary listeners for input width calculation
+      this.$input
+        .on('keypress', $.proxy(this.update, this))
+        .on('keyup',    $.proxy(this.update, this))
+
+      this.$input
+        .on('autocompletecreate', function() {
+          // Set minimum autocomplete menu width
+          var $_menuElement = $(this).data('ui-autocomplete').menu.element
+
+          var minWidth = _self.$wrapper.outerWidth() -
+              parseInt( $_menuElement.css('border-left-width'), 10 ) -
+              parseInt( $_menuElement.css('border-right-width'), 10 )
+
+          $_menuElement.css( 'min-width', minWidth + 'px' )
+        })
+        .on('autocompleteselect', function (e, ui) {
+          if (_self.createToken( ui.item )) {
+            _self.$input.val('')
+            if (_self.$input.data( 'edit' )) {
+              _self.unedit(true)
+            }
+          }
+          return false
+        })
+        .on('typeahead:selected typeahead:autocompleted', function (e, datum, dataset) {
+          // Create token
+          if (_self.createToken( datum )) {
+            _self.$input.typeahead('val', '')
+            if (_self.$input.data( 'edit' )) {
+              _self.unedit(true)
+            }
+          }
+        })
+
+      // Listen to window resize
+      $(window).on('resize', $.proxy(this.update, this ))
+
+    }
+
+  , keydown: function (e) {
+
+      if (!this.focused) return
+
+      var _self = this
+
+      switch(e.keyCode) {
+        case 8: // backspace
+          if (!this.$input.is(document.activeElement)) break
+          this.lastInputValue = this.$input.val()
+          break
+
+        case 37: // left arrow
+          leftRight( this.textDirection === 'rtl' ? 'next': 'prev' )
+          break
+
+        case 38: // up arrow
+          upDown('prev')
+          break
+
+        case 39: // right arrow
+          leftRight( this.textDirection === 'rtl' ? 'prev': 'next' )
+          break
+
+        case 40: // down arrow
+          upDown('next')
+          break
+
+        case 65: // a (to handle ctrl + a)
+          if (this.$input.val().length > 0 || !(e.ctrlKey || e.metaKey)) break
+          this.activateAll()
+          e.preventDefault()
+          break
+
+        case 9: // tab
+        case 13: // enter
+
+          // We will handle creating tokens from autocomplete in autocomplete events
+          if (this.$input.data('ui-autocomplete') && this.$input.data('ui-autocomplete').menu.element.find("li:has(a.ui-state-focus), li.ui-state-focus").length) break
+
+          // We will handle creating tokens from typeahead in typeahead events
+          if (this.$input.hasClass('tt-input') && this.$wrapper.find('.tt-cursor').length ) break
+          if (this.$input.hasClass('tt-input') && this.$wrapper.find('.tt-hint').val() && this.$wrapper.find('.tt-hint').val().length) break
+
+          // Create token
+          if (this.$input.is(document.activeElement) && this.$input.val().length || this.$input.data('edit')) {
+            return this.createTokensFromInput(e, this.$input.data('edit'));
+          }
+
+          // Edit token
+          if (e.keyCode === 13) {
+            if (!this.$copyHelper.is(document.activeElement) || this.$wrapper.find('.token.active').length !== 1) break
+            if (!_self.options.allowEditing) break
+            this.edit( this.$wrapper.find('.token.active') )
+          }
+      }
+
+      function leftRight(direction) {
+        if (_self.$input.is(document.activeElement)) {
+          if (_self.$input.val().length > 0) return
+
+          direction += 'All'
+          var $token = _self.$input.hasClass('tt-input') ? _self.$input.parent()[direction]('.token:first') : _self.$input[direction]('.token:first')
+          if (!$token.length) return
+
+          _self.preventInputFocus = true
+          _self.preventDeactivation = true
+
+          _self.activate( $token )
+          e.preventDefault()
+
+        } else {
+          _self[direction]( e.shiftKey )
+          e.preventDefault()
+        }
+      }
+
+      function upDown(direction) {
+        if (!e.shiftKey) return
+
+        if (_self.$input.is(document.activeElement)) {
+          if (_self.$input.val().length > 0) return
+
+          var $token = _self.$input.hasClass('tt-input') ? _self.$input.parent()[direction + 'All']('.token:first') : _self.$input[direction + 'All']('.token:first')
+          if (!$token.length) return
+
+          _self.activate( $token )
+        }
+
+        var opposite = direction === 'prev' ? 'next' : 'prev'
+          , position = direction === 'prev' ? 'first' : 'last'
+
+        _self.$firstActiveToken[opposite + 'All']('.token').each(function() {
+          _self.deactivate( $(this) )
+        })
+
+        _self.activate( _self.$wrapper.find('.token:' + position), true, true )
+        e.preventDefault()
+      }
+
+      this.lastKeyDown = e.keyCode
+    }
+
+  , keypress: function(e) {
+
+      // Comma
+      if ($.inArray( e.which, this._triggerKeys) !== -1 && this.$input.is(document.activeElement)) {
+        if (this.$input.val()) {
+          this.createTokensFromInput(e)
+        }
+        return false;
+      }
+    }
+
+  , keyup: function (e) {
+      this.preventInputFocus = false
+
+      if (!this.focused) return
+
+      switch(e.keyCode) {
+        case 8: // backspace
+          if (this.$input.is(document.activeElement)) {
+            if (this.$input.val().length || this.lastInputValue.length && this.lastKeyDown === 8) break
+
+            this.preventDeactivation = true
+            var $prevToken = this.$input.hasClass('tt-input') ? this.$input.parent().prevAll('.token:first') : this.$input.prevAll('.token:first')
+
+            if (!$prevToken.length) break
+
+            this.activate( $prevToken )
+          } else {
+            this.remove(e)
+          }
+          break
+
+        case 46: // delete
+          this.remove(e, 'next')
+          break
+      }
+      this.lastKeyUp = e.keyCode
+    }
+
+  , focus: function (e) {
+      this.focused = true
+      this.$wrapper.addClass('focus')
+
+      if (this.$input.is(document.activeElement)) {
+        this.$wrapper.find('.active').removeClass('active')
+        this.$firstActiveToken = null
+
+        if (this.options.showAutocompleteOnFocus) {
+          this.search()
+        }
+      }
+    }
+
+  , blur: function (e) {
+
+      this.focused = false
+      this.$wrapper.removeClass('focus')
+
+      if (!this.preventDeactivation && !this.$element.is(document.activeElement)) {
+        this.$wrapper.find('.active').removeClass('active')
+        this.$firstActiveToken = null
+      }
+
+      if (!this.preventCreateTokens && (this.$input.data('edit') && !this.$input.is(document.activeElement) || this.options.createTokensOnBlur )) {
+        this.createTokensFromInput(e)
+      }
+
+      this.preventDeactivation = false
+      this.preventCreateTokens = false
+    }
+
+  , paste: function (e) {
+      var _self = this
+
+      // Add tokens to existing ones
+      if (_self.options.allowPasting) {
+        setTimeout(function () {
+          _self.createTokensFromInput(e)
+        }, 1)
+      }
+    }
+
+  , change: function (e) {
+      if ( e.initiator === 'tokenfield' ) return // Prevent loops
+
+      this.setTokens( this.$element.val() )
+    }
+
+  , createTokensFromInput: function (e, focus) {
+      if (this.$input.val().length < this.options.minLength)
+        return // No input, simply return
+
+      var tokensBefore = this.getTokensList()
+      this.setTokens( this.$input.val(), true )
+
+      if (tokensBefore == this.getTokensList() && this.$input.val().length)
+        return false // No tokens were added, do nothing (prevent form submit)
+
+      if (this.$input.hasClass('tt-input')) {
+        // Typeahead acts weird when simply setting input value to empty,
+        // so we set the query to empty instead
+        this.$input.typeahead('val', '')
+      } else {
+        this.$input.val('')
+      }
+
+      if (this.$input.data( 'edit' )) {
+        this.unedit(focus)
+      }
+
+      return false // Prevent form being submitted
+    }
+
+  , next: function (add) {
+      if (add) {
+        var $firstActiveToken = this.$wrapper.find('.active:first')
+          , deactivate = $firstActiveToken && this.$firstActiveToken ? $firstActiveToken.index() < this.$firstActiveToken.index() : false
+
+        if (deactivate) return this.deactivate( $firstActiveToken )
+      }
+
+      var $lastActiveToken = this.$wrapper.find('.active:last')
+        , $nextToken = $lastActiveToken.nextAll('.token:first')
+
+      if (!$nextToken.length) {
+        this.$input.focus()
+        return
+      }
+
+      this.activate($nextToken, add)
+    }
+
+  , prev: function (add) {
+
+      if (add) {
+        var $lastActiveToken = this.$wrapper.find('.active:last')
+          , deactivate = $lastActiveToken && this.$firstActiveToken ? $lastActiveToken.index() > this.$firstActiveToken.index() : false
+
+        if (deactivate) return this.deactivate( $lastActiveToken )
+      }
+
+      var $firstActiveToken = this.$wrapper.find('.active:first')
+        , $prevToken = $firstActiveToken.prevAll('.token:first')
+
+      if (!$prevToken.length) {
+        $prevToken = this.$wrapper.find('.token:first')
+      }
+
+      if (!$prevToken.length && !add) {
+        this.$input.focus()
+        return
+      }
+
+      this.activate( $prevToken, add )
+    }
+
+  , activate: function ($token, add, multi, remember) {
+
+      if (!$token) return
+
+      if (typeof remember === 'undefined') var remember = true
+
+      if (multi) var add = true
+
+      this.$copyHelper.focus()
+
+      if (!add) {
+        this.$wrapper.find('.active').removeClass('active')
+        if (remember) {
+          this.$firstActiveToken = $token
+        } else {
+          delete this.$firstActiveToken
+        }
+      }
+
+      if (multi && this.$firstActiveToken) {
+        // Determine first active token and the current tokens indicies
+        // Account for the 1 hidden textarea by subtracting 1 from both
+        var i = this.$firstActiveToken.index() - 2
+          , a = $token.index() - 2
+          , _self = this
+
+        this.$wrapper.find('.token').slice( Math.min(i, a) + 1, Math.max(i, a) ).each( function() {
+          _self.activate( $(this), true )
+        })
+      }
+
+      $token.addClass('active')
+      this.$copyHelper.val( this.getTokensList( null, null, true ) ).select()
+    }
+
+  , activateAll: function() {
+      var _self = this
+
+      this.$wrapper.find('.token').each( function (i) {
+        _self.activate($(this), i !== 0, false, false)
+      })
+    }
+
+  , deactivate: function($token) {
+      if (!$token) return
+
+      $token.removeClass('active')
+      this.$copyHelper.val( this.getTokensList( null, null, true ) ).select()
+    }
+
+  , toggle: function($token) {
+      if (!$token) return
+
+      $token.toggleClass('active')
+      this.$copyHelper.val( this.getTokensList( null, null, true ) ).select()
+    }
+
+  , edit: function ($token) {
+      if (!$token) return
+
+      var attrs = $token.data('attrs')
+
+      // Allow changing input value before editing
+      var options = { attrs: attrs, relatedTarget: $token.get(0) }
+      var editEvent = $.Event('tokenfield:edittoken', options)
+      this.$element.trigger( editEvent )
+
+      // Edit event can be cancelled if default is prevented
+      if (editEvent.isDefaultPrevented()) return
+
+      $token.find('.token-label').text(attrs.value)
+      var tokenWidth = $token.outerWidth()
+
+      var $_input = this.$input.hasClass('tt-input') ? this.$input.parent() : this.$input
+
+      $token.replaceWith( $_input )
+
+      this.preventCreateTokens = true
+
+      this.$input.val( attrs.value )
+                .select()
+                .data( 'edit', true )
+                .width( tokenWidth )
+
+      this.update();
+
+      // Indicate that token is now being edited, and is replaced with an input field in the DOM
+      this.$element.trigger($.Event('tokenfield:editedtoken', options ))
+    }
+
+  , unedit: function (focus) {
+      var $_input = this.$input.hasClass('tt-input') ? this.$input.parent() : this.$input
+      $_input.appendTo( this.$wrapper )
+
+      this.$input.data('edit', false)
+      this.$mirror.text('')
+
+      this.update()
+
+      // Because moving the input element around in DOM
+      // will cause it to lose focus, we provide an option
+      // to re-focus the input after appending it to the wrapper
+      if (focus) {
+        var _self = this
+        setTimeout(function () {
+          _self.$input.focus()
+        }, 1)
+      }
+    }
+
+  , remove: function (e, direction) {
+      if (this.$input.is(document.activeElement) || this._disabled || this._readonly) return
+
+      var $token = (e.type === 'click') ? $(e.target).closest('.token') : this.$wrapper.find('.token.active')
+
+      if (e.type !== 'click') {
+        if (!direction) var direction = 'prev'
+        this[direction]()
+
+        // Was it the first token?
+        if (direction === 'prev') var firstToken = $token.first().prevAll('.token:first').length === 0
+      }
+
+      // Prepare events and their options
+      var options = { attrs: this.getTokenData( $token ), relatedTarget: $token.get(0) }
+        , removeEvent = $.Event('tokenfield:removetoken', options)
+
+      this.$element.trigger(removeEvent);
+
+      // Remove event can be intercepted and cancelled
+      if (removeEvent.isDefaultPrevented()) return
+
+      var removedEvent = $.Event('tokenfield:removedtoken', options)
+        , changeEvent = $.Event('change', { initiator: 'tokenfield' })
+
+      // Remove token from DOM
+      $token.remove()
+
+      // Trigger events
+      this.$element.val( this.getTokensList() ).trigger( removedEvent ).trigger( changeEvent )
+
+      // Focus, when necessary:
+      // When there are no more tokens, or if this was the first token
+      // and it was removed with backspace or it was clicked on
+      if (!this.$wrapper.find('.token').length || e.type === 'click' || firstToken) this.$input.focus()
+
+      // Adjust input width
+      this.$input.css('width', this.options.minWidth + 'px')
+      this.update()
+
+      // Cancel original event handlers
+      e.preventDefault()
+      e.stopPropagation()
+    }
+
+    /**
+     * Update tokenfield dimensions
+     */
+  , update: function (e) {
+      var value = this.$input.val()
+        , inputPaddingLeft = parseInt(this.$input.css('padding-left'), 10)
+        , inputPaddingRight = parseInt(this.$input.css('padding-right'), 10)
+        , inputPadding = inputPaddingLeft + inputPaddingRight
+
+      if (this.$input.data('edit')) {
+
+        if (!value) {
+          value = this.$input.prop("placeholder")
+        }
+        if (value === this.$mirror.text()) return
+
+        this.$mirror.text(value)
+
+        var mirrorWidth = this.$mirror.width() + 10;
+        if ( mirrorWidth > this.$wrapper.width() ) {
+          return this.$input.width( this.$wrapper.width() )
+        }
+
+        this.$input.width( mirrorWidth )
+      }
+      else {
+        var w = (this.textDirection === 'rtl')
+              ? this.$input.offset().left + this.$input.outerWidth() - this.$wrapper.offset().left - parseInt(this.$wrapper.css('padding-left'), 10) - inputPadding - 1
+              : this.$wrapper.offset().left + this.$wrapper.width() + parseInt(this.$wrapper.css('padding-left'), 10) - this.$input.offset().left - inputPadding;
+        //
+        // some usecases pre-render widget before attaching to DOM,
+        // dimensions returned by jquery will be NaN -> we default to 100%
+        // so placeholder won't be cut off.
+        isNaN(w) ? this.$input.width('100%') : this.$input.width(w);
+      }
+    }
+
+  , focusInput: function (e) {
+      if ( $(e.target).closest('.token').length || $(e.target).closest('.token-input').length || $(e.target).closest('.tt-dropdown-menu').length ) return
+      // Focus only after the current call stack has cleared,
+      // otherwise has no effect.
+      // Reason: mousedown is too early - input will lose focus
+      // after mousedown. However, since the input may be moved
+      // in DOM, there may be no click or mouseup event triggered.
+      var _self = this
+      setTimeout(function() {
+        _self.$input.focus()
+      }, 0)
+    }
+
+  , search: function () {
+      if ( this.$input.data('ui-autocomplete') ) {
+        this.$input.autocomplete('search')
+      }
+    }
+
+  , disable: function () {
+      this.setProperty('disabled', true);
+    }
+
+  , enable: function () {
+      this.setProperty('disabled', false);
+    }
+
+  , readonly: function () {
+      this.setProperty('readonly', true);
+    }
+
+  , writeable: function () {
+      this.setProperty('readonly', false);
+    }
+
+  , setProperty: function(property, value) {
+      this['_' + property] = value;
+      this.$input.prop(property, value);
+      this.$element.prop(property, value);
+      this.$wrapper[ value ? 'addClass' : 'removeClass' ](property);
+  }
+
+  , destroy: function() {
+      // Set field value
+      this.$element.val( this.getTokensList() );
+      // Restore styles and properties
+      this.$element.css( this.$element.data('original-styles') );
+      this.$element.prop( 'tabindex', this.$element.data('original-tabindex') );
+
+      // Re-route tokenfield label to original input
+      var $label = $( 'label[for="' + this.$input.prop('id') + '"]' )
+      if ( $label.length ) {
+        $label.prop( 'for', this.$element.prop('id') )
+      }
+
+      // Move original element outside of tokenfield wrapper
+      this.$element.insertBefore( this.$wrapper );
+
+      // Remove tokenfield-related data
+      this.$element.removeData('original-styles')
+                   .removeData('original-tabindex')
+                   .removeData('bs.tokenfield');
+
+      // Remove tokenfield from DOM
+      this.$wrapper.remove();
+      this.$mirror.remove();
+
+      var $_element = this.$element;
+
+      return $_element;
+  }
+
+  }
+
+
+ /* TOKENFIELD PLUGIN DEFINITION
+  * ======================== */
+
+  var old = $.fn.tokenfield
+
+  $.fn.tokenfield = function (option, param) {
+    var value
+      , args = []
+
+    Array.prototype.push.apply( args, arguments );
+
+    var elements = this.each(function () {
+      var $this = $(this)
+        , data = $this.data('bs.tokenfield')
+        , options = typeof option == 'object' && option
+
+      if (typeof option === 'string' && data && data[option]) {
+        args.shift()
+        value = data[option].apply(data, args)
+      } else {
+        if (!data && typeof option !== 'string' && !param) {
+          $this.data('bs.tokenfield', (data = new Tokenfield(this, options)))
+          $this.trigger('tokenfield:initialize')
+        }
+      }
+    })
+
+    return typeof value !== 'undefined' ? value : elements;
+  }
+
+  $.fn.tokenfield.defaults = {
+    minWidth: 60,
+    minLength: 0,
+    html: true,
+    allowEditing: true,
+    allowPasting: true,
+    limit: 0,
+    autocomplete: {},
+    typeahead: {},
+    showAutocompleteOnFocus: false,
+    createTokensOnBlur: false,
+    delimiter: ',',
+    beautify: true,
+    inputType: 'text'
+  }
+
+  $.fn.tokenfield.Constructor = Tokenfield
+
+
+ /* TOKENFIELD NO CONFLICT
+  * ================== */
+
+  $.fn.tokenfield.noConflict = function () {
+    $.fn.tokenfield = old
+    return this
+  }
+
+  return Tokenfield;
+
+}));
@@ -0,0 +1,312 @@
+fb_app = {
+  current_url: '',
+
+  locales: {
+
+  },
+
+  config: {
+    url_prefix: '',
+    save_auth_url: '',
+    show_login_url: '',
+
+    init: function() {
+
+    },
+
+  },
+
+  timeline: {
+    appId: '',
+    app_scope: 'publish_actions',
+
+    loading: function() {
+      jQuery('#fb-app-connect-status').empty().addClass('loading').height(150)
+    },
+
+    connect: function() {
+      this.loading();
+      fb_app.fb.scope = this.app_scope
+      fb_app.fb.connect(function (response) {
+        fb_app.auth.receive(response)
+      });
+    },
+
+    disconnect: function() {
+      // 'not_authorized' is used to disconnect from facebook
+      jQuery('#fb-app-modal-wrap #fb-app-modal-intro').html(
+          fb_app.locales.confirm_disconnect
+        )
+      jQuery('#fb-app-modal-wrap .modal-button-no')
+        .html(fb_app.locales.cancel_button)
+        .attr('onClick', 'noosfero.modal.close(); return false')
+      jQuery('#fb-app-modal-wrap .modal-button-yes')
+        .html(fb_app.locales.confirm_disconnect_button)
+        .attr('onClick', 'fb_app.timeline.disconnect_confirmed();noosfero.modal.close(); return false')
+      noosfero.modal.html(jQuery('#fb-app-modal-wrap').html())
+    },
+
+    disconnect_confirmed: function() {
+      this.loading();
+      fb_app.auth.receive({status: 'not_authorized'})
+    },
+
+    connect_to_another: function() {
+      this.disconnect();
+      fb_app.fb.connect_to_another(this.connect)
+    },
+  },
+
+  page_tab: {
+    appId: '',
+    nextUrl: '',
+
+    init: function() {
+      FB.Canvas.scrollTo(0,140);
+      // While Braulio doesnt make the catalog-options-bar work in a product page, I'll hide it. User will have to go back to the catalog to see this bar, provisorily...
+      jQuery('#product-page').prev('form').hide();
+    },
+
+    config: {
+
+      init: function() {
+        this.change_type($('select#page_tab_config_type'))
+
+      },
+
+      edit: function(button) {
+        var page_tab = button.parents('.page-tab')
+        page_tab.find('form').toggle(400)
+      },
+
+      remove: function(button, url) {
+        var page_tab = button.parents('.page-tab')
+        var name = page_tab.find('#page_tab_name').val()
+        //jQuery('#fb-app-modal-catalog-name').text(name)
+        jQuery('#fb-app-modal-wrap #fb-app-modal-intro').html(
+          fb_app.locales.confirm_removal
+        )
+        jQuery('#fb-app-modal-wrap .modal-button-no')
+          .html(fb_app.locales.cancel_button)
+          .attr('onClick', 'noosfero.modal.close(); return false')
+        jQuery('#fb-app-modal-wrap .modal-button-yes')
+          .html(fb_app.locales.confirm_removal_button)
+          .attr('onClick', 'fb_app.page_tab.config.remove_confirmed(this);noosfero.modal.close(); return false')
+          .attr('target_url',url)
+          .attr('target_id','#'+page_tab.attr('id'))
+        noosfero.modal.html(jQuery('#fb-app-modal-wrap').html())
+      },
+
+      remove_confirmed: function(el) {
+        el = jQuery(el)
+        jQuery.post(el.attr('target_url'), function() {
+          var page_tab = jQuery(el.attr('target_id'))
+          page_tab.remove()
+        })
+      },
+
+      close: function(pageId) {
+        noosfero.modal.close()
+        jQuery('#content').html('').addClass('loading')
+        fb_app.fb.redirect_to_tab(pageId, fb_app.page_tab.appId)
+      },
+
+      validate: function(form) {
+        for (var i=0; tinymce.editors[i]; i++) {
+          var editor = tinymce.editors[i]
+          var textarea = editor.getElement()
+          textarea.value = editor.getContent()
+        }
+
+        if (form.find('#page_tab_title').val().trim()=='') {
+          noosfero.modal.html('<div id="fb-app-error">'+fb_app.locales.error_empty_title+'</div>')
+          return false
+        } else {
+          var selected_type = form.find('#page_tab_config_type').val()
+          var sub_option = form.find('.config-type-'+selected_type+' input')
+          if (sub_option.length > 0 && sub_option.val().trim()=='') {
+            noosfero.modal.html('<div id="fb-app-error">'+fb_app.locales.error_empty_settings+'</div>')
+            return false
+          }
+        }
+        return true
+      },
+
+      add: function (form) {
+        if (!this.validate(form))
+          return false
+        // this checks if the user is using FB as a page and offer a switch
+        FB.login(function(response) {
+          if (response.status != 'connected') return
+          var nextUrl = fb_app.page_tab.nextUrl + '?' + form.serialize()
+          window.location.href = fb_app.fb.add_tab_url(fb_app.page_tab.appId, nextUrl)
+        })
+        return false
+      },
+
+      save: function(form) {
+        if (!this.validate(form))
+          return false
+        jQuery(form).ajaxSubmit({
+          dataType: 'script',
+        })
+        return false
+      },
+
+      change_type: function(select) {
+        select = jQuery(select)
+        var page_tab = select.parents('.page-tab')
+        var config_selector = '.config-type-'+select.val()
+        var config = page_tab.find(config_selector)
+        var to_show = config
+        var to_hide = page_tab.find('.config-type:not('+config_selector+')')
+
+        to_show.show().
+          find('input').prop('disabled', false)
+        to_show.find('.tokenfield').removeClass('disabled')
+        to_hide.hide().
+          find('input').prop('disabled', true)
+      },
+
+      profile: {
+
+        onchange: function(input) {
+          if (input.val())
+            input.removeAttr('placeholder')
+          else
+            input.attr('placeholder', input.attr('data-placeholder'))
+        },
+      },
+    },
+
+  },
+
+  auth: {
+    status: 'not_authorized',
+
+    load: function (html) {
+      jQuery('#fb-app-settings').html(html)
+    },
+    loadLogin: function (html) {
+      if (this.status == 'not_authorized')
+        jQuery('#fb-app-connect').html(html).removeClass('loading')
+      else
+        jQuery('#fb-app-login').html(html)
+    },
+
+    receive: function(response) {
+      fb_app.fb.authResponse = response
+      fb_app.auth.save(response)
+      jQuery('html,body').animate({ scrollTop: jQuery('#fb-app-settings').offset().top-100 }, 400)
+    },
+
+    transformParams: function(response) {
+      var authResponse = response.authResponse
+      if (!authResponse)
+        return {auth: {status: response.status}}
+      else
+        return {
+          auth: {
+            status: response.status,
+            access_token: authResponse.accessToken,
+            expires_in: authResponse.expiresIn,
+            signed_request: authResponse.signedRequest,
+            provider_user_id: authResponse.userID,
+          }
+        }
+    },
+
+    showLogin: function(response) {
+      jQuery.get(fb_app.config.show_login_url, this.transformParams(response), this.loadLogin)
+    },
+
+    save: function(response) {
+      jQuery.post(fb_app.config.save_auth_url, this.transformParams(response), this.load)
+    },
+  },
+
+
+  // interface to facebook's SDK
+  fb: {
+    appId: '',
+    scope: '',
+    inited: false,
+    initCode: null,
+
+    prepareAsyncInit: function(appId, asyncInitCode) {
+      this.id = appId
+      this.initCode = asyncInitCode
+
+      window.fbAsyncInit = function() {
+        FB.init({
+          appId: appId,
+          cookie: true,
+          xfbml: true,
+          status: true,
+        })
+
+        // automatic iframe's resize
+        // FIXME: move to page tab embed code
+        fb_app.fb.size_change()
+        jQuery(document).on('DOMNodeInserted', fb_app.fb.size_change)
+
+        if (asyncInitCode)
+          jQuery.globalEval(asyncInitCode)
+
+        fb_app.fb.inited = true
+      }
+    },
+
+    init: function() {
+      // the SDK is loaded on views/fb_app_plugin/_load.html.slim and then call window.fbAsyncInit
+    },
+
+    size_change: function() {
+      FB.Canvas.setSize({height: jQuery('body').height()+100})
+    },
+
+    redirect_to_tab: function(pageId, appId) {
+      window.location.href = 'https://facebook.com/' + pageId + '?sk=app_' + appId
+    },
+
+    add_tab_url: function (appId, nextUrl) {
+      return 'https://www.facebook.com/dialog/pagetab?' + jQuery.param({app_id: appId, next: nextUrl})
+    },
+
+    connect: function(callback) {
+      FB.login(function(response) {
+        if (callback) callback(response)
+      }, {scope: fb_app.fb.scope})
+    },
+
+    connect_to_another: function(callback) {
+      this.logout(this.connect(callback))
+    },
+
+    logout: function(callback) {
+      // this checks if the user is using FB as a page and offer a switch
+      FB.login(function(response) {
+        FB.logout(function(response) {
+          if (callback) callback(response)
+        })
+      })
+    },
+
+    // not to be used
+    delete: function(callback) {
+      FB.api("/me/permissions", "DELETE", function(response) {
+        if (callback) callback(response)
+      })
+    },
+
+    checkLoginStatus: function() {
+      FB.getLoginStatus(function(response) {
+        // don't do nothing, this is just to fetch auth after init
+      })
+    },
+
+  },
+
+}
+
+
@@ -0,0 +1 @@
+stylesheets/style.scss
 \ No newline at end of file
@@ -0,0 +1,214 @@
+/* use with @extend, CSS clear bugfix */
+.clean {
+  clear: both;
+}
+.container-clean {
+  overflow: hidden;
+  display: inline-block; /* Necessary to trigger "hasLayout" in IE */
+  display: block; /* Sets element back to block */
+}
+
+/* layout base parameters */
+$modules: 12;
+$base: 8px;
+$wireframe: 1040px;
+
+/* heights should only use multiples of this */
+$height: $base;
+
+/* base measurements */
+$intercolumn: 2*$base;
+$module: $wireframe/$modules - $intercolumn;
+
+/* widths should only use one of these */
+$module01: 01*$module + 00*$intercolumn;
+$module02: 02*$module + 01*$intercolumn;
+$module03: 03*$module + 02*$intercolumn;
+$module04: 04*$module + 03*$intercolumn;
+$module05: 05*$module + 04*$intercolumn;
+$module06: 06*$module + 05*$intercolumn;
+$module07: 07*$module + 06*$intercolumn;
+$module08: 08*$module + 07*$intercolumn;
+$module09: 09*$module + 08*$intercolumn;
+$module09: 09*$module + 08*$intercolumn;
+$module10: 10*$module + 09*$intercolumn;
+$module11: 11*$module + 10*$intercolumn;
+$module12: 12*$module + 11*$intercolumn;
+$module01p: percentage($module01/$wireframe);
+$module02p: percentage($module02/$wireframe);
+$module03p: percentage($module03/$wireframe);
+$module04p: percentage($module04/$wireframe);
+$module05p: percentage($module05/$wireframe);
+$module06p: percentage($module06/$wireframe);
+$module07p: percentage($module07/$wireframe);
+$module08p: percentage($module08/$wireframe);
+$module09p: percentage($module09/$wireframe);
+$module10p: percentage($module10/$wireframe);
+$module11p: percentage($module11/$wireframe);
+$module12p: percentage($module12/$wireframe);
+
+/* paddings and margins should only use one of these
+   Ps. 1: disccount the borders size from padding, as borders uses padding's space.
+   Ps. 2: because of W3C's content-box default box sizing, padding sums to width size. If your
+   box doesn't have a padding, then sum $intercolumn to the width.
+ */
+$margin: $intercolumn;
+$half-margin: $margin/2;
+$padding: $intercolumn/2;
+$half-padding: $padding/2;
+$marginp: percentage($margin/$wireframe);
+$half-marginp: percentage($half-margin/$wireframe);
+$paddingp: percentage($padding/$wireframe);
+$half-paddingp: percentage($half-padding/$wireframe);
+
+$wireframe-padding: 5*$padding;
+
+/* use for borders */
+$border: 1px;
+$border-radius: 5px;
+
+/* use for text shadows */
+$shadow: 2px;
+
+/* Colors */
+
+$border-action-button: #F4A439;
+$bg-action-button: #FBCA47;
+$bg-selection-button: white;
+
+/* Fonts */
+
+/* Paragraphs Styles (use with @extend) */
+
+.pstyle-none {
+  font-size: 12px;
+}
+.pstyle-basic {
+  font-size: 16px;
+}
+.pstyle-button {
+  font-size: 16px;
+}
+.pstyle-button-small {
+  font-size: 13px;
+}
+.pstyle-title {
+  font-size: 72px;
+}
+.pstyle-h1 {
+  font-size: 34px;
+}
+.pstyle-h2 {
+  font-size: 26px;
+}
+.pstyle-h3 {
+  font-size: 21px;
+}
+.pstyle-h4 {
+  font-size: 16px;
+}
+.pstyle-h5 {
+  font-size: 13px;
+}
+.pstyle-title-section {
+  font-size: 92px;
+}
+.pstyle-field {
+  font-size: 13px;
+}
+.pstyle-menu-big-selected {
+  font-size: 21px;
+}
+.pstyle-menu-big-unselected {
+  font-size: 21px;
+}
+.pstyle-menu-medium-selected {
+  font-size: 16px;
+}
+.pstyle-menu-medium-unselected {
+  font-size: 16px;
+}
+.pstyle-menu-small-selected {
+  font-size: 13px;
+}
+.pstyle-menu-small-unselected {
+  font-size: 13px;
+}
+.pstyle-tp4 {
+  font-size: 42px;
+}
+.pstyle-tp3 {
+  font-size: 34px;
+}
+.pstyle-tp2 {
+  font-size: 26px;
+}
+.pstyle-tp1 {
+  font-size: 21px;
+}
+.pstyle-tm1 {
+  font-size: 13px;
+}
+.pstyle-tm2 {
+  font-size: 10px;
+}
+.subtitle {
+  @extend .pstyle-tm2;
+}
+
+/* Images */
+
+$profile-thumb-size: 4*$base;
+$profile-portrait-size: 10*$base;
+
+/* profile-image that can be centered and resized with aspect ratio */
+.profile-image {
+  display: inline-block;
+
+  &.thumb {
+    width: $profile-thumb-size;
+    height: $profile-thumb-size;
+  }
+  &.portrait {
+    width: $profile-portrait-size;
+    height: $profile-portrait-size;
+  }
+
+  /* do not put padding in this as background size will consider it. */
+  .inner {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 100%;
+    background-size: contain; /* css3 enabled */
+  }
+}
+
+/* Buttons */
+
+.action-button {
+  display: inline-block;
+  padding: $half-padding $padding;
+  height: auto;
+  width: auto;
+  //&:visited, &:active, &:hover { color: white; }
+  background: $bg-action-button;
+  border: $border solid $border-action-button;
+  cursor: pointer;
+  color: black;
+  font-weight: bold;
+  line-height: 2*$height;
+  text-align: center;
+  text-decoration: none;
+  text-transform: uppercase;
+  text-shadow: none;
+  border-radius: $border-radius;
+}
+
+.selection-button {
+  @extend .action-button;
+  background: $bg-selection-button;
+}
+
@@ -0,0 +1,209 @@
+/*!
+ * bootstrap-tokenfield
+ * https://github.com/sliptree/bootstrap-tokenfield
+ * Copyright 2013-2014 Sliptree and other contributors; Licensed MIT
+ */
+@-webkit-keyframes blink {
+  0% {
+    border-color: #ededed;
+  }
+  100% {
+    border-color: #b94a48;
+  }
+}
+@-moz-keyframes blink {
+  0% {
+    border-color: #ededed;
+  }
+  100% {
+    border-color: #b94a48;
+  }
+}
+@keyframes blink {
+  0% {
+    border-color: #ededed;
+  }
+  100% {
+    border-color: #b94a48;
+  }
+}
+.tokenfield {
+  height: auto;
+  min-height: 34px;
+  padding-bottom: 0px;
+}
+.tokenfield.focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.tokenfield .token {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  display: inline-block;
+  border: 1px solid #d9d9d9;
+  background-color: #ededed;
+  white-space: nowrap;
+  margin: -1px 5px 5px 0;
+  height: 22px;
+  vertical-align: top;
+  cursor: default;
+}
+.tokenfield .token:hover {
+  border-color: #b9b9b9;
+}
+.tokenfield .token.active {
+  border-color: #52a8ec;
+  border-color: rgba(82, 168, 236, 0.8);
+}
+.tokenfield .token.duplicate {
+  border-color: #ebccd1;
+  -webkit-animation-name: blink;
+  animation-name: blink;
+  -webkit-animation-duration: 0.1s;
+  animation-duration: 0.1s;
+  -webkit-animation-direction: normal;
+  animation-direction: normal;
+  -webkit-animation-timing-function: ease;
+  animation-timing-function: ease;
+  -webkit-animation-iteration-count: infinite;
+  animation-iteration-count: infinite;
+}
+.tokenfield .token.invalid {
+  background: none;
+  border: 1px solid transparent;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  border-bottom: 1px dotted #d9534f;
+}
+.tokenfield .token.invalid.active {
+  background: #ededed;
+  border: 1px solid #ededed;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.tokenfield .token .token-label {
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding-left: 4px;
+  vertical-align: top;
+}
+.tokenfield .token .close {
+  font-family: Arial;
+  display: inline-block;
+  line-height: 100%;
+  font-size: 1.1em;
+  line-height: 1.49em;
+  margin-left: 5px;
+  float: none;
+  height: 100%;
+  vertical-align: top;
+  padding-right: 4px;
+}
+.tokenfield .token-input {
+  background: none;
+  width: 60px;
+  min-width: 60px;
+  border: 0;
+  height: 20px;
+  padding: 0;
+  margin-bottom: 6px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.tokenfield .token-input:focus {
+  border-color: transparent;
+  outline: 0;
+  /* IE6-9 */
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.tokenfield.disabled {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+.tokenfield.disabled .token-input {
+  cursor: not-allowed;
+}
+.tokenfield.disabled .token:hover {
+  cursor: not-allowed;
+  border-color: #d9d9d9;
+}
+.tokenfield.disabled .token:hover .close {
+  cursor: not-allowed;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+.has-warning .tokenfield.focus {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+}
+.has-error .tokenfield.focus {
+  border-color: #843534;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+}
+.has-success .tokenfield.focus {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+}
+.tokenfield.input-sm,
+.input-group-sm .tokenfield {
+  min-height: 30px;
+  padding-bottom: 0px;
+}
+.input-group-sm .token,
+.tokenfield.input-sm .token {
+  height: 20px;
+  margin-bottom: 4px;
+}
+.input-group-sm .token-input,
+.tokenfield.input-sm .token-input {
+  height: 18px;
+  margin-bottom: 5px;
+}
+.tokenfield.input-lg,
+.input-group-lg .tokenfield {
+  min-height: 45px;
+  padding-bottom: 4px;
+}
+.input-group-lg .token,
+.tokenfield.input-lg .token {
+  height: 25px;
+}
+.input-group-lg .token-label,
+.tokenfield.input-lg .token-label {
+  line-height: 23px;
+}
+.input-group-lg .token .close,
+.tokenfield.input-lg .token .close {
+  line-height: 1.3em;
+}
+.input-group-lg .token-input,
+.tokenfield.input-lg .token-input {
+  height: 23px;
+  line-height: 23px;
+  margin-bottom: 6px;
+  vertical-align: top;
+}
+.tokenfield.rtl {
+  direction: rtl;
+  text-align: right;
+}
+.tokenfield.rtl .token {
+  margin: -1px 0 5px 5px;
+}
+.tokenfield.rtl .token .token-label {
+  padding-left: 0px;
+  padding-right: 4px;
+}
@@ -0,0 +1,238 @@
+@import 'base';
+
+body.controller-fb_app_plugin_page_tab {
+
+  /* Catalog Tab in Facebook */
+  background: #fff;
+
+  #top-bar, #theme-footer, #product-category, #product-page .button-bar {
+    display: none;
+  }
+  .navbar-static-top {
+    border-radius: 4px;
+  }
+  #wrap-1 {
+    box-shadow: none;
+  }
+  .container {
+    width: 100%;
+  }
+  #content .no-boxes {
+    padding: 0;
+    width: 100%;
+  }
+  #content-inner {
+    padding-top: 0;
+  }
+  #content h1 {
+    margin: 0;
+  }
+  #product-list {
+    margin: 0 -10px;
+  }
+  #page-tab-subtitle {
+    margin-bottom: 15px;
+    background-color: rgb(241, 255, 107);
+    border: 1px solid #ccc;
+    border-top: none;
+    border-radius: 0px 0px 6px 6px;
+    font-style: italic;
+    padding: 10px 10px 0px;
+  }
+  #page-tab-subtitle p {
+    margin-bottom: 10px;
+  }
+  #product-owner {
+    display:block;
+    font-size: 120%;
+    font-weight: bold;
+    clear: both;
+  }
+  #product-list li.product {
+    width: 190px;
+    padding: 10px;
+  }
+  #product-list .product-big {
+    width: 160px;
+  }
+  #product-list .product-image-link {
+    height: 170px;
+  }
+  #product-list .expand-box {
+    width: 162px;
+  }
+  #theme-footer {
+    border: none;
+  }
+  #page-tab-footer {
+    font-size: 11px;
+    border-top: 3px solid rgb(241, 255, 107);
+    margin-top: 70px;
+    padding-top: 5px;
+  }
+  #page-tab-footer1 {
+    background-size: 50px;
+    padding-left: 50px;
+  }
+
+  /* End of Catalog Tab in Facebook */
+
+  #profile-title,
+  #profile-header,
+  #profile-theme-header,
+  #profile-footer,
+  #theme-header {
+    display: none;
+  }
+  .product-catalog-ctrl {
+    float: right;
+    margin-left: 3px;
+  }
+  #product-catalog-actions {
+    text-align: right;
+  }
+  #manage-fb-store-ctrl {
+    margin-bottom: 15px;
+  }
+  .modal-content {
+    #fb-app-page-tab-admin {
+      height: 400px;
+    }
+  }
+
+}
+
+body.controller-fb_app_plugin_page_tab,
+body.controller-fb_app_plugin_myprofile {
+
+  input.small-loading {
+    background: transparent url(/images/loading-small.gif) no-repeat scroll right center;
+  }
+
+  .loading {
+    background: white url(/plugins/fb_app/images/loading.gif) no-repeat center center;
+    width: 80%;
+    height: 300px;
+    margin: auto;
+  }
+}
+
+/* control panel - general */
+#fb-app-modal-wrap {
+  display: none;
+}
+#fb-app-error, #fb-app-modal {
+  padding: 70px 30px;
+  font-size: 120%;
+}
+#fb-app-error {
+  color: #E44444;
+  font-style: italic;
+}
+.controller-profile_editor a.control-panel-fb-app {
+  background-image: url(/plugins/fb_app/images/control-panel.png);
+}
+#fb-app-intro {
+  margin: 0 40px 20px 40px;
+}
+#fb-app-intro-text {
+  border:2px #666 solid;
+  padding: 10px;
+  border-radius: 8px;
+}
+#fb-app-connect-status {
+  background-color: #eee;
+  border: 1px solid #ccc;
+  margin: 30px 0;
+  padding: 30px;
+}
+.fb-app-connection-button {
+  margin-top: 15px;
+}
+#fb-app-auth {
+  text-align: center;
+  min-height: 60px;
+}
+#fb-connected {
+  font-size: 36px;
+  margin: 0 30px;
+  color: #99f;
+}
+#fb-app-wrapper {
+  padding: 40px;
+  font-size: 20px;
+}
+#fb-app-wrapper h1 {
+  font-size: 39px;
+  margin-bottom: 50px;
+}
+
+/* Control panel - catalog settings */
+#page-tab-new {
+  margin-top: 30px;
+}
+#page-tab-new h3 {
+  border-top: 2px solid #ddd;
+  padding-top: 10px;
+}
+#page-tab-new h3, .edit-page-tab {
+  display: none;
+}
+.edit-page-tab {
+  background-color: #eee;
+  padding: 15px;
+  border-radius: 8px;
+}
+.edit-tab-button {
+  float: right;
+  margin-left: 10px;
+}
+#fb-app-timeline, #fb-app-catalogs {
+  border: 1px solid #999;
+  border-radius: 8px;
+  padding: 10px;
+}
+#content #fb-app-catalogs h3 {
+  font-size: 120%;
+  color: inherit;
+  margin-top: 20px;
+}
+#fb-app-catalogs label {
+  margin-top: 20px;
+}
+.fb-app-submit-page-tab-options {
+  margin-top: 20px;
+}
+.fb-app-final-back-button {
+  margin-top: 70px;
+}
+.tokenfield .token {
+  height: auto !important;
+}
+
+@media (min-width: 768px) {
+  #noosfero-identity {
+    float: left;
+  }
+  #fb-connected {
+    font-size: 36px;
+    float:left;
+    margin: 0 30px;
+    color: #99f;
+  }
+  #fb-identity {
+    float: left;
+  }
+  #fb-app-timeline, #fb-app-catalogs {
+    width: 50%-$marginp;
+    float: left;
+  }
+  #fb-app-settings {
+    overflow: hidden;
+    padding-bottom: 400px;
+  }
+  #fb-app-catalogs {
+    margin-right: $marginp;
+  }
+}
+
@@ -0,0 +1,141 @@
+/*!
+ * bootstrap-tokenfield
+ * https://github.com/sliptree/bootstrap-tokenfield
+ * Copyright 2013-2014 Sliptree and other contributors; Licensed MIT
+ */
+/* General Typeahead styling, from http://jsfiddle.net/ragulka/Dy9au/1/ */
+.twitter-typeahead {
+  width: 100%;
+  position: relative;
+  vertical-align: top;
+}
+.twitter-typeahead .tt-input,
+.twitter-typeahead .tt-hint {
+  margin: 0;
+  width: 100%;
+  vertical-align: middle;
+  background-color: #ffffff;
+}
+.twitter-typeahead .tt-hint {
+  color: #999999;
+  z-index: 1;
+  border: 1px solid transparent;
+}
+.twitter-typeahead .tt-input {
+  color: #555555;
+  z-index: 2;
+}
+.twitter-typeahead .tt-input,
+.twitter-typeahead .tt-hint {
+  height: 34px;
+  padding: 6px 12px;
+  font-size: 14px;
+  line-height: 1.428571429;
+}
+.twitter-typeahead .input-sm.tt-input,
+.twitter-typeahead .hint-sm.tt-hint {
+  border-radius: 3px;
+}
+.twitter-typeahead .input-lg.tt-input,
+.twitter-typeahead .hint-lg.tt-hint {
+  border-radius: 6px;
+}
+.input-group .twitter-typeahead:first-child .tt-input,
+.input-group .twitter-typeahead:first-child .tt-hint {
+  border-radius: 4px 0 0 4px !important;
+}
+.input-group .twitter-typeahead:last-child .tt-input,
+.input-group .twitter-typeahead:last-child .tt-hint {
+  border-radius: 0 4px 4px 0 !important;
+}
+.input-group.input-group-sm .twitter-typeahead:first-child .tt-input,
+.input-group.input-group-sm .twitter-typeahead:first-child .tt-hint {
+  border-radius: 3px 0 0 3px !important;
+}
+.input-group.input-group-sm .twitter-typeahead:last-child .tt-input,
+.input-group.input-group-sm .twitter-typeahead:last-child .tt-hint {
+  border-radius: 0 3px 3px 0 !important;
+}
+.input-sm.tt-input,
+.hint-sm.tt-hint,
+.input-group.input-group-sm .tt-input,
+.input-group.input-group-sm .tt-hint {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.input-group.input-group-lg .twitter-typeahead:first-child .tt-input,
+.input-group.input-group-lg .twitter-typeahead:first-child .tt-hint {
+  border-radius: 6px 0 0 6px !important;
+}
+.input-group.input-group-lg .twitter-typeahead:last-child .tt-input,
+.input-group.input-group-lg .twitter-typeahead:last-child .tt-hint {
+  border-radius: 0 6px 6px 0 !important;
+}
+.input-lg.tt-input,
+.hint-lg.tt-hint,
+.input-group.input-group-lg .tt-input,
+.input-group.input-group-lg .tt-hint {
+  height: 45px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.33;
+}
+.tt-dropdown-menu {
+  width: 100%;
+  min-width: 160px;
+  margin-top: 2px;
+  padding: 5px 0;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+}
+.tt-suggestion {
+  display: block;
+  padding: 3px 20px;
+}
+.tt-suggestion.tt-cursor {
+  color: #262626;
+  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+}
+.tt-suggestion.tt-cursor a {
+  color: #ffffff;
+}
+.tt-suggestion p {
+  margin: 0;
+}
+/* Tokenfield-specific Typeahead styling */
+.tokenfield .twitter-typeahead {
+  width: auto;
+}
+.tokenfield .twitter-typeahead .tt-hint {
+  padding: 0;
+  height: 20px;
+}
+.tokenfield.input-sm .twitter-typeahead .tt-input,
+.tokenfield.input-sm .twitter-typeahead .tt-hint {
+  height: 18px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.tokenfield.input-lg .twitter-typeahead .tt-input,
+.tokenfield.input-lg .twitter-typeahead .tt-hint {
+  height: 23px;
+  font-size: 18px;
+  line-height: 1.33;
+}
+.tokenfield .twitter-typeahead .tt-suggestions {
+  font-size: 14px;
+}
@@ -0,0 +1,39 @@
+= content_for :head do
+  = javascript_include_tag 'typeahead.bundle.js'
+  = stylesheet_link_tag 'typeahead'
+  = stylesheet_link_tag 'plugins/fb_app/stylesheets/bootstrap-tokenfield.css'
+  = stylesheet_link_tag 'plugins/fb_app/stylesheets/tokenfield-typeahead.css'
+  = javascript_include_tag 'plugins/fb_app/javascripts/bootstrap-tokenfield.js'
+  = javascript_include_tag 'plugins/open_graph/javascripts/open_graph.js'
+
+- callback = '' unless defined? callback
+
+#fb-root
+#fb-app-modal-wrap style="display:none"
+  #fb-app-modal
+    #fb-app-modal-intro
+    = button_to_function 'cancel', '', "ff()", class: 'modal-button-no'
+    = button_to_function 'ok', '', "ff()", class: 'modal-button-yes'
+
+javascript:
+  // Adding locales:
+  fb_app.locales.error_empty_title = #{t('fb_app_plugin.views.myprofile.error.empty_title').to_json}
+  fb_app.locales.error_empty_settings = #{t('fb_app_plugin.views.myprofile.error.empty_settings').to_json}
+  fb_app.locales.cancel_button = #{t('fb_app_plugin.views.myprofile.catalogs.cancel_button').to_json}
+  fb_app.locales.confirm_removal = #{t('fb_app_plugin.views.myprofile.catalogs.confirm_removal').to_json}
+  fb_app.locales.confirm_removal_button = #{t('fb_app_plugin.views.myprofile.catalogs.confirm_removal_button').to_json}
+  fb_app.locales.confirm_disconnect = #{t('fb_app_plugin.views.myprofile.catalogs.confirm_disconnect').to_json}
+  fb_app.locales.confirm_disconnect_button = #{t('fb_app_plugin.views.myprofile.catalogs.confirm_disconnect_button').to_json}
+
+  // General settings:
+  fb_app.current_url = #{url_for(params).to_json};
+  fb_app.base_url = 'https://#{environment.default_hostname}/plugin/fb_app';
+
+  fb_app.page_tab.appId = #{FbAppPlugin.page_tab_app_credentials[:id].to_json},
+  fb_app.timeline.appId = #{FbAppPlugin.timeline_app_credentials[:id].to_json},
+  fb_app.page_tab.nextUrl = #{url_for(protocol: 'https', only_path: false).to_json}
+
+  fb_app.fb.prepareAsyncInit(fb_app.timeline.appId, #{callback.to_json});
+  fb_app.fb.init();
+/ must come after window.fbAsyncInit is defined
+= javascript_include_tag "https://connect.facebook.net/en_US/all.js"
@@ -0,0 +1,4 @@
+<div id="fb-app-wrapper">
+</div>
+
+<%# render 'load' %>
@@ -0,0 +1,8 @@
+html
+  head
+    = noosfero_javascript
+    = javascript_include_tag 'fb_app'
+    = noosfero_stylesheets
+    = h stylesheet_link_tag(jquery_ui_theme_stylesheet_path)
+  body
+    = yield
@@ -0,0 +1,14 @@
+- if @auth.connected?
+  #noosfero-identity
+    = profile_image profile
+    = profile.name
+  span#fb-connected.fa.fa-arrows-h
+  #fb-identity
+    = render 'identity', auth: @auth
+
+  = button_to_function 'close', t('fb_app_plugin.views.myprofile.disconnect'), 'fb_app.timeline.disconnect()', class:'fb-app-connection-button'
+
+- elsif @auth.not_authorized?
+  = button_to_function 'login', t('fb_app_plugin.views.myprofile.connect'), 'fb_app.timeline.connect()', size: '', option: 'primary', class:'fb-app-connection-button'
+- elsif @auth.expired?
+  = button_to_function 'login', t('fb_app_plugin.views.myprofile.reconnect'), 'fb_app.timeline.reconnect()', class:'fb-app-connection-button'
@@ -0,0 +1,11 @@
+h2
+  = t'fb_app_plugin.views.myprofile.catalogs.heading'
+  = render 'catalogs_help' rescue nil
+
+- profile.fb_app_page_tabs.each do |page_tab|
+  = render 'fb_app_plugin_page_tab/config', page_tab: page_tab
+
+#new-catalog
+  = render 'fb_app_plugin_page_tab/config', page_tab: profile.fb_app_page_tabs.build(owner_profile: profile)
+
+= render file: 'shared/tiny_mce', locals: {mode: 'simple'}
@@ -0,0 +1,7 @@
+.fb-app-identity
+  - picture = auth.fb_user.picture
+  / fb_graph version 1 compatibility
+  - url = if picture.respond_to? :url then picture.url else picture end
+  = image_tag url
+  = auth.fb_user.name
+
@@ -0,0 +1,7 @@
+= render 'fb_app_plugin/load', callback: 'fb_app.fb.checkLoginStatus()'
+
+javascript:
+  fb_app.config.url_prefix = #{url_for(action: :index).to_json}
+  fb_app.config.save_auth_url = #{url_for(action: :save_auth).to_json}
+  fb_app.config.show_login_url = #{url_for(action: :show_login).to_json}
+
@@ -0,0 +1,28 @@
+h1= t'fb_app_plugin.lib.plugin.name'
+= button :back, _('Back to control panel'), controller: 'profile_editor'
+
+#fb-app-connect-status
+  = render 'intro' rescue nil if @auth.not_authorized?
+  #fb-app-auth
+    = render 'auth'
+
+- if @auth.connected? or Rails.env.development?
+  #fb-app-catalogs
+    = render 'catalogs'
+  #fb-app-timeline
+    - if profile.person?
+      h2= t'fb_app_plugin.views.myprofile.timeline.heading'
+
+      - unless FbAppPlugin.test_user? user
+        h3= t'fb_app_plugin.views.myprofile.timeline.explanation_title'
+        p= t'fb_app_plugin.views.myprofile.timeline.explanation_text'
+      - else
+        #track-form
+          = render 'track_form', context: :fb_app
+    - else
+      = t'fb_app_plugin.views.myprofile.timeline.organization_redirect',
+        type: t("fb_app_plugin.views.myprofile.timeline.organization_from_#{profile.class.name.underscore}"),
+        redirect_link: link_to(t('fb_app_plugin.views.myprofile.timeline.redirect_link'), host: FbAppPlugin.config[:app][:domain], profile: user.identifier, controller: :fb_app_plugin_myprofile)
+.clean
+
+= button :back, _('Back to control panel'), {controller: 'profile_editor'}, class: 'fb-app-final-back-button'
@@ -0,0 +1,6 @@
+= render 'load'
+javascript:
+  fb_app.auth.status = #{(@auth.status rescue FbAppPlugin::Auth::Status::NotAuthorized).to_json}
+
+#fb-app-settings
+  = render 'settings'
@@ -0,0 +1,13 @@
+.page-tab id="page-tab-#{page_tab.id || 'new'}"
+  - if page_tab.page_id
+    h3
+      = page_tab.title
+      = button_to_function_without_text 'edit', t('fb_app_plugin.views.myprofile.catalogs.edit_button') % {catalog_title: page_tab.title},
+        "fb_app.page_tab.config.edit($(this))", class: 'edit-tab-button'
+      = button_to_function_without_text 'remove', t('fb_app_plugin.views.myprofile.catalogs.remove_button') % {catalog_title: page_tab.title},
+        "fb_app.page_tab.config.remove($(this), '#{url_for(controller: :fb_app_plugin_page_tab, action: :destroy, id: page_tab.id)}')", class: 'edit-tab-button'
+      = button_without_text 'eyes', t('fb_app_plugin.views.myprofile.catalog.see_page'), page_tab.facebook_url, target: '_blank', class: 'edit-tab-button'
+  - else
+    = button_to_function 'add', t('fb_app_plugin.views.myprofile.catalogs.new'), "$(this).toggle(); $('#page-tab-new h3, #add_tab').toggle(400)"
+
+  = render 'fb_app_plugin_page_tab/configure_form', page_tab: page_tab, signed_request: nil
@@ -0,0 +1,7 @@
+#manage-fb-store-ctrl
+  - if @page_tab.owner_profile
+    - if logged_in? and (user.is_admin? environment or user.is_admin? @page_tab.owner_profile)
+      = button :edit, t('fb_app_plugin.views.page_tab.edit_catalog'), {controller: :fb_app_plugin_myprofile, profile: @page_tab.owner_profile.identifier},
+        target: '_parent'
+  - elsif (@data[:page][:admin] rescue false)
+    = button :edit, t('fb_app_plugin.views.page_tab.edit_catalog'), {controller: :fb_app_plugin_page_tab, action: :admin, signed_request: @signed_requests, page_id: @page_ids}, onclick: "noosfero.modal.url(this.href); return false;"
@@ -0,0 +1,37 @@
+- form_id = if page_tab.id then "edit_tab_#{page_tab.id}" else "add_tab" end
+
+- unless page_tab.id
+  h3= t'fb_app_plugin.views.myprofile.catalogs.new'
+
+= form_for page_tab, as: :page_tab, url: {controller: :fb_app_plugin_page_tab, action: :admin},
+  html: {id: form_id, class: "edit-page-tab", onsubmit: "return fb_app.page_tab.config.save($(this))"} do |f|
+
+  = hidden_field_tag :signed_request, signed_request
+  = hidden_field_tag :page_id, page_tab.page_id
+  = f.hidden_field :profile_id, value: profile.id
+  = f.hidden_field :page_id
+
+  = f.label :title, t("fb_app_plugin.views.myprofile.catalogs.catalog_title_label")
+  = f.text_field :title, class: 'form-control'
+
+  = f.label :subtitle, t("fb_app_plugin.views.myprofile.catalogs.catalog_subtitle_label")
+  = f.text_area :subtitle, class: 'form-control mceEditor', id: "page-tab-subtitle-#{page_tab.id}"
+
+  = f.label :config_type, t("fb_app_plugin.views.myprofile.catalogs.catalog_type_chooser_label")
+  = f.select :config_type,
+    page_tab.types.map{ |type| [t("fb_app_plugin.models.page_tab.types.#{if profile.enterprise? and type == :profile then :other_profile else type end}"), type] },
+    {}, onchange: 'fb_app.page_tab.config.change_type($(this))', class: 'form-control'
+
+  - page_tab.types.each do |type|
+    div class="config-type config-type-#{type}"
+      = render "fb_app_plugin_page_tab/configure_#{type}", f: f, page_tab: page_tab
+
+  - if page_tab.new_record?
+    = submit_button :add, t('fb_app_plugin.views.page_tab.add'), onclick: 'return fb_app.page_tab.config.add($(this.form))', class: 'fb-app-submit-page-tab-options'
+  - else
+    = submit_button :save, t('fb_app_plugin.views.page_tab.save'), class: 'fb-app-submit-page-tab-options'
+
+javascript:
+  $('document').ready(function() {
+    fb_app.page_tab.config.init();
+  });
@@ -0,0 +1,27 @@
+= f.label t("fb_app_plugin.views.myprofile.catalogs.profile_chooser_label")
+= f.text_field :profile_ids, "data-limit" => "1", "data-placeholder" => t('fb_app_plugin.views.page_tab.profile.placeholder'), onchange: 'fb_app.page_tab.config.profile.onchange($(this))'
+
+javascript:
+  $(document).ready(function() {
+    var selector = '#page-tab-#{page_tab.id || 'new'} .config-type-profile #page_tab_profile_ids'
+
+    fb_app.page_tab.config.profile.onchange($(selector))
+
+    open_graph.autocomplete.init(
+      #{url_for(controller: :fb_app_plugin_page_tab, action: :enterprise_search).to_json},
+      selector,
+      #{[page_tab.profile].compact.map{ |p| {value: p.id, label: render('open_graph_plugin/myprofile/ac_profile', profile: p), } }.to_json},
+      {tokenfield: {limit: 1}}
+    )
+
+    if (#{page_tab.profile.present?.to_json})
+      $(selector+'-tokenfield').hide()
+
+    $(selector)
+      .on('tokenfield:createdtoken', function (e) {
+        $(selector+'-tokenfield').hide();
+      })
+      .on('tokenfield:removedtoken', function (e) {
+        $(selector+'-tokenfield').show();
+      })
+  })
@@ -0,0 +1,11 @@
+= f.label t("fb_app_plugin.views.myprofile.catalogs.profiles_chooser_label")
+= f.text_field :profile_ids, placeholder: t('fb_app_plugin.views.page_tab.profiles.placeholder')
+
+javascript:
+  $(document).ready(function() {
+    open_graph.autocomplete.init(
+      #{url_for(controller: :fb_app_plugin_page_tab, action: :enterprise_search).to_json},
+      '#page-tab-#{page_tab.id || 'new'} .config-type-profiles #page_tab_profile_ids',
+      #{page_tab.profiles.map{ |p| {value: p.id, label: render('open_graph_plugin/myprofile/ac_profile', profile: p), } }.to_json}
+    )
+  })
@@ -0,0 +1,4 @@
+= f.label t("fb_app_plugin.views.myprofile.catalogs.query_label")
+p= t'fb_app_plugin.views.myprofile.catalogs.query_help'
+= f.text_field :query, placeholder: t('fb_app_plugin.views.page_tab.query.placeholder'), class: 'form-control'
+
@@ -0,0 +1,5 @@
+#page-tab-footer
+  #page-tab-footer1.col-lg-6.col-md-6.col-sm-6.text-left
+    = t'fb_app_plugin.views.page_tab.footer1'
+  #page-tab-footer2.col-lg-6.col-md-6.col-sm-6.text-right
+    = t'fb_app_plugin.views.page_tab.footer2'
@@ -0,0 +1,6 @@
+- callback = '' unless defined? callback
+
+= render 'fb_app_plugin/load', callback: callback
+
+javascript:
+  fb_app.page_tab.init();
@@ -0,0 +1,4 @@
+h1= @page_tab.title
+
+- if @page_tab.subtitle.present?
+  #page-tab-subtitle= @page_tab.subtitle
@@ -0,0 +1,6 @@
+#fb-app-page-tab-admin
+  = render 'admin_intro' rescue nil
+
+  = render 'config', page_tab: @page_tab, page_id: @page_id, signed_request: @signed_request
+  = render file: 'shared/tiny_mce', locals: {mode: 'simple'}
+
@@ -0,0 +1,2 @@
+fb_app.page_tab.config.close(<%= @page_id.to_json %>);
+
@@ -0,0 +1,21 @@
+#fb-app-catalog-wrapper class=('fb-app-standalone' if @signed_request.blank?)
+
+  = render 'load'
+  = render 'title_and_subtitle'
+
+  #product-catalog
+    #product-catalog-actions
+      - if @page_tab.config_type == :profile
+        - if profile and user.present? and (user.is_admin?(environment) or user.is_admin?(profile))
+          .product-catalog-ctrl
+            = button :add, _('Add product or service'), controller: :manage_products, action: :new, profile: profile.identifier
+      = render 'configure_button'
+    = content_for :product_page do
+      = render 'catalog/results'
+    = render 'catalog/search'
+    = render 'catalog/javascripts', external: false
+
+  = render 'footer'
+
+  javascript:
+    catalog.base_url_path = #{url_for(controller: :fb_app_plugin_page_tab, action: :index, page_id: params[:page_id], signed_request: params[:signed_request]).to_json} + '&'
@@ -0,0 +1,3 @@
+javascript:
+  noosfero.modal.url(#{url_for(controller: :fb_app_plugin, action: :admin, page_id: @page_ids).to_json})
+
@@ -0,0 +1,11 @@
+= render 'title_and_subtitle'
+
+= button :back, t('fb_app_plugin.views.page_tab.back_to_catalog'), params.except(:product_id), target: ''
+
+= render file: "#{Rails.root}/app/views/manage_products/show.html.erb"
+
+= button :back, t('fb_app_plugin.views.page_tab.back_to_catalog'), params.except(:product_id), target: ''
+
+= render 'footer'
+
+= render 'load'
@@ -12,9 +12,9 @@ class Article
     end,
     title: proc{ |a, plugin| "#{a.title} - #{a.profile.name}" },
     image: proc do |a, plugin|
-      img = a.body_images_paths
-      img = "#{a.profile.environment.top_url}#{a.profile.image.public_filename}" if a.profile.image if img.blank?
-      img ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if img.blank?
+      img = a.body_images_paths.map! &:html_safe
+      img = "#{a.profile.environment.top_url}#{a.profile.image.public_filename}".html_safe if a.profile.image if img.blank?
+      img ||= MetadataPlugin.config[:open_graph][:environment_logo].html_safe rescue nil if img.blank?
       img
     end,
     see_also: [],
@@ -31,10 +31,10 @@ class Article
     card: 'summary',
     description: proc do |a, plugin|
       description = a.body.to_s || a.environment.name
-      CGI.escapeHTML(plugin.helpers.truncate(plugin.helpers.strip_tags(description), length: 200))
+      plugin.helpers.truncate plugin.helpers.strip_tags(description), length: 200
     end,
     title: proc{ |a, plugin| "#{a.title} - #{a.profile.name}" },
-    image: proc{ |a, plugin| a.body_images_paths },
+    image: proc{ |a, plugin| a.body_images_paths.map! &:html_safe },
   }
   metadata_spec namespace: :article, key_attr: :property, tags: {
@@ -14,8 +14,8 @@ class Product
     description: proc{ |p, plugin| ActionView::Base.full_sanitizer.sanitize p.description },
     image: proc do |p, plugin|
-      img = "#{p.environment.top_url}#{p.image.public_filename}" if p.image
-      img = "#{p.environment.top_url}#{p.profile.image.public_filename}" if img.blank? and p.profile.image
+      img = "#{p.environment.top_url}#{p.image.public_filename}".html_safe if p.image
+      img = "#{p.environment.top_url}#{p.profile.image.public_filename}".html_safe if img.blank? and p.profile.image
       img ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if img.blank?
       img
     end,
@@ -5,8 +5,8 @@ class Profile
   metadata_spec namespace: :og, tags: {
     type: proc{ |p, plugin| plugin.context.params[:og_type] || MetadataPlugin.og_types[:profile] || :profile },
     image: proc do |p, plugin|
-      img = "#{p.environment.top_url}#{p.image.public_filename}" if p.image
-      img ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if img.blank?
+      img = "#{p.environment.top_url}#{p.image.public_filename}".html_safe if p.image
+      img ||= MetadataPlugin.config[:open_graph][:environment_logo].html_safe rescue nil if img.blank?
       img
     end,
     title: proc{ |p, plugin| if p.nickname.present? then p.nickname else p.name end },
@@ -13,7 +13,7 @@ class UploadedFile
       plugin.og_url_for url
     end,
     title: proc{ |u, plugin| u.title },
-    image: proc{ |u, plugin| "#{u.environment.top_url}#{u.public_filename}" if u.image? },
+    image: proc{ |u, plugin| "#{u.environment.top_url}#{u.public_filename}".html_safe if u.image? },
     description: proc{ |u, plugin| u.abstract || u.title },
   }
@@ -50,7 +50,8 @@ class MetadataPlugin::Base &lt; Noosfero::Plugin
           Array(values).each do |value|
             value = value.call(object, plugin) if value.is_a? Proc rescue nil
             next if value.blank?
-            r << tag(:meta, key_attr => key, value_attr => CGI.escape_html(value.to_s))
+            value = h value unless value.html_safe?
+            r << tag(:meta, {key_attr => key, value_attr => value.to_s}, false, false)
           end
         end
       end
@@ -7,7 +7,8 @@ module MetadataPlugin::UrlHelper
   def og_url_for options
     options.delete :port
     options[:host] = self.og_domain
-    Noosfero::Application.routes.url_helpers.url_for options
+    url = Noosfero::Application.routes.url_helpers.url_for options
+    url.html_safe
   end
   def og_profile_url profile
@@ -45,6 +45,14 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/x.png/  }
   end
+  should 'escape utf8 characters correctly' do
+    a = TinyMceArticle.create(name: 'Article to be shared with images', body: 'This article should be shared with all social networks <img src="/images/ç.png" />', profile: profile)
+
+    get :view_page, profile: profile.identifier, page: [ a.name.to_slug ]
+    assert_tag tag: 'meta', attributes: { property: 'og:image', content: /\/images\/%C3%A7.png/  }
+  end
+
+
   should 'render not_found page properly' do
     assert_equal false, Article.exists?(:slug => 'non-existing-page')
     assert_nothing_raised do
@@ -4,8 +4,8 @@ class OauthClientPluginPublicController &lt; PublicController
   def callback
     auth = request.env["omniauth.auth"]
-    user = environment.users.find_by_email(auth.info.email)
-    user ? login(user) : signup(auth)
+    auth_user = environment.users.where(email: auth.info.email).first
+    if auth_user then login auth_user.person else signup auth end
   end
   def failure
@@ -20,14 +20,12 @@ class OauthClientPluginPublicController &lt; PublicController
   protected
-  def login(user)
+  def login person
     provider = OauthClientPlugin::Provider.find(session[:provider_id])
-    user_provider = user.oauth_user_providers.find_by_provider_id(provider.id)
-    unless user_provider
-      user_provider = user.oauth_user_providers.create(:user => user, :provider => provider, :enabled => true)
-    end
-    if user_provider.enabled? && provider.enabled?
-      session[:user] = user.id
+    auth = person.oauth_auths.where(provider_id: provider.id).first
+    auth ||= person.oauth_auths.create! profile: person, provider: provider, enabled: true
+    if auth.enabled? && provider.enabled?
+      self.current_user = person.user
     else
       session[:notice] = _("Can't login with %s") % provider.name
     end
@@ -0,0 +1,20 @@
+class DeserializeFieldsOnOauthClientPluginProvider < ActiveRecord::Migration
+
+  def up
+    add_column :oauth_client_plugin_providers, :client_id, :text
+    add_column :oauth_client_plugin_providers, :client_secret, :text
+
+    OauthClientPlugin::Provider.find_each batch_size: 50 do |provider|
+      provider.client_id = provider.options.delete :client_id
+      provider.client_secret = provider.options.delete :client_secret
+      provider.save!
+    end
+
+    add_index :oauth_client_plugin_providers, :client_id
+  end
+
+  def down
+    say "this migration can't be reverted"
+  end
+
+end
@@ -0,0 +1,26 @@
+class AddAuthorizationDataToOauthClientUserProvider < ActiveRecord::Migration
+
+  def change
+    rename_table :oauth_client_plugin_user_providers, :oauth_client_plugin_auths
+
+    add_column :oauth_client_plugin_auths, :type, :string
+    add_column :oauth_client_plugin_auths, :provider_user_id, :string
+    add_column :oauth_client_plugin_auths, :access_token, :text
+    add_column :oauth_client_plugin_auths, :expires_at, :datetime
+    add_column :oauth_client_plugin_auths, :scope, :text
+    add_column :oauth_client_plugin_auths, :data, :text, default: {}.to_yaml
+
+    add_column :oauth_client_plugin_auths, :profile_id, :integer
+    OauthClientPlugin::Auth.find_each batch_size: 50 do |auth|
+      auth.profile = User.find(auth.user_id).person
+      auth.save!
+    end
+    remove_column :oauth_client_plugin_auths, :user_id
+
+    add_index :oauth_client_plugin_auths, :profile_id
+    add_index :oauth_client_plugin_auths, :provider_id
+    add_index :oauth_client_plugin_auths, :provider_user_id
+    add_index :oauth_client_plugin_auths, :type
+  end
+
+end
@@ -0,0 +1,8 @@
+require_dependency 'profile'
+
+class Profile
+
+  has_many :oauth_auths, class_name: 'OauthClientPlugin::Auth', dependent: :destroy
+  has_many :oauth_providers, through: :oauth_auths, source: :provider
+
+end
@@ -2,8 +2,14 @@ require_dependency &#39;user&#39;
 class User
-  has_many :oauth_user_providers, :class_name => 'OauthClientPlugin::UserProvider'
-  has_many :oauth_providers, :through => :oauth_user_providers, :source => :provider
+  has_many :oauth_auths, through: :person
+  has_many :oauth_providers, through: :oauth_auths, source: :provider
+
+  after_create :activate_oauth_user
+
+  def activate_oauth_user
+    self.activate if oauth_providers.present?
+  end
   def password_required_with_oauth?
     password_required_without_oauth? && oauth_providers.empty?
@@ -11,17 +17,6 @@ class User
   alias_method_chain :password_required?, :oauth
-  after_create :activate_oauth_user
-
-  def activate_oauth_user
-    unless oauth_providers.empty?
-      activate
-      oauth_providers.each do |provider|
-        OauthClientPlugin::UserProvider.create!(:user => self, :provider => provider, :enabled => true)
-      end
-    end
-  end
-
   def make_activation_code_with_oauth
     oauth_providers.blank? ? make_activation_code_without_oauth : nil
   end
@@ -45,7 +45,9 @@ class OauthClientPlugin &lt; Noosfero::Plugin
     true
   end
-  OmniAuth.config.on_failure = OauthClientPluginPublicController.action(:failure)
+  Rails.configuration.to_prepare do
+    OmniAuth.config.on_failure = OauthClientPluginPublicController.action(:failure)
+  end
   Rails.application.config.middleware.use OmniAuth::Builder do
     PROVIDERS.each do |provider, options|
@@ -60,7 +62,8 @@ class OauthClientPlugin &lt; Noosfero::Plugin
         provider_id = request.params['id']
         provider_id ||= request.session['omniauth.params']['id'] if request.session['omniauth.params']
         provider = environment.oauth_providers.find(provider_id)
-        strategy.options.merge!(provider.options.symbolize_keys)
+        strategy.options.merge! client_id: provider.client_id, client_secret: provider.client_secret
+        strategy.options.merge! provider.options.symbolize_keys
         request.session[:provider_id] = provider_id
       }
@@ -1,20 +0,0 @@
-class OauthClientPlugin::Provider < ActiveRecord::Base
-
-  belongs_to :environment
-
-  validates_presence_of :name, :strategy
-
-  acts_as_having_image
-  acts_as_having_settings :field => :options
-
-  settings_items :client_id, :type => :string
-  settings_items :client_secret, :type => :string
-  settings_items :client_options, :type => Hash
-
-  attr_accessible :name, :environment, :strategy, :client_id, :client_secret, :enabled, :client_options, :image_builder
-
-  scope :enabled, -> { where enabled: true }
-
-  acts_as_having_image
-
-end
@@ -1,10 +0,0 @@
-class OauthClientPlugin::UserProvider < ActiveRecord::Base
-
-   belongs_to :user, :class_name => 'User'
-   belongs_to :provider, :class_name => 'OauthClientPlugin::Provider'
-
-   self.table_name = :oauth_client_plugin_user_providers
-
-   attr_accessible :user, :provider, :enabled
-
-end
@@ -0,0 +1,29 @@
+class OauthClientPlugin::Auth < ActiveRecord::Base
+
+  attr_accessible :profile, :provider, :enabled,
+    :access_token, :expires_in
+
+  belongs_to :profile, class_name: 'Profile'
+  belongs_to :provider, class_name: 'OauthClientPlugin::Provider'
+
+  validates_presence_of :profile
+  validates_presence_of :provider
+  validates_uniqueness_of :profile_id, scope: :provider_id
+
+  acts_as_having_settings field: :data
+
+  def expires_in
+    self.expires_at - Time.now
+  end
+  def expires_in= value
+    self.expires_at = Time.now + value.to_i
+  end
+
+  def expired?
+    Time.now > self.expires_at rescue true
+  end
+  def not_expired?
+    not self.expired?
+  end
+
+end
@@ -0,0 +1,21 @@
+class OauthClientPlugin::Provider < ActiveRecord::Base
+
+  belongs_to :environment
+
+  validates_presence_of :name, :strategy
+
+  acts_as_having_image
+  acts_as_having_settings field: :options
+
+  settings_items :site, type: String
+  settings_items :client_options, type: Hash
+
+  attr_accessible :name, :strategy, :enabled, :site, :image_builder,
+    :environment, :environment_id,
+    :client_id, :client_secret, :client_options
+
+  scope :enabled, -> { where enabled: true }
+
+  acts_as_having_image
+
+end
-require_relative '../test_helper'
+require 'test_helper'
 class OauthClientPluginPublicControllerTest < ActionController::TestCase
@@ -21,7 +21,7 @@ class OauthClientPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'redirect to login when user is found' do
-    user = fast_create(User, :environment_id => environment.id)
+    user = create_user
     auth.info.stubs(:email).returns(user.email)
     auth.info.stubs(:name).returns(user.name)
     session[:provider_id] = provider.id
@@ -32,7 +32,7 @@ class OauthClientPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'do not login when the provider is disabled' do
-    user = fast_create(User, :environment_id => environment.id)
+    user = create_user
     auth.info.stubs(:email).returns(user.email)
     auth.info.stubs(:name).returns(user.name)
     session[:provider_id] = provider.id
@@ -44,11 +44,11 @@ class OauthClientPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'do not login when the provider is disabled for a user' do
-    user = fast_create(User, :environment_id => environment.id)
+    user = create_user
     auth.info.stubs(:email).returns(user.email)
     auth.info.stubs(:name).returns(user.name)
     session[:provider_id] = provider.id
-    user.oauth_user_providers.create(:user => user, :provider => provider, :enabled => false)
+    user.person.oauth_auths.create!(profile: user.person, provider: provider, enabled: false)
     get :callback
     assert_redirected_to :controller => :account, :action => :login
@@ -56,7 +56,7 @@ class OauthClientPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'save provider when an user login with it' do
-    user = fast_create(User, :environment_id => environment.id)
+    user = create_user
     auth.info.stubs(:email).returns(user.email)
     auth.info.stubs(:name).returns(user.name)
     session[:provider_id] = provider.id
@@ -66,13 +66,13 @@ class OauthClientPluginPublicControllerTest &lt; ActionController::TestCase
   end
   should 'do not duplicate relations between an user and a provider when the same provider was used again in a login' do
-    user = fast_create(User, :environment_id => environment.id)
+    user = create_user
     auth.info.stubs(:email).returns(user.email)
     auth.info.stubs(:name).returns(user.name)
     session[:provider_id] = provider.id
     get :callback
-    assert_no_difference 'user.oauth_user_providers.count' do
+    assert_no_difference 'user.oauth_auths.count' do
       3.times { get :callback }
     end
   end
-require_relative '../test_helper'
+require 'test_helper'
 class UserTest < ActiveSupport::TestCase
-require_relative '../test_helper'
+require 'test_helper'
 class OauthClientPluginTest < ActiveSupport::TestCase
-require_relative '../test_helper'
+require 'test_helper'
 class UserTest < ActiveSupport::TestCase
@@ -0,0 +1,10 @@
+class AddStoryAndPublishedAtToOpenGraphPluginActivity < ActiveRecord::Migration
+
+  def change
+    add_column :open_graph_plugin_tracks, :published_at, :datetime
+    add_column :open_graph_plugin_tracks, :story, :string
+    add_index :open_graph_plugin_tracks, :published_at
+    add_index :open_graph_plugin_tracks, :story
+  end
+
+end
@@ -17,5 +17,9 @@ module OpenGraphPlugin
     Thread.current[:open_graph_context] = value
   end
+  def self.debug? actor=nil
+    !Rails.env.production?
+  end
+
 end
 class OpenGraphPlugin::Publisher
-  attr_accessor :actions
-  attr_accessor :objects
-
   def self.default
     @default ||= self.new
   end
   def initialize attributes = {}
-    # defaults
-    self.actions = OpenGraphPlugin::Stories::DefaultActions
-    self.objects = OpenGraphPlugin::Stories::DefaultObjects
-
     attributes.each do |attr, value|
       self.send "#{attr}=", value
     end
   end
-  def publish actor, story_defs, object_data_url
-    raise 'abstract method called'
-  end
-
   def publish_stories object_data, actor, stories
     stories.each do |story|
       begin
         self.publish_story object_data, actor, story
       rescue => e
+        raise unless Rails.env.production?
         ExceptionNotifier.notify_exception e
       end
     end
   end
-  def update_delay
-    1.day
-  end
-
-  # only publish recent objects to avoid multiple publications
-  def recent_publish? actor, object_type, object_data_url
-    activity_params = {actor_id: actor.id, object_type: object_type, object_data_url: object_data_url}
-    activity = OpenGraphPlugin::Activity.where(activity_params).first
-    activity.present? and activity.created_at <= self.update_delay.from_now
-  end
-
   def publish_story object_data, actor, story
-    OpenGraphPlugin.context = self.context
-    defs = OpenGraphPlugin::Stories::Definitions[story]
-    passive = defs[:passive]
-
-    print_debug "open_graph: publish_story #{story}" if debug? actor
-    match_criteria = if (ret = self.call defs[:criteria], object_data, actor).nil? then true else ret end
-    return unless match_criteria
-    print_debug "open_graph: #{story} match criteria" if debug? actor
-    match_condition = if (ret = self.call defs[:publish_if], object_data, actor).nil? then true else ret end
-    return unless match_condition
-    print_debug "open_graph: #{story} match publish_if" if debug? actor
-
-    actors = self.story_trackers defs, actor, object_data
-    return if actors.blank?
-    print_debug "open_graph: #{story} has enabled trackers" if debug? actor
-
-    if publish = defs[:publish]
-      begin
-        instance_exec actor, object_data, &publish
-      rescue => e
-        print_debug "open_graph: can't publish story: #{e.message}" if debug? actor
-        ExceptionNotifier.notify_exception e
-      end
-    else
-      # force profile identifier for custom domains and fixed host. see og_url_for
-      object_profile = self.call(story_defs[:object_profile], object_data) || object_data.profile rescue nil
-      extra_params = if object_profile then {profile: object_profile.identifier} else {} end
-
-      custom_object_data_url = self.call defs[:object_data_url], object_data, actor
-      object_data_url = if passive then self.passive_url_for object_data, custom_object_data_url, defs, extra_params else self.url_for object_data, custom_object_data_url, extra_params end
-
-      actors.each do |actor|
-        print_debug "open_graph: start publishing" if debug? actor
-        begin
-          self.publish actor, defs, object_data_url
-        rescue => e
-          print_debug "open_graph: can't publish story: #{e.message}" if debug? actor
-          ExceptionNotifier.notify_exception e
-        end
-      end
-    end
-  end
-
-  def story_trackers story_defs, actor, object_data
-    passive = story_defs[:passive]
-    trackers = []
-
-    track_configs = Array(story_defs[:track_config]).compact.map(&:constantize)
-    return if track_configs.empty?
-    print_debug "open_graph: using configs: #{track_configs.map(&:name).inspect}" if debug? actor
-
-    if passive
-      object_profile = self.call(story_defs[:object_profile], object_data) || object_data.profile rescue nil
-      return unless object_profile
-
-      track_configs.each do |c|
-        trackers.concat c.trackers_to_profile(object_profile)
-      end.flatten
-
-      trackers.select! do |t|
-        track_configs.any?{ |c| c.enabled? self.context, t }
-      end
-    else #active
-      object_actor = self.call(story_defs[:object_actor], object_data) || object_data.profile rescue nil
-      return unless object_actor and object_actor.person?
-      custom_actor = self.call(story_defs[:custom_actor], object_data)
-      actor = custom_actor if custom_actor
-
-      match_track = track_configs.any? do |c|
-        c.enabled?(self.context, actor) and
-          actor.send("open_graph_#{c.track_name}_track_configs").where(object_type: story_defs[:object_type]).first
-      end
-      trackers << actor if match_track
-    end
-
-    trackers
+    OpenGraphPlugin.context = OpenGraphPlugin::Activity.context
+    a = OpenGraphPlugin::Activity.new object_data: object_data, actor: actor, story: story
+    a.dispatch_publications
+    a.save
   end
   protected
-  include MetadataPlugin::UrlHelper
-
-  def register_publish attributes
-    OpenGraphPlugin::Activity.create! attributes
-  end
-
-  # Call don't ask: move to a og_url method inside object
-  def url_for object, custom_url=nil, extra_params={}
-    return custom_url if custom_url.is_a? String
-    url = custom_url || if object.is_a? Profile then og_profile_url object else object.url end
-    # for profile when custom domain is used
-    url.merge! profile: object.profile.identifier if object.respond_to? :profile
-    url.merge! extra_params
-    self.og_url_for url
-  end
-
-  def passive_url_for object, custom_url, story_defs, extra_params={}
-    object_type = story_defs[:object_type]
-    extra_params.merge! og_type: MetadataPlugin.og_types[object_type]
-    self.url_for object, custom_url, extra_params
-  end
-
-  def call p, *args
-    p and instance_exec *args, &p
-  end
-
-  def context
-    :open_graph
-  end
-
-  def print_debug msg
-    puts msg
-    Delayed::Worker.logger.debug msg
-  end
-  def debug? actor=nil
-    !Rails.env.production?
-  end
-
 end
@@ -99,13 +99,6 @@ class OpenGraphPlugin::Stories
       publish_if: proc do |article, actor|
         article.published?
       end,
-      object_data_url: proc do |article, actor|
-        url = article.url
-        if og_type = MetadataPlugin::og_types[:forum]
-          url[:og_type] = og_type
-        end
-        url
-      end,
     },
     # these a published as passive to give focus to the enterprise
@@ -0,0 +1,24 @@
+module OpenGraphPlugin::UrlHelper
+
+  protected
+
+  include MetadataPlugin::UrlHelper
+
+  # Call don't ask: move to a og_url method inside object
+  def url_for object, custom_url=nil, extra_params={}
+    return custom_url if custom_url.is_a? String
+    url = custom_url || if object.is_a? Profile then og_profile_url object else object.url end
+    # for profile when custom domain is used
+    url.merge! profile: object.profile.identifier if object.respond_to? :profile
+    url.merge! extra_params
+    self.og_url_for url
+  end
+
+  def passive_url_for object, custom_url, story_defs, extra_params={}
+    object_type = story_defs[:object_type]
+    og_type = MetadataPlugin.og_types[object_type]
+    extra_params.merge! og_type: og_type if og_type.present?
+    self.url_for object, custom_url, extra_params
+  end
+
+end
 # This is a log of activities, unlike ActivityTrack that is a configuration
 class OpenGraphPlugin::Activity < OpenGraphPlugin::Track
+  Defs = OpenGraphPlugin::Stories::Definitions
+
+  UpdateDelay = 1.day
+
+  class_attribute :actions, :objects
+  self.actions = OpenGraphPlugin::Stories::DefaultActions
+  self.objects = OpenGraphPlugin::Stories::DefaultObjects
+
+  validates_presence_of :action
+  validates_presence_of :object_type
+
   # subclass this to define (e.g. FbAppPlugin::Activity)
   def scrape
+    raise NotImplementedError
+  end
+  def publish! actor = self.actor
+    self.published_at = Time.now
+    print_debug "open_graph: published with success" if debug? actor
+  end
+
+  def defs
+    @defs ||= Defs[self.story.to_sym]
+  end
+  def object_profile
+    @object_profile ||= self.call(self.defs[:object_profile], self.object_data) || self.object_data.profile rescue nil
+  end
+  def track_configs
+    @track_configs ||= Array(self.defs[:track_config]).compact.map(&:constantize)
+  end
+  def match_criteria?
+    if (ret = self.call self.defs[:criteria], self.object_data, self.actor).nil? then true else ret end
+  end
+  def match_publish_if?
+    if (ret = self.call self.defs[:publish_if], self.object_data, self.actor).nil? then true else ret end
+  end
+  def custom_object_data_url
+    @custom_object_data_url ||= self.call defs[:object_data_url], self.object_data, self.actor
+  end
+  def object_actor
+    @object_actor ||= self.call(self.defs[:object_actor], self.object_data) || self.object_data.profile rescue nil
+  end
+  def custom_actor
+    @custom_actor ||= self.call self.defs[:custom_actor], self.object_data
+  end
+
+  def set_object_data_url
+    # force profile identifier for custom domains and fixed host. see og_url_for
+    extra_params = if self.object_profile then {profile: self.object_profile.identifier} else {} end
+
+    self.object_data_url = if self.defs[:passive] then self.passive_url_for self.object_data, self.custom_object_data_url, self.defs, extra_params else self.url_for self.object_data, self.custom_object_data_url, extra_params end
+  end
+
+  def dispatch_publications
+    print_debug "open_graph: dispatch_publications of #{story}" if debug? self.actor
+
+    return unless self.match_criteria?
+    print_debug "open_graph: #{story} match criteria" if debug? self.actor
+    return unless self.match_publish_if?
+    print_debug "open_graph: #{story} match publish_if" if debug? self.actor
+    return unless (actors = self.trackers).present?
+    print_debug "open_graph: #{story} has enabled trackers" if debug? self.actor
+
+    self.set_object_data_url
+    self.action = self.class.actions[self.defs[:action]]
+    self.object_type = self.class.objects[self.defs[:object_type]]
+
+    print_debug "open_graph: start publishing" if debug? actor
+    unless (publish = self.defs[:publish]).present?
+      actors.each do |actor|
+        begin
+          self.publish! actor
+        rescue => e
+          print_debug "open_graph: can't publish story: #{e.message}" if debug? actor
+          raise unless Rails.env.production?
+          ExceptionNotifier.notify_exception e
+        end
+      end
+    else # custom publish proc
+      begin
+        instance_exec self.actor, self.object_data, &publish
+      rescue => e
+        print_debug "open_graph: can't publish story: #{e.message}" if debug? self.actor
+        raise unless Rails.env.production?
+        ExceptionNotifier.notify_exception e
+      end
+    end
+  end
+
+  def trackers
+    @trackers ||= begin
+      return if self.track_configs.empty?
+      trackers = []
+
+      print_debug "open_graph: using configs: #{self.track_configs.map(&:name).inspect}" if debug? self.actor
+
+      if self.defs[:passive]
+        return unless self.object_profile
+
+        self.track_configs.each do |c|
+          trackers.concat c.trackers_to_profile(self.object_profile)
+        end.flatten
+
+        trackers.select! do |t|
+          self.track_configs.any?{ |c| c.enabled? self.context, t }
+        end
+      else #active
+        return unless self.object_actor and self.object_actor.person?
+        actor = self.custom_actor || self.actor
+
+        match_track = self.track_configs.any? do |c|
+          c.enabled?(self.context, actor) and
+            actor.send("open_graph_#{c.track_name}_track_configs").where(object_type: self.defs[:object_type]).first
+        end
+        trackers << actor if match_track
+      end
+
+      trackers
+    end
+  end
+
+  protected
+
+  include OpenGraphPlugin::UrlHelper
+
+  def update_delay
+    UpdateDelay
+  end
+
+  # only publish recent objects to avoid multiple publications
+  def recent_publish? actor, object_type, object_data_url
+    activity_params = {actor_id: actor.id, object_type: object_type, object_data_url: object_data_url}
+    activity = OpenGraphPlugin::Activity.where(activity_params).first
+    activity.present? and activity.created_at <= self.update_delay.from_now
+  end
+
+  def call p, *args
+    p and instance_exec *args, &p
   end
 end
 class OpenGraphPlugin::Track < ActiveRecord::Base
+  class_attribute :context
+  self.context = :open_graph
+
   attr_accessible :type, :context, :tracker_id, :tracker, :actor_id, :action,
-    :object_type, :object_data, :object_data_id, :object_data_type, :object_data_url
+    :object_type, :object_data_id, :object_data_type, :object_data_url,
+    :story, :object_data, :actor
   belongs_to :tracker, class_name: 'Profile'
   belongs_to :actor, class_name: 'Profile'
   belongs_to :object_data, polymorphic: true
-  validates_presence_of :context
   before_validation :set_context
   def self.objects
@@ -21,7 +24,15 @@ class OpenGraphPlugin::Track &lt; ActiveRecord::Base
   protected
   def set_context
-    self.context = OpenGraphPlugin.context
+    self[:context] = self.class.context
+  end
+
+  def print_debug msg
+    puts msg
+    Delayed::Worker.logger.debug msg
+  end
+  def debug? actor=nil
+    OpenGraphPlugin.debug? actor
   end
 end
@@ -1,3 +0,0 @@
-name: open_graph
-dependencies:
-  - metadata
@@ -2,14 +2,16 @@ require &quot;test_helper&quot;
 class OpenGraphPlugin::PublisherTest < ActiveSupport::TestCase
+  include OpenGraphPlugin::UrlHelper
+
   def setup
     @actor = create_user.person
     User.current = @actor.user
-    @stories = OpenGraphPlugin::Stories::Definitions
     @publisher = OpenGraphPlugin::Publisher.new
     OpenGraphPlugin::Stories.stubs(:publishers).returns([@publisher])
-    @publisher.stubs(:context).returns(:open_graph)
-    @publisher.stubs(:og_domain).returns('noosfero.net')
+    # for MetadataPlugin::UrlHelper#og_url_for
+    stubs(:og_domain).returns('noosfero.net')
+    OpenGraphPlugin::Activity.any_instance.stubs(:og_domain).returns('noosfero.net')
   end
   should "publish only tracked stuff" do
@@ -46,66 +48,70 @@ class OpenGraphPlugin::PublisherTest &lt; ActiveSupport::TestCase
     # active
     User.current = @actor.user
+    user = User.current.person
+
+    blog = Blog.create! profile: user, name: 'blog'
+    blog_post = TinyMceArticle.create! profile: user, parent: blog, name: 'blah', author: user
+    assert_last_activity user, :create_an_article, url_for(blog_post)
+
+    gallery = Gallery.create! name: 'gallery', profile: user
+    image = UploadedFile.create! uploaded_data: fixture_file_upload('/files/rails.png', 'image/png'), parent: gallery, profile: user
+    assert_last_activity user, :add_an_image, url_for(image, image.url.merge(view: true))
+
+    document = UploadedFile.create! uploaded_data: fixture_file_upload('/files/doctest.en.xhtml', 'text/html'), profile: user
+    assert_last_activity user, :add_a_document, url_for(document, document.url.merge(view: true))
+
+    event = Event.create! name: 'event', profile: user
+    assert_last_activity user, :create_an_event, url_for(event)
+
+    forum = Forum.create! name: 'forum', profile: user
+    topic = TinyMceArticle.create! profile: user, parent: forum, name: 'blah2', author: user
+    assert_last_activity user, :start_a_discussion, url_for(topic, topic.url.merge(og_type: MetadataPlugin.og_types[:forum]))
-    blog = Blog.create! profile: @actor, name: 'blog'
-    blog_post = TinyMceArticle.new profile: User.current.person, parent: blog, name: 'blah', author: User.current.person
-    @publisher.expects(:publish).with(User.current.person, @stories[:create_an_article], @publisher.send(:url_for, blog_post))
-    blog_post.save!
-
-    gallery = Gallery.create! name: 'gallery', profile: User.current.person
-    image = UploadedFile.new uploaded_data: fixture_file_upload('/files/rails.png', 'image/png'), parent: gallery, profile: User.current.person
-    @publisher.expects(:publish).with(User.current.person, @stories[:add_an_image], @publisher.send(:url_for, image, image.url.merge(view: true)))
-    image.save!
-
-    document = UploadedFile.new uploaded_data: fixture_file_upload('/files/doctest.en.xhtml', 'text/html'), profile: User.current.person
-    @publisher.expects(:publish).with(User.current.person, @stories[:add_a_document], @publisher.send(:url_for, document, document.url.merge(view: true)))
-    document.save!
-
-    event = Event.new name: 'event', profile: User.current.person
-    @publisher.expects(:publish).with(User.current.person, @stories[:create_an_event], @publisher.send(:url_for, event))
-    event.save!
-
-    forum = Forum.create! name: 'forum', profile: User.current.person
-    topic = TinyMceArticle.new profile: User.current.person, parent: forum, name: 'blah2', author: User.current.person
-    @publisher.expects(:publish).with(User.current.person, @stories[:start_a_discussion], @publisher.send(:url_for, topic, topic.url.merge(og_type: MetadataPlugin.og_types[:forum])))
-    topic.save!
-
-    @publisher.expects(:publish).with(@actor, @stories[:make_friendship_with], @publisher.send(:url_for, @other_actor)).twice
-    @publisher.expects(:publish).with(@other_actor, @stories[:make_friendship_with], @publisher.send(:url_for, @actor)).twice
-    AddFriend.create!(person: @actor, friend: @other_actor).finish
-    Friendship.remove_friendship @actor, @other_actor
+    AddFriend.create!(person: user, friend: @other_actor).finish
+    #assert_last_activity user, :make_friendship_with, url_for(@other_actor)
+    Friendship.remove_friendship user, @other_actor
     # friend verb is groupable
-    AddFriend.create!(person: @actor, friend: @other_actor).finish
+    AddFriend.create!(person: user, friend: @other_actor).finish
+    #assert_last_activity @other_actor, :make_friendship_with, url_for(user)
-    @publisher.expects(:publish).with(User.current.person, @stories[:favorite_a_sse_initiative], @publisher.send(:url_for, @enterprise))
-    @enterprise.fans << User.current.person
+    @enterprise.fans << user
+    assert_last_activity user, :favorite_a_sse_initiative, url_for(@enterprise)
     # active but published as passive
     User.current = @actor.user
+    user = User.current.person
-    blog_post = TinyMceArticle.new profile: @enterprise, parent: @enterprise.blog, name: 'blah', author: User.current.person
-    story = @stories[:announce_news_from_a_sse_initiative]
-    @publisher.expects(:publish).with(User.current.person, story, @publisher.send(:passive_url_for, blog_post, nil, story))
-    blog_post.save!
+    blog_post = TinyMceArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah', author: user
+    story = :announce_news_from_a_sse_initiative
+    assert_last_activity user, story, passive_url_for(blog_post, nil, OpenGraphPlugin::Stories::Definitions[story])
     # passive
     User.current = @other_actor.user
+    user = User.current.person
     # fan
-    blog_post = TinyMceArticle.new profile: @enterprise, parent: @enterprise.blog, name: 'blah2', author: User.current.person
-    story = @stories[:announce_news_from_a_sse_initiative]
-    @publisher.expects(:publish).with(@actor, story, 'http://noosfero.net/coop/blog/blah2')
-    blog_post.save!
+    blog_post = TinyMceArticle.create! profile: @enterprise, parent: @enterprise.blog, name: 'blah2', author: user
+    assert_last_activity user, :announce_news_from_a_sse_initiative, 'http://noosfero.net/coop/blog/blah2'
     # member
-    blog_post = TinyMceArticle.new profile: @myenterprise, parent: @myenterprise.blog, name: 'blah2', author: User.current.person
-    story = @stories[:announce_news_from_a_sse_initiative]
-    @publisher.expects(:publish).with(@actor, story, 'http://noosfero.net/mycoop/blog/blah2')
-    blog_post.save!
-
-    blog_post = TinyMceArticle.new profile: @community, parent: @community.blog, name: 'blah', author: User.current.person
-    story = @stories[:announce_news_from_a_community]
-    @publisher.expects(:publish).with(@actor, story, 'http://noosfero.net/comm/blog/blah')
-    blog_post.save!
+    blog_post = TinyMceArticle.create! profile: @myenterprise, parent: @myenterprise.blog, name: 'blah2', author: user
+    assert_last_activity user, :announce_news_from_a_sse_initiative, 'http://noosfero.net/mycoop/blog/blah2'
+
+    blog_post = TinyMceArticle.create! profile: @community, parent: @community.blog, name: 'blah', author: user
+    assert_last_activity user, :announce_news_from_a_community, 'http://noosfero.net/comm/blog/blah'
+  end
+
+  protected
+
+  def assert_activity activity, actor, story, object_data_url
+    assert_equal actor, activity.actor, actor
+    assert_equal story.to_s, activity.story
+    assert_equal object_data_url, activity.object_data_url
+  end
+
+  def assert_last_activity actor, story, object_data_url
+    a = OpenGraphPlugin::Activity.order('id DESC').first
+    assert_activity a, actor, story, object_data_url
   end
 end
@@ -0,0 +1,11 @@
+class SiteTourPluginPublicController < PublicController
+
+  before_filter :login_required
+
+  def mark_action
+    user.site_tour_plugin_actions += [params[:action_name]].flatten
+    user.site_tour_plugin_actions.uniq!
+    render :json => {:ok => user.save}
+  end
+
+end
@@ -0,0 +1,50 @@
+require 'csv'
+
+class SiteTourPluginAdminController < PluginAdminController
+
+  no_design_blocks
+
+  def index
+    settings = params[:settings]
+    settings ||= {}
+
+    @settings = Noosfero::Plugin::Settings.new(environment, SiteTourPlugin, settings)
+    @settings.actions_csv = convert_to_csv(@settings.actions)
+    @settings.group_triggers_csv = convert_to_csv(@settings.group_triggers)
+
+    if request.post?
+      @settings.actions = convert_actions_from_csv(settings[:actions_csv])
+      @settings.settings.delete(:actions_csv)
+
+      @settings.group_triggers = convert_group_triggers_from_csv(settings[:group_triggers_csv])
+      @settings.settings.delete(:group_triggers_csv)
+
+      @settings.save!
+      session[:notice] = 'Settings succefully saved.'
+      redirect_to :action => 'index'
+    end
+  end
+
+  protected
+
+  def convert_to_csv(actions)
+    CSV.generate do |csv|
+      (actions||[]).each { |action| csv << action.values }
+    end
+  end
+
+  def convert_actions_from_csv(actions_csv)
+    return [] if actions_csv.blank?
+    CSV.parse(actions_csv).map do |action|
+      {:language => action[0], :group_name => action[1], :selector => action[2], :description => action[3]}
+    end
+  end
+
+  def convert_group_triggers_from_csv(group_triggers_csv)
+    return [] if group_triggers_csv.blank?
+    CSV.parse(group_triggers_csv).map do |group|
+      {:group_name => group[0], :selector => group[1], :event => group[2]}
+    end
+  end
+
+end
@@ -0,0 +1,5 @@
+class Person
+
+  settings_items :site_tour_plugin_actions, :type => Array, :default => []
+
+end
@@ -0,0 +1,44 @@
+class SiteTourPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    'SiteTourPlugin'
+  end
+
+  def self.plugin_description
+    _("A site tour to show users how to use the application.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def js_files
+    ['intro.min.js', 'main.js']
+  end
+
+  def user_data_extras
+    proc do
+      logged_in? ? {:site_tour_plugin_actions => user.site_tour_plugin_actions}:{}
+    end
+  end
+
+  def body_ending
+    proc do
+      tour_file = "/plugins/site_tour/tour/#{language}/tour.js"
+      js_file = File.exists?(Rails.root.join("public#{tour_file}").to_s) ? tour_file : ""
+      settings = Noosfero::Plugin::Settings.new(environment, SiteTourPlugin)
+      actions = (settings.actions||[]).select {|action| action[:language] == language}
+
+      render(:file => 'tour_actions', :locals => { :actions => actions, :group_triggers => settings.group_triggers, :js_file => js_file})
+    end
+  end
+
+  def self.extra_blocks
+    { SiteTourPlugin::TourBlock => {} }
+  end
+
+  def self.actions_csv_default_setting
+    'en,tour_plugin,.site-tour-plugin_tour-block .tour-button,"Click to start tour!"'
+  end
+
+end
@@ -0,0 +1,14 @@
+module SiteTourPlugin::SiteTourHelper
+
+  def parse_tour_description(description)
+    p = profile rescue nil
+    if !p.nil? && description.present?
+      description.gsub('{profile.identifier}', p.identifier).
+        gsub('{profile.name}', p.name).
+        gsub('{profile.url}', url_for(p.url))
+    else
+      description
+    end
+  end
+
+end
@@ -0,0 +1,29 @@
+class SiteTourPlugin::TourBlock < Block
+
+  settings_items :actions, :type => Array, :default => [{:group_name => 'tour_plugin', :selector => '.site-tour-plugin_tour-block .tour-button', :description => _('Click to start tour!')}]
+  settings_items :group_triggers, :type => Array, :default => []
+  settings_items :display_button, :type => :boolean, :default => true
+
+  attr_accessible :actions, :display_button, :group_triggers
+
+  before_save do |block|
+    block.actions.reject! {|i| i[:group_name].blank? && i[:selector].blank? && i[:description].blank?}
+    block.group_triggers.reject! {|i| i[:group_name].blank? && i[:selector].blank?}
+  end
+
+  def self.description
+    _('Site Tour Block')
+  end
+
+  def help
+    _('Configure a step-by-step tour.')
+  end
+
+  def content(args={})
+    block = self
+    proc do
+      render :file => 'blocks/tour', :locals => {:block => block}
+    end
+  end
+
+end
@@ -0,0 +1,119 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2~rc1-2843-g999a037\n"
+"POT-Creation-Date: 2015-08-06 08:53-0300\n"
+"PO-Revision-Date: 2015-02-03 17:27-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/site_tour/lib/site_tour_plugin.rb:8
+msgid "A site tour to show users how to use the application."
+msgstr "Um plugin para apresentar aos usuários um tour da aplicação"
+
+#: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:3
+msgid "Click to start tour!"
+msgstr "Clique para iniciar o tour!"
+
+#: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:15
+msgid "Site Tour Block"
+msgstr "Bloco para Site Tour"
+
+#: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:19
+msgid "Configure a step-by-step tour."
+msgstr "Configure o passo a passo do tour."
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_item.html.erb:13
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb:15
+msgid "Delete"
+msgstr "Apagar"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:4
+msgid "Display help button"
+msgstr "Mostrar o botão de ajuda"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:8
+msgid "Tooltip Actions"
+msgstr "Ações do Tooltip"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:9
+msgid ""
+"Special fields for description: {profile.name}, {profile.identifier}, "
+"{profile.url}."
+msgstr ""
+"Campos especiais para a descrição: {profile.name}, {profile.identifier}, "
+"{profile.url}"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:11
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:29
+msgid "Group Name"
+msgstr "Nome do Grupo"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:12
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:30
+msgid "Selector"
+msgstr "Seletor"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:13
+msgid "Description"
+msgstr "Descrição"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:23
+msgid "New Tooltip"
+msgstr "Novo Tooltip"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:27
+msgid "Group Triggers"
+msgstr "Gatilhos dos Grupos"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:31
+msgid "Event"
+msgstr "Evento"
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:41
+msgid "New Group Trigger"
+msgstr "Novo Gatilho de Grupo"
+
+#: plugins/site_tour/views/blocks/tour.html.erb:4
+msgid "Help"
+msgstr "Ajuda"
+
+#: plugins/site_tour/views/tour_actions.html.erb:16
+msgid "Next"
+msgstr "Próximo"
+
+#: plugins/site_tour/views/tour_actions.html.erb:17
+msgid "Back"
+msgstr "Anterior"
+
+#: plugins/site_tour/views/tour_actions.html.erb:18
+msgid "Skip"
+msgstr "Pular"
+
+#: plugins/site_tour/views/tour_actions.html.erb:19
+msgid "Finish"
+msgstr "Fim"
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:1
+msgid "Site Tour Settings"
+msgstr "Configurações do Site Tour"
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:5
+msgid "Tooltips (CSV format: language, group name, selector, description)"
+msgstr "Tooltips (Formato CSV: idioma, nome do grupo, seletor, descrição)"
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:6
+msgid ""
+"Group Triggers (CSV format: group name, selector, event (e.g. mouseenter, "
+"click))"
+msgstr ""
+"Gatilhos dos grupos (Formato CSV: nome do grupo, seletor, evento (e.g. "
+"mouseenter, click))"
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:9
+msgid "Save"
+msgstr "Salvar"
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.2~rc1-2843-g999a037\n"
+"POT-Creation-Date: 2015-08-06 08:53-0300\n"
+"PO-Revision-Date: 2015-02-03 17:27-0300\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: plugins/site_tour/lib/site_tour_plugin.rb:8
+msgid "A site tour to show users how to use the application."
+msgstr ""
+
+#: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:3
+msgid "Click to start tour!"
+msgstr ""
+
+#: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:15
+msgid "Site Tour Block"
+msgstr ""
+
+#: plugins/site_tour/lib/site_tour_plugin/tour_block.rb:19
+msgid "Configure a step-by-step tour."
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_item.html.erb:13
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb:15
+msgid "Delete"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:4
+msgid "Display help button"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:8
+msgid "Tooltip Actions"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:9
+msgid ""
+"Special fields for description: {profile.name}, {profile.identifier}, "
+"{profile.url}."
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:11
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:29
+msgid "Group Name"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:12
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:30
+msgid "Selector"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:13
+msgid "Description"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:23
+msgid "New Tooltip"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:27
+msgid "Group Triggers"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:31
+msgid "Event"
+msgstr ""
+
+#: plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb:41
+msgid "New Group Trigger"
+msgstr ""
+
+#: plugins/site_tour/views/blocks/tour.html.erb:4
+msgid "Help"
+msgstr ""
+
+#: plugins/site_tour/views/tour_actions.html.erb:16
+msgid "Next"
+msgstr ""
+
+#: plugins/site_tour/views/tour_actions.html.erb:17
+msgid "Back"
+msgstr ""
+
+#: plugins/site_tour/views/tour_actions.html.erb:18
+msgid "Skip"
+msgstr ""
+
+#: plugins/site_tour/views/tour_actions.html.erb:19
+msgid "Finish"
+msgstr ""
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:1
+msgid "Site Tour Settings"
+msgstr ""
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:5
+msgid "Tooltips (CSV format: language, group name, selector, description)"
+msgstr ""
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:6
+msgid ""
+"Group Triggers (CSV format: group name, selector, event (e.g. mouseenter, "
+"click))"
+msgstr ""
+
+#: plugins/site_tour/views/site_tour_plugin_admin/index.html.erb:9
+msgid "Save"
+msgstr ""
@@ -0,0 +1,73 @@
+#edit-tour-block #tooltip-actions h3 {
+  margin-bottom: 5px;
+}
+
+#edit-tour-block .special-attributes {
+  color: rgb(157, 157, 157);
+}
+
+#edit-tour-block .list-items {
+  margin-bottom: 25px;
+}
+
+#edit-tour-block .droppable-items {
+  padding-left: 0;
+  margin-top: -12px;
+}
+
+#edit-tour-block .droppable-items li {
+  list-style-type: none;
+}
+
+#edit-tour-block .item-row {
+  line-height: 25px;
+  margin-bottom: 5px;
+  padding: 0;
+  cursor: pointer;
+  width: 97%;
+}
+
+#edit-tour-block .item-row:hover {
+  background: #ddd url(/images/drag-and-drop.png) no-repeat;
+  background-position: 98% 15px;
+}
+
+#edit-tour-block .item-row li {
+  list-style-type: none;
+  display: inline;
+  margin-left: 5px;
+}
+
+#edit-tour-block {
+  width: 620px;
+  position: relative;
+}
+
+#edit-tour-block #new-template {
+  display: none;
+}
+
+#edit-tour-block .list-header {
+  width: 98%;
+  padding: 0 1px 10px 10px;
+  margin-bottom: 5px;
+  cursor: pointer;
+}
+
+#edit-tour-block .list-header li {
+  list-style-type: none;
+  display: inline;
+  font-weight: bold;
+  font-size: 12px;
+  text-align: center;
+}
+
+#edit-tour-block .list-header .list-name {
+  margin-left: 20px;
+}
+#edit-tour-block .list-header .list-selector {
+  margin-left: 63px;
+}
+#edit-tour-block .list-header .list-description, #edit-tour-block .list-header .list-event {
+  margin-left: 68px;
+}
@@ -0,0 +1,18 @@
+jQuery(document).ready(function(){
+  jQuery('#edit-tour-block').on('click', '.add-item', function() {
+    var container = jQuery(this).closest('.list-items');
+    var new_action = container.find('#new-template>li').clone();
+    new_action.show();
+    container.find('.droppable-items').append(new_action);
+  });
+
+  jQuery('#edit-tour-block').on('click', '.delete-tour-block-item', function() {
+    jQuery(this).parent().parent().remove();
+    return false;
+  });
+
+  jQuery("#edit-tour-block .droppable-items").sortable({
+    revert: true,
+    axis: "y"
+  });
+});
@@ -0,0 +1,33 @@
+(function(w,p){"object"===typeof exports?p(exports):"function"===typeof define&&define.amd?define(["exports"],p):p(w)})(this,function(w){function p(a){this._targetElement=a;this._options={nextLabel:"Next &rarr;",prevLabel:"&larr; Back",skipLabel:"Skip",doneLabel:"Done",tooltipPosition:"bottom",tooltipClass:"",highlightClass:"",exitOnEsc:!0,exitOnOverlayClick:!0,showStepNumbers:!0,keyboardNavigation:!0,showButtons:!0,showBullets:!0,showProgress:!1,scrollToElement:!0,overlayOpacity:0.8,positionPrecedence:["bottom",
+"top","right","left"],disableInteraction:!1}}function J(a){var b=[],c=this;if(this._options.steps)for(var d=[],e=0,d=this._options.steps.length;e<d;e++){var f=A(this._options.steps[e]);f.step=b.length+1;"string"===typeof f.element&&(f.element=document.querySelector(f.element));if("undefined"===typeof f.element||null==f.element){var h=document.querySelector(".introjsFloatingElement");null==h&&(h=document.createElement("div"),h.className="introjsFloatingElement",document.body.appendChild(h));f.element=
+h;f.position="floating"}null!=f.element&&b.push(f)}else{d=a.querySelectorAll("*[data-intro]");if(1>d.length)return!1;e=0;for(f=d.length;e<f;e++){var h=d[e],k=parseInt(h.getAttribute("data-step"),10);0<k&&(b[k-1]={element:h,intro:h.getAttribute("data-intro"),step:parseInt(h.getAttribute("data-step"),10),tooltipClass:h.getAttribute("data-tooltipClass"),highlightClass:h.getAttribute("data-highlightClass"),position:h.getAttribute("data-position")||this._options.tooltipPosition})}e=k=0;for(f=d.length;e<
+f;e++)if(h=d[e],null==h.getAttribute("data-step")){for(;"undefined"!=typeof b[k];)k++;b[k]={element:h,intro:h.getAttribute("data-intro"),step:k+1,tooltipClass:h.getAttribute("data-tooltipClass"),highlightClass:h.getAttribute("data-highlightClass"),position:h.getAttribute("data-position")||this._options.tooltipPosition}}}e=[];for(d=0;d<b.length;d++)b[d]&&e.push(b[d]);b=e;b.sort(function(a,b){return a.step-b.step});c._introItems=b;K.call(c,a)&&(x.call(c),a.querySelector(".introjs-skipbutton"),a.querySelector(".introjs-nextbutton"),
+c._onKeyDown=function(b){if(27===b.keyCode&&!0==c._options.exitOnEsc)y.call(c,a),void 0!=c._introExitCallback&&c._introExitCallback.call(c);else if(37===b.keyCode)C.call(c);else if(39===b.keyCode)x.call(c);else if(13===b.keyCode){var d=b.target||b.srcElement;d&&0<d.className.indexOf("introjs-prevbutton")?C.call(c):d&&0<d.className.indexOf("introjs-skipbutton")?y.call(c,a):x.call(c);b.preventDefault?b.preventDefault():b.returnValue=!1}},c._onResize=function(a){t.call(c,document.querySelector(".introjs-helperLayer"));
+t.call(c,document.querySelector(".introjs-tooltipReferenceLayer"))},window.addEventListener?(this._options.keyboardNavigation&&window.addEventListener("keydown",c._onKeyDown,!0),window.addEventListener("resize",c._onResize,!0)):document.attachEvent&&(this._options.keyboardNavigation&&document.attachEvent("onkeydown",c._onKeyDown),document.attachEvent("onresize",c._onResize)));return!1}function A(a){if(null==a||"object"!=typeof a||"undefined"!=typeof a.nodeType)return a;var b={},c;for(c in a)b[c]=
+A(a[c]);return b}function x(){this._direction="forward";"undefined"===typeof this._currentStep?this._currentStep=0:++this._currentStep;if(this._introItems.length<=this._currentStep)"function"===typeof this._introCompleteCallback&&this._introCompleteCallback.call(this),y.call(this,this._targetElement);else{var a=this._introItems[this._currentStep];"undefined"!==typeof this._introBeforeChangeCallback&&this._introBeforeChangeCallback.call(this,a.element);G.call(this,a)}}function C(){this._direction=
+"backward";if(0===this._currentStep)return!1;var a=this._introItems[--this._currentStep];"undefined"!==typeof this._introBeforeChangeCallback&&this._introBeforeChangeCallback.call(this,a.element);G.call(this,a)}function y(a){var b=a.querySelector(".introjs-overlay");if(null!=b){b.style.opacity=0;setTimeout(function(){b.parentNode&&b.parentNode.removeChild(b)},500);var c=a.querySelector(".introjs-helperLayer");c&&c.parentNode.removeChild(c);(c=a.querySelector(".introjs-tooltipReferenceLayer"))&&c.parentNode.removeChild(c);
+(a=a.querySelector(".introjs-disableInteraction"))&&a.parentNode.removeChild(a);(a=document.querySelector(".introjsFloatingElement"))&&a.parentNode.removeChild(a);if(a=document.querySelector(".introjs-showElement"))a.className=a.className.replace(/introjs-[a-zA-Z]+/g,"").replace(/^\s+|\s+$/g,"");if((a=document.querySelectorAll(".introjs-fixParent"))&&0<a.length)for(c=a.length-1;0<=c;c--)a[c].className=a[c].className.replace(/introjs-fixParent/g,"").replace(/^\s+|\s+$/g,"");window.removeEventListener?
+window.removeEventListener("keydown",this._onKeyDown,!0):document.detachEvent&&document.detachEvent("onkeydown",this._onKeyDown);this._currentStep=void 0}}function H(a,b,c,d){var e="";b.style.top=null;b.style.right=null;b.style.bottom=null;b.style.left=null;b.style.marginLeft=null;b.style.marginTop=null;c.style.display="inherit";"undefined"!=typeof d&&null!=d&&(d.style.top=null,d.style.left=null);if(this._introItems[this._currentStep]){e=this._introItems[this._currentStep];e="string"===typeof e.tooltipClass?
+e.tooltipClass:this._options.tooltipClass;b.className=("introjs-tooltip "+e).replace(/^\s+|\s+$/g,"");currentTooltipPosition=this._introItems[this._currentStep].position;if(("auto"==currentTooltipPosition||"auto"==this._options.tooltipPosition)&&"floating"!=currentTooltipPosition){var e=currentTooltipPosition,f=this._options.positionPrecedence.slice(),h=F(),p=k(b).height+10,s=k(b).width+20,l=k(a),m="floating";l.left+s>h.width||0>l.left+l.width/2-s?(q(f,"bottom"),q(f,"top")):(l.height+l.top+p>h.height&&
+q(f,"bottom"),0>l.top-p&&q(f,"top"));l.width+l.left+s>h.width&&q(f,"right");0>l.left-s&&q(f,"left");0<f.length&&(m=f[0]);e&&"auto"!=e&&-1<f.indexOf(e)&&(m=e);currentTooltipPosition=m}e=k(a);f=k(b).height;h=F();switch(currentTooltipPosition){case "top":b.style.left="15px";b.style.top="-"+(f+10)+"px";c.className="introjs-arrow bottom";break;case "right":b.style.left=k(a).width+20+"px";e.top+f>h.height&&(c.className="introjs-arrow left-bottom",b.style.top="-"+(f-e.height-20)+"px");c.className="introjs-arrow left";
+break;case "left":!0==this._options.showStepNumbers&&(b.style.top="15px");e.top+f>h.height?(b.style.top="-"+(f-e.height-20)+"px",c.className="introjs-arrow right-bottom"):c.className="introjs-arrow right";b.style.right=e.width+20+"px";break;case "floating":c.style.display="none";a=k(b);b.style.left="50%";b.style.top="50%";b.style.marginLeft="-"+a.width/2+"px";b.style.marginTop="-"+a.height/2+"px";"undefined"!=typeof d&&null!=d&&(d.style.left="-"+(a.width/2+18)+"px",d.style.top="-"+(a.height/2+18)+
+"px");break;case "bottom-right-aligned":c.className="introjs-arrow top-right";b.style.right="0px";b.style.bottom="-"+(k(b).height+10)+"px";break;case "bottom-middle-aligned":d=k(a);a=k(b);c.className="introjs-arrow top-middle";b.style.left=d.width/2-a.width/2+"px";b.style.bottom="-"+(a.height+10)+"px";break;default:b.style.bottom="-"+(k(b).height+10)+"px",b.style.left=k(a).width/2-k(b).width/2+"px",c.className="introjs-arrow top"}}}function q(a,b){-1<a.indexOf(b)&&a.splice(a.indexOf(b),1)}function t(a){if(a&&
+this._introItems[this._currentStep]){var b=this._introItems[this._currentStep],c=k(b.element),d=10;"floating"==b.position&&(d=0);a.setAttribute("style","width: "+(c.width+d)+"px; height:"+(c.height+d)+"px; top:"+(c.top-5)+"px;left: "+(c.left-5)+"px;")}}function L(){var a=document.querySelector(".introjs-disableInteraction");null===a&&(a=document.createElement("div"),a.className="introjs-disableInteraction",this._targetElement.appendChild(a));t.call(this,a)}function G(a){"undefined"!==typeof this._introChangeCallback&&
+this._introChangeCallback.call(this,a.element);var b=this,c=document.querySelector(".introjs-helperLayer"),d=document.querySelector(".introjs-tooltipReferenceLayer"),e="introjs-helperLayer";k(a.element);"string"===typeof a.highlightClass&&(e+=" "+a.highlightClass);"string"===typeof this._options.highlightClass&&(e+=" "+this._options.highlightClass);if(null!=c){var f=d.querySelector(".introjs-helperNumberLayer"),h=d.querySelector(".introjs-tooltiptext"),p=d.querySelector(".introjs-arrow"),s=d.querySelector(".introjs-tooltip"),
+l=d.querySelector(".introjs-skipbutton"),m=d.querySelector(".introjs-prevbutton"),r=d.querySelector(".introjs-nextbutton");c.className=e;s.style.opacity=0;s.style.display="none";if(null!=f){var g=this._introItems[0<=a.step-2?a.step-2:0];if(null!=g&&"forward"==this._direction&&"floating"==g.position||"backward"==this._direction&&"floating"==a.position)f.style.opacity=0}t.call(b,c);t.call(b,d);if((g=document.querySelectorAll(".introjs-fixParent"))&&0<g.length)for(e=g.length-1;0<=e;e--)g[e].className=
+g[e].className.replace(/introjs-fixParent/g,"").replace(/^\s+|\s+$/g,"");g=document.querySelector(".introjs-showElement");g.className=g.className.replace(/introjs-[a-zA-Z]+/g,"").replace(/^\s+|\s+$/g,"");b._lastShowElementTimer&&clearTimeout(b._lastShowElementTimer);b._lastShowElementTimer=setTimeout(function(){null!=f&&(f.innerHTML=a.step);h.innerHTML=a.intro;s.style.display="block";H.call(b,a.element,s,p,f);d.querySelector(".introjs-bullets li > a.active").className="";d.querySelector('.introjs-bullets li > a[data-stepnumber="'+
+a.step+'"]').className="active";d.querySelector(".introjs-progress .introjs-progressbar").setAttribute("style","width:"+I.call(b)+"%;");s.style.opacity=1;f&&(f.style.opacity=1);-1===r.tabIndex?l.focus():r.focus()},350)}else{var q=document.createElement("div"),m=document.createElement("div"),c=document.createElement("div"),n=document.createElement("div"),w=document.createElement("div"),D=document.createElement("div"),E=document.createElement("div"),u=document.createElement("div");q.className=e;m.className=
+"introjs-tooltipReferenceLayer";t.call(b,q);t.call(b,m);this._targetElement.appendChild(q);this._targetElement.appendChild(m);c.className="introjs-arrow";w.className="introjs-tooltiptext";w.innerHTML=a.intro;D.className="introjs-bullets";!1===this._options.showBullets&&(D.style.display="none");for(var q=document.createElement("ul"),e=0,B=this._introItems.length;e<B;e++){var A=document.createElement("li"),z=document.createElement("a");z.onclick=function(){b.goToStep(this.getAttribute("data-stepnumber"))};
+e===a.step-1&&(z.className="active");z.href="javascript:void(0);";z.innerHTML="&nbsp;";z.setAttribute("data-stepnumber",this._introItems[e].step);A.appendChild(z);q.appendChild(A)}D.appendChild(q);E.className="introjs-progress";!1===this._options.showProgress&&(E.style.display="none");e=document.createElement("div");e.className="introjs-progressbar";e.setAttribute("style","width:"+I.call(this)+"%;");E.appendChild(e);u.className="introjs-tooltipbuttons";!1===this._options.showButtons&&(u.style.display=
+"none");n.className="introjs-tooltip";n.appendChild(w);n.appendChild(D);n.appendChild(E);!0==this._options.showStepNumbers&&(g=document.createElement("span"),g.className="introjs-helperNumberLayer",g.innerHTML=a.step,m.appendChild(g));n.appendChild(c);m.appendChild(n);r=document.createElement("a");r.onclick=function(){b._introItems.length-1!=b._currentStep&&x.call(b)};r.href="javascript:void(0);";r.innerHTML=this._options.nextLabel;m=document.createElement("a");m.onclick=function(){0!=b._currentStep&&
+C.call(b)};m.href="javascript:void(0);";m.innerHTML=this._options.prevLabel;l=document.createElement("a");l.className="introjs-button introjs-skipbutton";l.href="javascript:void(0);";l.innerHTML=this._options.skipLabel;l.onclick=function(){b._introItems.length-1==b._currentStep&&"function"===typeof b._introCompleteCallback&&b._introCompleteCallback.call(b);b._introItems.length-1!=b._currentStep&&"function"===typeof b._introExitCallback&&b._introExitCallback.call(b);y.call(b,b._targetElement)};u.appendChild(l);
+1<this._introItems.length&&(u.appendChild(m),u.appendChild(r));n.appendChild(u);H.call(b,a.element,n,c,g)}!0===this._options.disableInteraction&&L.call(b);m.removeAttribute("tabIndex");r.removeAttribute("tabIndex");0==this._currentStep&&1<this._introItems.length?(m.className="introjs-button introjs-prevbutton introjs-disabled",m.tabIndex="-1",r.className="introjs-button introjs-nextbutton",l.innerHTML=this._options.skipLabel):this._introItems.length-1==this._currentStep||1==this._introItems.length?
+(l.innerHTML=this._options.doneLabel,m.className="introjs-button introjs-prevbutton",r.className="introjs-button introjs-nextbutton introjs-disabled",r.tabIndex="-1"):(m.className="introjs-button introjs-prevbutton",r.className="introjs-button introjs-nextbutton",l.innerHTML=this._options.skipLabel);r.focus();a.element.className+=" introjs-showElement";g=v(a.element,"position");"absolute"!==g&&"relative"!==g&&(a.element.className+=" introjs-relativePosition");for(g=a.element.parentNode;null!=g&&"body"!==
+g.tagName.toLowerCase();){c=v(g,"z-index");n=parseFloat(v(g,"opacity"));u=v(g,"transform")||v(g,"-webkit-transform")||v(g,"-moz-transform")||v(g,"-ms-transform")||v(g,"-o-transform");if(/[0-9]+/.test(c)||1>n||"none"!==u)g.className+=" introjs-fixParent";g=g.parentNode}M(a.element)||!0!==this._options.scrollToElement||(n=a.element.getBoundingClientRect(),g=F().height,c=n.bottom-(n.bottom-n.top),n=n.bottom-g,0>c||a.element.clientHeight>g?window.scrollBy(0,c-30):window.scrollBy(0,n+100));"undefined"!==
+typeof this._introAfterChangeCallback&&this._introAfterChangeCallback.call(this,a.element)}function v(a,b){var c="";a.currentStyle?c=a.currentStyle[b]:document.defaultView&&document.defaultView.getComputedStyle&&(c=document.defaultView.getComputedStyle(a,null).getPropertyValue(b));return c&&c.toLowerCase?c.toLowerCase():c}function F(){if(void 0!=window.innerWidth)return{width:window.innerWidth,height:window.innerHeight};var a=document.documentElement;return{width:a.clientWidth,height:a.clientHeight}}
+function M(a){a=a.getBoundingClientRect();return 0<=a.top&&0<=a.left&&a.bottom+80<=window.innerHeight&&a.right<=window.innerWidth}function K(a){var b=document.createElement("div"),c="",d=this;b.className="introjs-overlay";if("body"===a.tagName.toLowerCase())c+="top: 0;bottom: 0; left: 0;right: 0;position: fixed;",b.setAttribute("style",c);else{var e=k(a);e&&(c+="width: "+e.width+"px; height:"+e.height+"px; top:"+e.top+"px;left: "+e.left+"px;",b.setAttribute("style",c))}a.appendChild(b);b.onclick=
+function(){!0==d._options.exitOnOverlayClick&&(y.call(d,a),void 0!=d._introExitCallback&&d._introExitCallback.call(d))};setTimeout(function(){c+="opacity: "+d._options.overlayOpacity.toString()+";";b.setAttribute("style",c)},10);return!0}function k(a){var b={};b.width=a.offsetWidth;b.height=a.offsetHeight;for(var c=0,d=0;a&&!isNaN(a.offsetLeft)&&!isNaN(a.offsetTop);)c+=a.offsetLeft,d+=a.offsetTop,a=a.offsetParent;b.top=d;b.left=c;return b}function I(){return 100*(parseInt(this._currentStep+1,10)/
+this._introItems.length)}var B=function(a){if("object"===typeof a)return new p(a);if("string"===typeof a){if(a=document.querySelector(a))return new p(a);throw Error("There is no element with given selector.");}return new p(document.body)};B.version="1.0.0";B.fn=p.prototype={clone:function(){return new p(this)},setOption:function(a,b){this._options[a]=b;return this},setOptions:function(a){var b=this._options,c={},d;for(d in b)c[d]=b[d];for(d in a)c[d]=a[d];this._options=c;return this},start:function(){J.call(this,
+this._targetElement);return this},goToStep:function(a){this._currentStep=a-2;"undefined"!==typeof this._introItems&&x.call(this);return this},nextStep:function(){x.call(this);return this},previousStep:function(){C.call(this);return this},exit:function(){y.call(this,this._targetElement);return this},refresh:function(){t.call(this,document.querySelector(".introjs-helperLayer"));t.call(this,document.querySelector(".introjs-tooltipReferenceLayer"));return this},onbeforechange:function(a){if("function"===
+typeof a)this._introBeforeChangeCallback=a;else throw Error("Provided callback for onbeforechange was not a function");return this},onchange:function(a){if("function"===typeof a)this._introChangeCallback=a;else throw Error("Provided callback for onchange was not a function.");return this},onafterchange:function(a){if("function"===typeof a)this._introAfterChangeCallback=a;else throw Error("Provided callback for onafterchange was not a function");return this},oncomplete:function(a){if("function"===
+typeof a)this._introCompleteCallback=a;else throw Error("Provided callback for oncomplete was not a function.");return this},onexit:function(a){if("function"===typeof a)this._introExitCallback=a;else throw Error("Provided callback for onexit was not a function.");return this}};return w.introJs=B});
@@ -0,0 +1 @@
+.introjs-overlay{position:absolute;z-index:999999;background-color:#000;opacity:0;background:-moz-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:-webkit-gradient(radial,center center,0px,center center,100%,color-stop(0%,rgba(0,0,0,0.4)),color-stop(100%,rgba(0,0,0,0.9)));background:-webkit-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:-o-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:-ms-radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);background:radial-gradient(center,ellipse cover,rgba(0,0,0,0.4) 0,rgba(0,0,0,0.9) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#66000000',endColorstr='#e6000000',GradientType=1);-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out}.introjs-fixParent{z-index:auto!important;opacity:1.0!important;position:absolute!important;-webkit-transform:none!important;-moz-transform:none!important;-ms-transform:none!important;-o-transform:none!important;transform:none!important}.introjs-showElement,tr.introjs-showElement>td,tr.introjs-showElement>th{z-index:9999999!important}.introjs-disableInteraction{z-index:99999999!important;position:absolute}.introjs-relativePosition,tr.introjs-showElement>td,tr.introjs-showElement>th{position:relative}.introjs-helperLayer{position:absolute;z-index:9999998;background-color:#FFF;background-color:rgba(255,255,255,.9);border:1px solid #777;border:1px solid rgba(0,0,0,.5);border-radius:4px;box-shadow:0 2px 15px rgba(0,0,0,.4);-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out}.introjs-tooltipReferenceLayer{position:absolute;z-index:10000000;background-color:transparent;-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out}.introjs-helperLayer *,.introjs-helperLayer *:before,.introjs-helperLayer *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;-ms-box-sizing:content-box;-o-box-sizing:content-box;box-sizing:content-box}.introjs-helperNumberLayer{position:absolute;top:-16px;left:-16px;z-index:9999999999!important;padding:2px;font-family:Arial,verdana,tahoma;font-size:13px;font-weight:bold;color:white;text-align:center;text-shadow:1px 1px 1px rgba(0,0,0,.3);background:#ff3019;background:-webkit-linear-gradient(top,#ff3019 0,#cf0404 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ff3019),color-stop(100%,#cf0404));background:-moz-linear-gradient(top,#ff3019 0,#cf0404 100%);background:-ms-linear-gradient(top,#ff3019 0,#cf0404 100%);background:-o-linear-gradient(top,#ff3019 0,#cf0404 100%);background:linear-gradient(to bottom,#ff3019 0,#cf0404 100%);width:20px;height:20px;line-height:20px;border:3px solid white;border-radius:50%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3019',endColorstr='#cf0404',GradientType=0);filter:progid:DXImageTransform.Microsoft.Shadow(direction=135,strength=2,color=ff0000);box-shadow:0 2px 5px rgba(0,0,0,.4)}.introjs-arrow{border:5px solid white;content:'';position:absolute}.introjs-arrow.top{top:-10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:white;border-left-color:transparent}.introjs-arrow.top-right{top:-10px;right:10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:white;border-left-color:transparent}.introjs-arrow.top-middle{top:-10px;left:50%;margin-left:-5px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:white;border-left-color:transparent}.introjs-arrow.right{right:-10px;top:10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:transparent;border-left-color:white}.introjs-arrow.right-bottom{bottom:10px;right:-10px;border-top-color:transparent;border-right-color:transparent;border-bottom-color:transparent;border-left-color:white}.introjs-arrow.bottom{bottom:-10px;border-top-color:white;border-right-color:transparent;border-bottom-color:transparent;border-left-color:transparent}.introjs-arrow.left{left:-10px;top:10px;border-top-color:transparent;border-right-color:white;border-bottom-color:transparent;border-left-color:transparent}.introjs-arrow.left-bottom{left:-10px;bottom:10px;border-top-color:transparent;border-right-color:white;border-bottom-color:transparent;border-left-color:transparent}.introjs-tooltip{position:absolute;padding:10px;background-color:white;min-width:200px;max-width:300px;border-radius:3px;box-shadow:0 1px 10px rgba(0,0,0,.4);-webkit-transition:opacity .1s ease-out;-moz-transition:opacity .1s ease-out;-ms-transition:opacity .1s ease-out;-o-transition:opacity .1s ease-out;transition:opacity .1s ease-out}.introjs-tooltipbuttons{text-align:right;white-space:nowrap}.introjs-button{position:relative;overflow:visible;display:inline-block;padding:.3em .8em;border:1px solid #d4d4d4;margin:0;text-decoration:none;text-shadow:1px 1px 0 #fff;font:11px/normal sans-serif;color:#333;white-space:nowrap;cursor:pointer;outline:0;background-color:#ececec;background-image:-webkit-gradient(linear,0 0,0 100%,from(#f4f4f4),to(#ececec));background-image:-moz-linear-gradient(#f4f4f4,#ececec);background-image:-o-linear-gradient(#f4f4f4,#ececec);background-image:linear-gradient(#f4f4f4,#ececec);-webkit-background-clip:padding;-moz-background-clip:padding;-o-background-clip:padding-box;-webkit-border-radius:.2em;-moz-border-radius:.2em;border-radius:.2em;zoom:1;*display:inline;margin-top:10px}.introjs-button:hover{border-color:#bcbcbc;text-decoration:none;box-shadow:0 1px 1px #e3e3e3}.introjs-button:focus,.introjs-button:active{background-image:-webkit-gradient(linear,0 0,0 100%,from(#ececec),to(#f4f4f4));background-image:-moz-linear-gradient(#ececec,#f4f4f4);background-image:-o-linear-gradient(#ececec,#f4f4f4);background-image:linear-gradient(#ececec,#f4f4f4)}.introjs-button::-moz-focus-inner{padding:0;border:0}.introjs-skipbutton{margin-right:5px;color:#7a7a7a}.introjs-prevbutton{-webkit-border-radius:.2em 0 0 .2em;-moz-border-radius:.2em 0 0 .2em;border-radius:.2em 0 0 .2em;border-right:0}.introjs-nextbutton{-webkit-border-radius:0 .2em .2em 0;-moz-border-radius:0 .2em .2em 0;border-radius:0 .2em .2em 0}.introjs-disabled,.introjs-disabled:hover,.introjs-disabled:focus{color:#9a9a9a;border-color:#d4d4d4;box-shadow:none;cursor:default;background-color:#f4f4f4;background-image:none;text-decoration:none}.introjs-bullets{text-align:center}.introjs-bullets ul{clear:both;margin:15px auto 0;padding:0;display:inline-block}.introjs-bullets ul li{list-style:none;float:left;margin:0 2px}.introjs-bullets ul li a{display:block;width:6px;height:6px;background:#ccc;border-radius:10px;-moz-border-radius:10px;-webkit-border-radius:10px;text-decoration:none}.introjs-bullets ul li a:hover{background:#999}.introjs-bullets ul li a.active{background:#999}.introjs-progress{overflow:hidden;height:10px;margin:10px 0 5px 0;border-radius:4px;background-color:#ecf0f1}.introjs-progressbar{float:left;width:0;height:100%;font-size:10px;line-height:10px;text-align:center;background-color:#08c}.introjsFloatingElement{position:absolute;height:0;width:0;left:50%;top:50%}
 \ No newline at end of file
@@ -0,0 +1,99 @@
+var siteTourPlugin = (function() {
+
+  var actions = [];
+  var groupTriggers = [];
+  var userData = {};
+  var intro;
+  var options = {};
+
+  function hasMark(name) {
+    return jQuery.cookie("_noosfero_.sitetour." + name) ||
+      jQuery.inArray(name, userData.site_tour_plugin_actions)>=0;
+  }
+
+  function mark(name) {
+    jQuery.cookie("_noosfero_.sitetour." + name, 1, {expires: 365});
+    if(userData.login) {
+      jQuery.post('/plugin/site_tour/public/mark_action', {action_name: name}, function(data) { });
+    }
+  }
+
+  function clearAll() {
+    jQuery('.site-tour-plugin').removeAttr('data-intro data-intro-name data-step');
+  }
+
+  function configureIntro(force, actions) {
+    clearAll();
+    for(var i=0; i<actions.length; i++) {
+      var action = actions[i];
+
+      if(force || !hasMark(action.name)) {
+        var el = jQuery(action.selector).filter(function() {
+          return jQuery(this).is(":visible") && jQuery(this).css('visibility') != 'hidden';
+        });
+        el.addClass('site-tour-plugin');
+        el.attr('data-intro', action.text);
+        el.attr('data-intro-name', action.name);
+        if(action.step) {
+          el.attr('data-step', action.step);
+        }
+      }
+    }
+  }
+
+  function actionsOnload() {
+    var groups = jQuery.map(groupTriggers, function(g) { return g.name; });
+    return jQuery.grep(actions, function(n, i) { return jQuery.inArray(n.name, groups); });
+  }
+
+  function actionsByGroup(group) {
+    return jQuery.grep(actions, function(n, i) { return n.name===group });
+  }
+
+  function forceParam() {
+    return jQuery.deparam.querystring()['siteTourPlugin']==='force';
+  }
+
+  return {
+    setOption: function(key, value) {
+      options[key] = value;
+    },
+    add: function (name, selector, text, step) {
+      actions.push({name: name, selector: selector, text: text, step: step});
+    },
+    addGroupTrigger: function(name, selector, ev) {
+      groupTriggers.push({name: name, selector: selector, event: ev});
+      plugin = this;
+      var handler = function() {
+        configureIntro(forceParam(), actionsByGroup(name));
+        intro.start();
+        jQuery(document).off(ev, selector, handler);
+      };
+      jQuery(document).on(ev, selector, handler);
+    },
+    start: function(data, force) {
+      force = typeof force !== 'undefined' ? force : false || forceParam();
+      userData = data;
+
+      intro = introJs();
+      intro.setOption('tooltipPosition', 'auto');
+      intro.setOption('showStepNumbers', 'false');
+      intro.setOptions(options);
+      intro.onafterchange(function(targetElement) {
+        var name = jQuery(targetElement).attr('data-intro-name');
+        mark(name);
+      });
+      configureIntro(force, actionsOnload());
+      intro.start();
+    },
+    force: function() {
+      this.start({}, true);
+    }
+  }
+})();
+
+jQuery( document ).ready(function( $ ) {
+  $(window).bind('userDataLoaded', function(event, data) {
+    siteTourPlugin.start(data);
+  });
+});
@@ -0,0 +1 @@
+introjs.min.css
 \ No newline at end of file
@@ -0,0 +1,6 @@
+jQuery( document ).ready(function( $ ) {
+  siteTourPlugin.add('login_button','.action-home-index #link_login', "Click to login!");
+  siteTourPlugin.add('login_button','.action-home-index .signup', "Click to signup!");
+  siteTourPlugin.add('logout_button','.action-home-index #logout', "Click to logout");
+  siteTourPlugin.add('navigation_bar','#navigation', "Click to navigate");
+});
@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SiteTourPluginAdminControllerTest < ActionController::TestCase
+
+  def setup
+    @environment = Environment.default
+    login_as(create_admin_user(@environment))
+  end
+
+  attr_reader :environment
+
+  should 'parse csv and save actions array in plugin settings' do
+    actions_csv = "en,tour_plugin,.tour-button,Click"
+    post :index, :settings => {"actions_csv" => actions_csv}
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    assert_equal [{:language => 'en', :group_name => 'tour_plugin', :selector => '.tour-button', :description => 'Click'}], @settings.actions
+  end
+
+  should 'parse csv and save group triggers array in plugin settings' do
+    group_triggers_csv = "tour_plugin,.tour-button,mouseenter"
+    post :index, :settings => {"group_triggers_csv" => group_triggers_csv}
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    assert_equal [{:group_name => 'tour_plugin', :selector => '.tour-button', :event => 'mouseenter'}], @settings.group_triggers
+  end
+
+  should 'do not store actions_csv' do
+    actions_csv = "en,tour_plugin,.tour-button,Click"
+    post :index, :settings => {"actions_csv" => actions_csv}
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    assert_equal nil, @settings.settings[:actions_csv]
+  end
+
+  should 'do not store group_triggers_csv' do
+    group_triggers_csv = "tour_plugin,.tour-button,click"
+    post :index, :settings => {"group_triggers_csv" => group_triggers_csv}
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    assert_equal nil, @settings.settings[:group_triggers_csv]
+  end
+
+  should 'convert actions array to csv to enable user edition' do
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    @settings.actions = [{:language => 'en', :group_name => 'tour_plugin', :selector => '.tour-button', :description => 'Click'}]
+    @settings.save!
+
+    get :index
+    assert_tag :tag => 'textarea', :attributes => {:class => 'actions-csv'}, :content => "\nen,tour_plugin,.tour-button,Click\n"
+  end
+
+  should 'convert group_triggers array to csv to enable user edition' do
+    @settings = Noosfero::Plugin::Settings.new(environment.reload, SiteTourPlugin)
+    @settings.group_triggers = [{:group_name => 'tour_plugin', :selector => '.tour-button', :event => 'click'}]
+    @settings.save!
+
+    get :index
+    assert_tag :tag => 'textarea', :attributes => {:class => 'groups-csv'}, :content => "\ntour_plugin,.tour-button,click\n"
+  end
+
+end
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SiteTourPluginPublicControllerTest < ActionController::TestCase
+
+  def setup
+    @person = create_user('testuser').person
+  end
+
+  attr_accessor :person
+
+  should 'not be able to mark an action if is not logged in' do
+    xhr :post, :mark_action, :action_name => 'test'
+    assert_response 401
+  end
+
+  should 'be able to mark one action' do
+    login_as(person.identifier)
+    xhr :post, :mark_action, :action_name => 'test'
+    assert_equal({'ok' => true}, ActiveSupport::JSON.decode(response.body))
+    assert_equal ['test'], person.reload.site_tour_plugin_actions
+  end
+
+  should 'be able to mark multiple actions' do
+    login_as(person.identifier)
+    xhr :post, :mark_action, :action_name => ['test1', 'test2']
+    assert_equal({'ok' => true}, ActiveSupport::JSON.decode(response.body))
+    assert_equal ['test1', 'test2'], person.reload.site_tour_plugin_actions
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SiteTourHelperTest < ActionView::TestCase
+
+  include SiteTourPlugin::SiteTourHelper
+
+  should 'parse tooltip description' do
+    assert_equal 'test', parse_tour_description("test")
+  end
+
+  should 'replace profile attributes in tooltip description' do
+    profile = fast_create(Profile)
+    expects(:profile).returns(profile).at_least_once
+    assert_equal "name #{profile.name}, identifier #{profile.identifier}, url #{url_for profile.url}", parse_tour_description("name {profile.name}, identifier {profile.identifier}, url {profile.url}")
+  end
+
+end
@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SiteTourPluginTest < ActionView::TestCase
+
+  def setup
+    @plugin = SiteTourPlugin.new
+  end
+
+  attr_accessor :plugin
+
+  should 'include site tour plugin actions in user data for logged in users' do
+    expects(:logged_in?).returns(true)
+    person = create_user('testuser').person
+    person.site_tour_plugin_actions = ['login', 'navigation']
+    expects(:user).returns(person)
+
+    assert_equal({:site_tour_plugin_actions => ['login', 'navigation']}, instance_eval(&plugin.user_data_extras))
+  end
+
+  should 'return empty hash when user is not logged in' do
+    expects(:logged_in?).returns(false)
+    assert_equal({}, instance_eval(&plugin.user_data_extras))
+  end
+
+  should 'include javascript related to tour instructions if file exists' do
+    file = '/plugins/site_tour/tour/pt/tour.js'
+    expects(:language).returns('pt')
+    File.expects(:exists?).with(Rails.root.join("public#{file}").to_s).returns(true)
+    expects(:environment).returns(Environment.default)
+    assert_tag_in_string instance_exec(&plugin.body_ending), :tag => 'script'
+  end
+
+  should 'not include javascript file that not exists' do
+    file = '/plugins/site_tour/tour/pt/tour.js'
+    expects(:language).returns('pt')
+    File.expects(:exists?).with(Rails.root.join("public#{file}").to_s).returns(false)
+    expects(:environment).returns(Environment.default)
+    assert_no_tag_in_string instance_exec(&plugin.body_ending), :tag => "script"
+  end
+
+  should 'render javascript tag with tooltip actions and group triggers' do
+    expects(:language).returns('en').at_least_once
+
+    settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
+    settings.actions = [{:language => 'en', :group_name => 'test', :selector => 'body', :description => 'Test'}]
+    settings.group_triggers = [{:group_name => 'test', :selector => 'body', :event => 'click'}]
+    settings.save!
+
+    expects(:environment).returns(Environment.default)
+    body_ending = instance_exec(&plugin.body_ending)
+    assert_match /siteTourPlugin\.add\('test', 'body', 'Test', 1\);/, body_ending
+    assert_match /siteTourPlugin\.addGroupTrigger\('test', 'body', 'click'\);/, body_ending
+  end
+
+  should 'start each tooltip group with the correct step order' do
+    expects(:language).returns('en').at_least_once
+
+    settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
+    settings.actions = [
+        {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A1'},
+        {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A2'},
+        {:language => 'en', :group_name => 'test_b', :selector => 'body', :description => 'Test B1'},
+    ]
+    settings.save!
+
+    expects(:environment).returns(Environment.default)
+    body_ending = instance_exec(&plugin.body_ending)
+    assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A1', 1\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A2', 2\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_b', 'body', 'Test B1', 3\);/, body_ending
+  end
+
+end
@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TrackListBlockTest < ActionView::TestCase
+
+  ActionView::Base.send :include, ApplicationHelper
+
+  def setup
+    @block = fast_create(SiteTourPlugin::TourBlock)
+  end
+
+  attr_accessor :block
+
+  should 'do not save empty actions' do
+    block.actions = [{:group_name => '', :selector => nil, :description => ' '}]
+    block.save!
+    assert_equal [], block.actions
+  end
+
+  should 'render script tag in visualization mode' do
+    controller.expects(:boxes_editor?).returns(false)
+    assert_tag_in_string instance_eval(&block.content), :tag => 'script'
+  end
+
+  should 'do not render script tag when editing' do
+    controller.expects(:boxes_editor?).returns(true)
+    controller.expects(:uses_design_blocks?).returns(true)
+    assert_no_tag_in_string instance_eval(&block.content), :tag => 'script'
+  end
+
+  should 'display help button' do
+    controller.expects(:boxes_editor?).returns(false)
+    assert_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+  end
+
+  should 'do not display help button when display_button is false' do
+    block.display_button = false
+    controller.expects(:boxes_editor?).returns(false)
+    assert_no_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+  end
+
+end
@@ -0,0 +1,11 @@
+<%= block_title(block.title) %>
+
+<% if block.display_button %>
+  <%= button :help, _('Help'), '#', :class => 'tour-button', :onclick => 'siteTourPlugin.force();' %>
+<% end %>
+
+<% edit_mode = controller.send(:boxes_editor?) && controller.send(:uses_design_blocks?) %>
+
+<% unless edit_mode %>
+  <%= render :file => 'tour_actions', :locals => {:actions => block.actions, :group_triggers => block.group_triggers} %>
+<% end %>
@@ -0,0 +1,44 @@
+<%= javascript_include_tag '/plugins/site_tour/edit_tour_block.js' %>
+<%= stylesheet_link_tag '/plugins/site_tour/edit_tour_block.css' %>
+
+<%= labelled_form_field check_box(:block, :display_button) + _('Display help button'), '' %>
+
+<div id='edit-tour-block'>
+  <div id="tooltip-actions" class="list-items">
+    <h3><%= _('Tooltip Actions') %></h3>
+    <div class="special-attributes"><%= _('Special fields for description: {profile.name}, {profile.identifier}, {profile.url}.') %></div>
+    <ul class='list-header'>
+      <li class='list-name'><%= _('Group Name') %></li>
+      <li class='list-selector'><%= _('Selector') %></li>
+      <li class='list-description'><%= _('Description') %></li>
+    </ul>
+    <ul id="droppable-tour-actions" class="droppable-items">
+      <% for action in @block.actions do %>
+        <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => action} %>
+      <% end %>
+    </ul>
+    <div id="new-template">
+      <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_item', :locals => {:action => {} } %>
+    </div>
+    <%= link_to_function(_('New Tooltip'), :class => 'add-item button icon-add with-text') %>
+  </div>
+
+  <div id="group-triggers" class="list-items">
+    <h3><%= _('Group Triggers') %></h3>
+    <ul class='list-header'>
+      <li class='list-name'><%= _('Group Name') %></li>
+      <li class='list-selector'><%= _('Selector') %></li>
+      <li class='list-event'><%= _('Event') %></li>
+    </ul>
+    <ul id="droppable-tour-group-triggers" class="droppable-items">
+      <% for group in @block.group_triggers do %>
+        <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_group_item', :locals => {:group => group} %>
+      <% end %>
+    </ul>
+    <div id="new-template">
+      <%= render :partial => 'box_organizer/site_tour_plugin/tour_block_group_item', :locals => {:group => {} } %>
+    </div>
+    <%= link_to_function(_('New Group Trigger'), :class => 'add-item button icon-add with-text') %>
+  </div>
+
+</div>
@@ -0,0 +1,19 @@
+<li>
+  <ul class="item-row">
+    <li>
+      <%= text_field_tag 'block[group_triggers][][group_name]', group[:group_name], :class => 'group-name', :maxlength => 20 %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[group_triggers][][selector]', group[:selector], :class => 'selector' %>
+    </li>
+    <li>
+      <%= select_tag 'block[group_triggers][][event]',
+        options_for_select(['mouseenter', 'mouseleave', 'mouseover', 'mouseout', 'click', 'change', 'select', 'keydown', 'keyup', 'keypress', 'focus', 'blur', 'submit', 'drag', 'drop'], group[:event]),
+        :class => 'description' %>
+    </li>
+    <li>
+      <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
+    </li>
+  </ul>
+</li>
+
@@ -0,0 +1,16 @@
+<li>
+  <ul class="item-row">
+    <li>
+      <%= text_field_tag 'block[actions][][group_name]', action[:group_name], :class => 'group-name', :maxlength => 20 %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[actions][][selector]', action[:selector], :class => 'selector' %>
+    </li>
+    <li>
+      <%= text_field_tag 'block[actions][][description]', action[:description], :class => 'description' %>
+    </li>
+    <li>
+      <%= button_without_text(:delete, _('Delete'), "#" , :class=>"delete-tour-block-item") %>
+    </li>
+  </ul>
+</li>
@@ -0,0 +1 @@
+../box_organizer/site_tour_plugin
 \ No newline at end of file
@@ -0,0 +1 @@
+../box_organizer/site_tour_plugin
 \ No newline at end of file
@@ -0,0 +1,13 @@
+<h1><%= _('Site Tour Settings')%></h1>
+
+<%= form_for(:settings) do |f| %>
+
+  <%= labelled_form_field _('Tooltips (CSV format: language, group name, selector, description)'), f.text_area(:actions_csv, :style => 'width: 100%', :class => 'actions-csv') %>
+  <%= labelled_form_field _('Group Triggers (CSV format: group name, selector, event (e.g. mouseenter, click))'), f.text_area(:group_triggers_csv, :style => 'width: 100%', :class => 'groups-csv', :rows => 7) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+  <% end %>
+
+<% end %>
+
@@ -0,0 +1,22 @@
+<% extend SiteTourPlugin::SiteTourHelper %>
+<% js_file = defined?(:js_file) ? js_file : nil %>
+<%= javascript_include_tag(js_file) if js_file.present? %>
+
+<% if actions.present? %>
+<script>
+  jQuery( document ).ready(function( $ ) {
+    <% actions.each_with_index do |action, index| %>
+      <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j parse_tour_description(action[:description])}', #{index + 1});" %>
+    <% end %>
+
+    <% (group_triggers||[]).each do |group| %>
+      <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
+    <% end %>
+
+    siteTourPlugin.setOption('nextLabel', '<%= _('Next') %>');
+    siteTourPlugin.setOption('prevLabel', '<%= _('Back') %>');
+    siteTourPlugin.setOption('skipLabel', '<%= _('Skip') %>');
+    siteTourPlugin.setOption('doneLabel', '<%= _('Finish') %>');
+  });
+</script>
+<% end %>
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2013-12-10 15:48-0300\n"
-"PO-Revision-Date: 2015-02-23 11:32+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-08-14 09:48+0200\n"
+"Last-Translator: Phillip Rohmberger <rohmberger@hotmail.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/noosfero/documentation/de/>\n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 # type: Content of: <h1>
 #. type: Content of: <h1>
@@ -28,7 +28,7 @@ msgstr &quot;&quot;
 #. type: Content of: <p>
 #: doc/noosfero/plugins/send_email.en.xhtml:2
 msgid "Allows to send e-mails through an e-mail form."
-msgstr ""
+msgstr "Ermöglicht das Senden von E-mails über ein E-mail-Formular."
 # type: Content of: <h2>
 #. type: Content of: <h2>
@@ -36,7 +36,7 @@ msgstr &quot;&quot;
 #: doc/noosfero/plugins/google_cse.en.xhtml:3
 #: doc/noosfero/plugins/google_analytics.en.xhtml:3
 msgid "Usage"
-msgstr ""
+msgstr "Verwendung"
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -52,6 +52,7 @@ msgstr &quot;&quot;
 msgid ""
 "Add a &#8220;to&#8221; and &#8220;message&#8221; field and a submit button"
 msgstr ""
+"Fügt ein ``to``- und ein ``message``-Feld, mit einem ``submit`` Knopf hinzu"
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.2~rc2-15-gba5ae5b\n"
 "POT-Creation-Date: 2015-08-06 17:22-0300\n"
-"PO-Revision-Date: 2015-08-07 16:56+0200\n"
+"PO-Revision-Date: 2015-08-28 12:36-0300\n"
 "Last-Translator: Antonio Terceiro <terceiro@softwarelivre.org>\n"
 "Language-Team: Portuguese "
 "<https://hosted.weblate.org/projects/noosfero/noosfero/pt/>\n"
@@ -6176,8 +6176,8 @@ msgstr &quot;Desativar perfil&quot;
 #: app/views/profile_editor/edit.html.erb:83
 #: app/views/profile_editor/edit.html.erb:85
-msgid "Are you sure you want to deactivate this profile?"
-msgstr "Tem certeza que deseja desativar este perfil?"
+msgid "Are you sure you want to activate this profile?"
+msgstr "Tem certeza que deseja ativar este perfil?"
 #: app/views/profile_editor/edit.html.erb:85
 msgid "Activate profile"
@@ -1,23 +0,0 @@
-# Define the list of icons to preview themes:
-icons:
-  - add.png
-  - cancel.png
-  - mass_mails.png
-  - store.png
-
-# Define the main html block for each finded theme:
-generate_preview_block_code: |
-  <div class="preview_icon_theme">
-  %EACH_ICON_CODE%
-  </div>
-
-# Define the html code to show each icon:
-generate_each_icon_code: |
-  <div class="icon_num_%ICON_NUM%">
-    <img src="%PATH%/%ICON_NAME%" />
-  </div>
-
-# The non obvious variables are:
-#  %ICON_NUM% - each icon has a number equal to it's list position. It can help the layout definition.
-#  %PATH% - the path for the theme.
-#  %ICON_NAME% - the icon name without path (exatily equal the name on the icons list)
@@ -1,6 +0,0 @@
-$(document).ready(function() {
-  var box_4_height = $(".box-4").height();
-
-  // Make box-2(the most left one) stay align with box-4
-  $(".box-2").css("margin-top", "-"+box_4_height+"px");
-});
 #boxes {
-  display: table;
   width: 100%;
+  height: 100%;
 }
-.box-1 {
-  width: 58%;
-  float: left;
-  margin: 1% 1% 0% 1%;
+.box-4 {
+  position: relative;
+  float: right;
+  width: 78.5%;
+  max-height: 400px;
+  overflow: hidden;
+  margin-left: 1%;
 }
-
-.box-2 {
+.box-3 {
+  width: 20.5%;
+  height: 100%;
+  min-height: 410px;
   position: relative;
   float: left;
-  width: 20%;
 }
-.box-3 {
+.box-2 {
   position: relative;
   float: right;
-  width: 20%;
+  width: 20.5%;
   margin-top: 1%;
 }
-.box-4 {
-  float: left;
-  width: 79%;
-  margin-left: 21%;
-}
-
-#profile-activity ul,
-#profile-network ul,
-#profile-wall ul {
-  width: 460px;
-}
-#profile-activity ul.comment-replies,
-#profile-network ul.comment-replies,
-#profile-wall ul.comment-replies {
-  width: auto;
-}
-
+.box-1 {
+  position: relative;
+  float: right;
+  width: 57%;
+  margin: 1% 1% 0% 1%;
+}
 \ No newline at end of file
@@ -1505,7 +1505,8 @@ table#recaptcha_table tr:hover td {
 .event-date {
   background: url('/images/calendar_date_select/calendar-icon.png') no-repeat left center;
-  padding: 5px;
+  padding: 2px;
+  padding-left: 15px;
 }
 .event-link {
@@ -107,11 +107,11 @@ function convToValidEmail( str ) {
 }
 function updateUrlField(name_field, id) {
-   url_field = $(id);
-   old_url_value = url_field.value;
+   url_field = jQuery('#'+id);
+   old_url_value = url_field.val();
    new_url_value = convToValidIdentifier(name_field.value, "-");
-   url_field.value = new_url_value;
+   url_field.val(new_url_value);
    if (!/^\s*$/.test(old_url_value)
        && old_url_value != new_url_value
@@ -35,6 +35,14 @@ class AccountControllerTest &lt; ActionController::TestCase
     post :login, :user => { :login => 'fake', :password => 'fake' }
   end
+  should 'fail login if a user is inactive and show a warning message' do
+    user = User.create!(login: 'testuser', email: 'test@email.com', password:'test', password_confirmation:'test', activation_code: nil)
+    post :login, :user => { :login => 'testuser', :password => 'test' }
+
+    assert_match 'not activated', session[:notice]
+    assert_nil session[:user]
+  end
+
   def test_should_fail_login_and_not_redirect
     @request.env["HTTP_REFERER"] = 'bli'
     post :login, :user => {:login => 'johndoe', :password => 'bad password'}
@@ -260,8 +268,9 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_template 'invalid_change_password_code'
   end
-  should 'require password confirmation correctly to enter new pasword' do
+  should 'require password confirmation correctly to enter new password' do
     user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
+    user.activate
     change = ChangePassword.create!(:requestor => user.person)
     post :new_password, :code => change.code, :change_password => { :password => 'onepass', :password_confirmation => 'another_pass' }
@@ -700,6 +709,8 @@ class AccountControllerTest &lt; ActionController::TestCase
     get :activate
     assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
+
+    assert_match 'not activated', session[:notice]
     assert_nil session[:user]
   end
@@ -709,6 +720,8 @@ class AccountControllerTest &lt; ActionController::TestCase
     get :activate, :activation_code => 'wrongcode'
     assert_nil assigns(:message)
     post :login, :user => {:login => 'testuser', :password => 'test123'}
+
+    assert_match 'not activated', session[:notice]
     assert_nil session[:user]
   end
@@ -8,12 +8,12 @@ class EventsControllerTest &lt; ActionController::TestCase
   attr_reader :profile
   should 'list today events by default' do
-    profile.events << Event.new(:name => 'Joao Birthday', :start_date => Date.today)
-    profile.events << Event.new(:name => 'Maria Birthday', :start_date => Date.today)
+    profile.events << Event.new(:name => 'Joao Birthday', :start_date => DateTime.now)
+    profile.events << Event.new(:name => 'Maria Birthday', :start_date => DateTime.now)
     get :events, :profile => profile.identifier
-    today = Date.today.strftime("%B %d, %Y")
+    today = DateTime.now.strftime("%B %d, %Y")
     assert_tag :tag => 'div', :attributes => {:id => "agenda-items"},
       :descendant => {:tag => 'h3', :content => "Events for #{today}"},
       :descendant => {:tag => 'tr', :content => "Joao Birthday"},
@@ -23,15 +23,15 @@ class EventsControllerTest &lt; ActionController::TestCase
   should 'display calendar of current month' do
     get :events, :profile => profile.identifier
-    month = Date.today.strftime("%B %Y")
+    month = DateTime.now.strftime("%B %Y")
     assert_tag :tag => 'table', :attributes => {:class => /current-month/}, :descendant => {:tag => 'caption', :content => /#{month}/}
   end
   should 'display links to previous and next month' do
     get :events, :profile => profile.identifier
-    prev_month = Date.today - 1.month
-    next_month = Date.today + 1.month
+    prev_month = DateTime.now - 1.month
+    next_month = DateTime.now + 1.month
     prev_month_name = prev_month.strftime("%B")
     next_month_name = next_month.strftime("%B")
     assert_tag :tag =>'a', :attributes => {:href => "/profile/#{profile.identifier}/events/#{prev_month.year}/#{prev_month.month}"}, :content => prev_month_name
@@ -40,14 +40,14 @@ class EventsControllerTest &lt; ActionController::TestCase
   should 'see the events paginated' do
     30.times do |i|
-      profile.events << Event.new(:name => "Lesson #{i}", :start_date => Date.today)
+      profile.events << Event.new(:name => "Lesson #{i}", :start_date => DateTime.now)
     end
     get :events, :profile => profile.identifier
     assert_equal 20, assigns(:events).size
   end
   should 'show events of specific day' do
-    profile.events << Event.new(:name => 'Joao Birthday', :start_date => Date.new(2009, 10, 28))
+    profile.events << Event.new(:name => 'Joao Birthday', :start_date => DateTime.new(2009, 10, 28))
     get :events_by_day, :profile => profile.identifier, :year => 2009, :month => 10, :day => 28
@@ -302,7 +302,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'search for events' do
     person = create_user('teste').person
-    event = create_event(person, :name => 'an event to be found', :start_date => Date.today)
+    event = create_event(person, :name => 'an event to be found', :start_date => DateTime.now)
     get :events, :query => 'event to be found'
@@ -311,10 +311,10 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'return events of the day' do
     person = create_user('someone').person
-    ten_days_ago = Date.today - 10.day
+    ten_days_ago = DateTime.now - 10.day
     ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => ten_days_ago)
-    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],  :start_date => Date.today - 2.month)
+    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],  :start_date => DateTime.now - 2.month)
     get :events, :day => ten_days_ago.day, :month => ten_days_ago.month, :year => ten_days_ago.year
     assert_equal [ev1], assigns(:events)
@@ -322,9 +322,11 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'return events of the day with category' do
     person = create_user('someone').person
-    ten_days_ago = Date.today - 10.day
+    ten_days_ago = DateTime.now - 10.day
-    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => ten_days_ago)
+    ev1 = create_event(person, :name => 'event 1', :start_date => ten_days_ago)
+    ev1.categories = [@category]
+    
     ev2 = create_event(person, :name => 'event 2', :start_date => ten_days_ago)
     get :events, :day => ten_days_ago.day, :month => ten_days_ago.month, :year => ten_days_ago.year, :category_path => @category.path.split('/')
@@ -334,8 +336,8 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'return events of today when no date specified' do
     person = create_user('someone').person
-    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => Date.today)
-    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],  :start_date => Date.today - 2.month)
+    ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],  :start_date => DateTime.now)
+    ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],  :start_date => DateTime.now - 2.month)
     get :events
@@ -346,9 +348,9 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = create_user('someone').person
     ev1 = create_event(person, :name => 'event 1', :category_ids => [@category.id],
-      :start_date => Date.today + 2.month)
+      :start_date => DateTime.now + 2.month)
     ev2 = create_event(person, :name => 'event 2', :category_ids => [@category.id],
-      :start_date => Date.today + 2.day)
+      :start_date => DateTime.now + 2.day)
     get :events
@@ -359,8 +361,8 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'list events for a given month' do
     person = create_user('testuser').person
-    create_event(person, :name => 'upcoming event 1', :category_ids => [@category.id], :start_date => Date.new(2008, 1, 25))
-    create_event(person, :name => 'upcoming event 2', :category_ids => [@category.id], :start_date => Date.new(2008, 4, 27))
+    create_event(person, :name => 'upcoming event 1', :category_ids => [@category.id], :start_date => DateTime.new(2008, 1, 25))
+    create_event(person, :name => 'upcoming event 2', :category_ids => [@category.id], :start_date => DateTime.new(2008, 4, 27))
     get :events, :year => '2008', :month => '1'
@@ -370,7 +372,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'see the events paginated' do
     person = create_user('testuser').person
     30.times do |i|
-      create_event(person, :name => "Event #{i}", :start_date => Date.today)
+      create_event(person, :name => "Event #{i}", :start_date => DateTime.now)
     end
     get :events
     assert_equal 20, assigns(:events).size
@@ -413,7 +415,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   end
   should 'display current year/month by default as caption of current month' do
-    Date.expects(:today).returns(Date.new(2008, 8, 1)).at_least_once
+    DateTime.expects(:now).returns(DateTime.new(2008, 8, 1)).at_least_once
     get :events
     assert_tag :tag => 'table', :attributes => {:class => /current-month/}, :descendant => {:tag => 'caption', :content => /August 2008/}
@@ -472,7 +474,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'show events of specific day' do
     person = create_user('anotheruser').person
-    event = create_event(person, :name => 'Joao Birthday', :start_date => Date.new(2009, 10, 28))
+    event = create_event(person, :name => 'Joao Birthday', :start_date => DateTime.new(2009, 10, 28))
     get :events_by_day, :year => 2009, :month => 10, :day => 28
@@ -481,8 +483,8 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'ignore filter of events if category not exists' do
     person = create_user('anotheruser').person
-    create_event(person, :name => 'Joao Birthday', :start_date => Date.new(2009, 10, 28), :category_ids => [@category.id])
-    create_event(person, :name => 'Maria Birthday', :start_date => Date.new(2009, 10, 28))
+    create_event(person, :name => 'Joao Birthday', :start_date => DateTime.new(2009, 10, 28), :category_ids => [@category.id])
+    create_event(person, :name => 'Maria Birthday', :start_date => DateTime.new(2009, 10, 28))
     id_of_unexistent_category = Category.last.id + 10
@@ -769,7 +771,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   protected
   def create_event(profile, options)
-    ev = build(Event, { :name => 'some event', :start_date => Date.new(2008,1,1) }.merge(options))
+    ev = build(Event, { :name => 'some event', :start_date => DateTime.new(2008,1,1) }.merge(options))
     ev.profile = profile
     ev.save!
     ev
@@ -1022,6 +1022,27 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal "Clone Article", label_for_clone_article(TinyMceArticle.new)
   end
+  should "return top url of environment" do
+    env = Environment.default
+    request = mock()
+    request.expects(:scheme).returns('http')
+    stubs(:request).returns(request)
+    stubs(:environment).returns(env)
+    stubs(:profile).returns(nil)
+    assert_equal env.top_url('http'), top_url
+  end
+
+  should "return top url considering profile" do
+    env = Environment.default
+    c = fast_create(Community)
+    request = mock()
+    request.stubs(:scheme).returns('http')
+    stubs(:request).returns(request)
+    stubs(:environment).returns(env)
+    stubs(:profile).returns(c)
+    assert_equal c.top_url, top_url
+  end
+
   protected
   include NoosferoTestHelper
@@ -1497,6 +1497,17 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_includes a.body_images_paths, 'http://test.com/noosfero.png'
   end
+  should 'escape utf8 characters correctly' do
+    Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
+    a = build TinyMceArticle, profile: @profile
+    a.body = 'Noosfero <img src="http://noosfero.com/cabeça.png" /> '
+    assert_includes a.body_images_paths, 'http://noosfero.com/cabe%C3%A7a.png'
+
+    # check if after save (that is, after xss_terminate run)
+    a.save!
+    assert_includes a.body_images_paths, 'http://noosfero.com/cabe%C3%A7a.png'
+  end
+
   should 'get absolute images paths in article body' do
     Environment.any_instance.stubs(:default_hostname).returns('noosfero.org')
     a = build TinyMceArticle, :profile => @profile
@@ -2181,4 +2192,32 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article.destroy
   end
+  should 'have can_display_media_panel with default false' do
+    a = Article.new
+    assert !a.can_display_media_panel?
+  end
+
+  should 'display media panel when allowed by the environment' do
+    a = Article.new
+    a.expects(:can_display_media_panel?).returns(true)
+    environment = mock
+    a.expects(:environment).returns(environment)
+    environment.expects(:enabled?).with('media_panel').returns(true)
+    assert a.display_media_panel?
+  end
+
+  should 'not display media panel when not allowed by the environment' do
+    a = Article.new
+    a.expects(:can_display_media_panel?).returns(true)
+    environment = mock
+    a.expects(:environment).returns(environment)
+    environment.expects(:enabled?).with('media_panel').returns(false)
+    assert !a.display_media_panel?
+  end
+
+  should 'have display_preview' do
+    a = Article.new(:display_preview => false)
+    assert !a.display_preview?
+  end
+
 end
@@ -29,7 +29,8 @@ class ChangePasswordTest &lt; ActiveSupport::TestCase
     change.password_confirmation = 'newpass'
     change.finish
-    assert User.find(person.user.id).authenticated?('newpass')
+    person.user.activate
+    assert person.user.authenticated?('newpass')
   end
   should 'not require password and password confirmation when cancelling' do
@@ -16,14 +16,14 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
     blog = fast_create(Blog, :name => 'Blog test', :profile_id => profile.id)
     post = create(TextileArticle, :name => 'post test', :profile => profile, :parent => blog)
     result = article_title(post)
-    assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
+    assert_tag_in_string result, :tag => 'span', :content => show_time(post.published_at)
   end
   should 'display published-at for forum posts' do
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
     post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)
     result = article_title(post)
-    assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
+    assert_tag_in_string result, :tag => 'span', :content => show_time(post.published_at)
   end
   should 'not display published-at for non-blog and non-forum posts' do
@@ -21,23 +21,23 @@ class DatesHelperTest &lt; ActiveSupport::TestCase
   should 'generate period with two dates' do
     date1 = mock
     date1.stubs(:year).returns('A')
-    expects(:show_date).with(date1, anything).returns('XXX')
+    expects(:show_time).with(date1, anything).returns('XXX')
     date2 = mock
     date2.stubs(:year).returns('B')
-    expects(:show_date).with(date2, anything).returns('YYY')
+    expects(:show_time).with(date2, anything).returns('YYY')
     expects(:_).with('from %{date1} to %{date2}').returns('from %{date1} to %{date2}')
     assert_equal 'from XXX to YYY', show_period(date1, date2)
   end
   should 'generate period with in two diferent years' do
-    date1 = Date.new(1920, 1, 2)
-    date2 = Date.new(1992, 4, 6)
-    assert_equal 'from January 2, 1920 to April 6, 1992', show_period(date1, date2)
+    date1 = DateTime.new(1920, 1, 2)
+    date2 = DateTime.new(1992, 4, 6)
+    assert_equal 'from January 2, 1920 0:00 to April 6, 1992 0:00', show_period(date1, date2)
   end
   should 'generate period with in two diferent months of the same year' do
-    date1 = Date.new(2013, 2, 1)
-    date2 = Date.new(2013, 3, 1)
+    date1 = DateTime.new(2013, 2, 1)
+    date2 = DateTime.new(2013, 3, 1)
     assert_equal 'from February 1 to March 1, 2013', show_period(date1, date2)
   end
@@ -49,13 +49,13 @@ class DatesHelperTest &lt; ActiveSupport::TestCase
   should 'generate period with two equal dates' do
     date1 = mock
-    expects(:show_date).with(date1, anything).returns('XXX')
+    expects(:show_time).with(date1, anything).returns('XXX')
     assert_equal 'XXX', show_period(date1, date1)
   end
   should 'generate period with one date only' do
     date1 = mock
-    expects(:show_date).with(date1, anything).returns('XXX')
+    expects(:show_time).with(date1, anything).returns('XXX')
     assert_equal 'XXX', show_period(date1)
   end
@@ -84,7 +84,7 @@ class DatesHelperTest &lt; ActiveSupport::TestCase
   end
   should 'fallback to current year/month in show_month' do
-    Date.expects(:today).returns(Date.new(2008,11,1)).at_least_once
+    DateTime.expects(:now).returns(DateTime.new(2008,11,1)).at_least_once
     assert_equal 'November 2008', show_month(nil, nil)
     assert_equal 'November 2008', show_month('', '')
   end
@@ -118,16 +118,16 @@ class DatesHelperTest &lt; ActiveSupport::TestCase
   end
   should 'format time' do
-    assert_equal '22 November 2008, 15:34', show_time(Time.mktime(2008, 11, 22, 15, 34, 0, 0))
+    assert_equal 'November 22, 2008 15:34', show_time(Time.mktime(2008, 11, 22, 15, 34, 0, 0))
   end
   should 'format time with 2 digits minutes' do
-    assert_equal '22 November 2008, 15:04', show_time(Time.mktime(2008, 11, 22, 15, 04, 0, 0))
+    assert_equal 'November 22, 2008 15:04', show_time(Time.mktime(2008, 11, 22, 15, 04, 0, 0))
   end
   should 'translate time' do
     time = Time.parse('25 May 2009, 12:47')
-    assert_equal '25 May 2009, 12:47', show_time(time)
+    assert_equal 'May 25, 2009 12:47', show_time(time)
   end
   should 'handle nil time' do
@@ -26,4 +26,9 @@ class EnterpriseHomepageTest &lt; ActiveSupport::TestCase
     assert_equal false, a.can_display_hits?
   end
+  should 'have can_display_media_panel with default true' do
+    a = EnterpriseHomepage.new
+    assert a.can_display_media_panel?
+  end
+
 end
@@ -29,15 +29,9 @@ class EventTest &lt; ActiveSupport::TestCase
     assert_equal 'South Noosfero street, 88', e.address
   end
-  should 'have a start date' do
-    e = Event.new
-    e.start_date = Date.today
-    assert_kind_of Date, e.start_date
-  end
-
   should 'set start date default value as today' do
     e = Event.new
-    assert_equal Date.today, e.start_date
+    assert_in_delta DateTime.now.to_i, e.start_date.to_i, 1
   end
   should 'require start date' do
@@ -45,38 +39,32 @@ class EventTest &lt; ActiveSupport::TestCase
     e.start_date = nil
     e.valid?
     assert e.errors[:start_date.to_s].present?
-    e.start_date = Date.today
+    e.start_date = DateTime.now
     e.valid?
     refute e.errors[:start_date.to_s].present?
   end
-  should 'have a end date' do
-    e = Event.new
-    e.end_date = Date.today
-    assert_kind_of Date, e.end_date
-  end
-
   should 'use its own icon' do
     assert_equal 'event', Event.icon_name
   end
   should 'not allow end date before start date' do
-    e = build(Event, :start_date => Date.new(2008, 01, 01), :end_date => Date.new(2007,01,01))
+    e = build(Event, :start_date => DateTime.new(2008, 01, 01), :end_date => DateTime.new(2007,01,01))
     e.valid?
     assert e.errors[:start_date.to_s].present?
-    e.end_date = Date.new(2008,01,05)
+    e.end_date = DateTime.new(2008,01,05)
     e.valid?
     refute e.errors[:start_date.to_s].present?
   end
   should 'find by range of dates' do
     profile = create_user('testuser').person
-    e1 = create(Event, :name => 'e1', :start_date =>  Date.new(2008,1,1), :profile => profile)
-    e2 = create(Event, :name => 'e2', :start_date =>  Date.new(2008,2,1), :profile => profile)
-    e3 = create(Event, :name => 'e3', :start_date =>  Date.new(2008,3,1), :profile => profile)
+    e1 = create(Event, :name => 'e1', :start_date =>  DateTime.new(2008,1,1), :profile => profile)
+    e2 = create(Event, :name => 'e2', :start_date =>  DateTime.new(2008,2,1), :profile => profile)
+    e3 = create(Event, :name => 'e3', :start_date =>  DateTime.new(2008,3,1), :profile => profile)
-    found = Event.by_range(Date.new(2008, 1, 1)..Date.new(2008, 2, 28))
+    found = Event.by_range(DateTime.new(2008, 1, 1)..DateTime.new(2008, 2, 28))
     assert_includes found, e1
     assert_includes found, e2
     assert_not_includes found, e3
@@ -84,32 +72,33 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'filter events by range' do
     profile = create_user('testuser').person
-    e1 = create(Event, :name => 'e1', :start_date => Date.new(2008,1,15), :profile => profile)
-    assert_includes profile.events.by_range(Date.new(2008, 1, 10)..Date.new(2008, 1, 20)), e1
+    e1 = create(Event, :name => 'e1', :start_date => DateTime.new(2008,1,15), :profile => profile)
+    assert_includes profile.events.by_range(DateTime.new(2008, 1, 10)..DateTime.new(2008, 1, 20)), e1
   end
   should 'provide period for searching in month' do
-    assert_equal Date.new(2008, 1, 1)..Date.new(2008,1,31), Event.date_range(2008, 1)
-    assert_equal Date.new(2008, 2, 1)..Date.new(2008,2,29), Event.date_range(2008, 2)
-    assert_equal Date.new(2007, 2, 1)..Date.new(2007,2,28), Event.date_range(2007, 2)
+    assert_equal DateTime.new(2008, 1, 1)..DateTime.new(2008,1,31), Event.date_range(2008, 1)
+    assert_equal DateTime.new(2008, 2, 1)..DateTime.new(2008,2,29), Event.date_range(2008, 2)
+    assert_equal DateTime.new(2007, 2, 1)..DateTime.new(2007,2,28), Event.date_range(2007, 2)
   end
   should 'support string arguments to Event#date_range' do
-    assert_equal Date.new(2008,1,1)..Date.new(2008,1,31), Event.date_range('2008', '1')
+    assert_equal DateTime.new(2008,1,1)..DateTime.new(2008,1,31), Event.date_range('2008', '1')
   end
   should 'provide range of dates for event with both dates filled' do
-    e = build(Event, :start_date => Date.new(2008, 1, 1), :end_date => Date.new(2008, 1, 5))
-    assert_equal (Date.new(2008,1,1)..Date.new(2008,1,5)), e.date_range
+    e = build(Event, :start_date => DateTime.new(2008, 1, 1), :end_date => DateTime.new(2008, 1, 5))
+    assert_equal (DateTime.new(2008,1,1)..DateTime.new(2008,1,5)), e.date_range
   end
   should 'provide range of dates for event with only start date' do
-    e = build(Event, :start_date => Date.new(2008, 1, 1))
-    assert_equal (Date.new(2008,1,1)..Date.new(2008,1,1)), e.date_range
+    e = build(Event, :start_date => DateTime.new(2008, 1, 1))
+    assert_equal (DateTime.new(2008,1,1)..DateTime.new(2008,1,1)), e.date_range
   end
   should 'provide nice display format' do
-    event = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => '<p>my somewhat short description</p>')
+    date = Time.zone.local(2008, 1, 1, 0, 0, 0)
+    event = build(Event, :start_date => date, :end_date => date, :link => 'http://www.myevent.org', :body => '<p>my somewhat short description</p>')
     display = instance_eval(&event.to_html)
     assert_tag_in_string display, :content => Regexp.new("January 1, 2008")
@@ -148,7 +137,7 @@ class EventTest &lt; ActiveSupport::TestCase
     profile = create_user('testuser').person
     event = create(Event, :profile => profile, :name => 'test',
     :body => '<p>first paragraph </p><p>second paragraph </p>',
-    :link => 'www.colivre.coop.br', :start_date => Date.today)
+    :link => 'www.colivre.coop.br', :start_date => DateTime.now)
     assert_match '<p>first paragraph </p>', event.first_paragraph
   end
@@ -161,7 +150,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'filter HTML in body' do
     profile = create_user('testuser').person
-    e = create(Event, :profile => profile, :name => 'test', :body => '<p>a paragraph (valid)</p><script type="text/javascript">/* this is invalid */</script>"', :link => 'www.colivre.coop.br', :start_date => Date.today)
+    e = create(Event, :profile => profile, :name => 'test', :body => '<p>a paragraph (valid)</p><script type="text/javascript">/* this is invalid */</script>"', :link => 'www.colivre.coop.br', :start_date => DateTime.now)
     assert_tag_in_string e.body, :tag => 'p', :content => 'a paragraph (valid)'
     assert_no_tag_in_string e.body, :tag => 'script'
@@ -169,7 +158,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'filter HTML in name' do
     profile = create_user('testuser').person
-    e = create(Event, :profile => profile, :name => '<p>a paragraph (valid)</p><script type="text/javascript">/* this is invalid */</script>"', :link => 'www.colivre.coop.br', :start_date => Date.today)
+    e = create(Event, :profile => profile, :name => '<p>a paragraph (valid)</p><script type="text/javascript">/* this is invalid */</script>"', :link => 'www.colivre.coop.br', :start_date => DateTime.now)
     assert_tag_in_string e.name, :tag => 'p', :content => 'a paragraph (valid)'
     assert_no_tag_in_string e.name, :tag => 'script'
@@ -184,8 +173,8 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'list all events' do
     profile = fast_create(Profile)
-    event1 = build(Event, :name => 'Ze Birthday', :start_date => Date.today)
-    event2 = build(Event, :name => 'Mane Birthday', :start_date => Date.today >> 1)
+    event1 = build(Event, :name => 'Ze Birthday', :start_date => DateTime.now)
+    event2 = build(Event, :name => 'Mane Birthday', :start_date => DateTime.now >> 1)
     profile.events << [event1, event2]
     assert_includes profile.events, event1
     assert_includes profile.events, event2
@@ -194,7 +183,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'list events by day' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = DateTime.now
     yesterday_event = build(Event, :name => 'Joao Birthday', :start_date => today - 1.day)
     today_event = build(Event, :name => 'Ze Birthday', :start_date => today)
     tomorrow_event = build(Event, :name => 'Mane Birthday', :start_date => today + 1.day)
@@ -207,7 +196,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'list events by month' do
     profile = fast_create(Profile)
-    today = Date.new(2013, 10, 6)
+    today = DateTime.new(2013, 10, 6)
     last_month_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.month)
@@ -230,7 +219,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'event by month ordered by start date'do
     profile = fast_create(Profile)
-    today = Date.new(2013, 10, 6)
+    today = DateTime.new(2013, 10, 6)
     event_1 = Event.new(:name => 'Maria Birthday', :start_date => today + 1.day)
     event_2 = Event.new(:name => 'Joana Birthday', :start_date => today - 1.day)
@@ -248,7 +237,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'list events in a range' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = DateTime.now
     event_in_range = build(Event, :name => 'Noosfero Conference', :start_date => today - 2.day, :end_date => today + 2.day)
     event_in_day = build(Event, :name => 'Ze Birthday', :start_date => today)
@@ -262,7 +251,7 @@ class EventTest &lt; ActiveSupport::TestCase
   should 'not list events out of range' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = DateTime.now
     event_in_range1 = build(Event, :name => 'Foswiki Conference', :start_date => today - 2.day, :end_date => today + 2.day)
     event_in_range2 = build(Event, :name => 'Debian Conference', :start_date => today - 2.day, :end_date => today + 3.day)
     event_out_of_range = build(Event, :name => 'Ze Birthday', :start_date => today - 5.day, :end_date => today - 3.day)
@@ -357,4 +346,9 @@ class EventTest &lt; ActiveSupport::TestCase
     assert event.translatable?
   end
+  should 'have can_display_media_panel with default true' do
+    a = Event.new
+    assert a.can_display_media_panel?
+  end
+
 end
@@ -256,6 +256,20 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal({:host => 'micojones.net', :profile => nil, :controller => 'content_viewer', :action => 'view_page', :page => []}, profile.url)
   end
+  should 'provide environment top URL when profile has not a domain' do
+    env = Environment.default
+    profile = fast_create(Profile, :environment_id => env.id)
+    assert_equal env.top_url, profile.top_url
+  end
+
+  should 'provide top URL to profile with domain' do
+    env = Environment.default
+    profile = fast_create(Profile, :environment_id => env.id)
+    domain = fast_create(Domain, :name => 'example.net')
+    profile.domains << domain
+    assert_equal 'http://example.net', profile.top_url
+  end
+
   should 'help developers by adding a suitable port to url' do
     profile = build(Profile)
@@ -1566,8 +1580,8 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'list all events' do
     profile = fast_create(Profile)
-    event1 = Event.new(:name => 'Ze Birthday', :start_date => Date.today)
-    event2 = Event.new(:name => 'Mane Birthday', :start_date => Date.today >> 1)
+    event1 = Event.new(:name => 'Ze Birthday', :start_date => DateTime.now)
+    event2 = Event.new(:name => 'Mane Birthday', :start_date => DateTime.now >> 1)
     profile.events << [event1, event2]
     assert_includes profile.events, event1
     assert_includes profile.events, event2
@@ -1576,7 +1590,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'list events by day' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = DateTime.now
     yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day)
     today_event = Event.new(:name => 'Ze Birthday', :start_date => today)
     tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day)
@@ -1589,7 +1603,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'list events by month' do
     profile = fast_create(Profile)
-    today = Date.new(2014, 03, 2)
+    today = DateTime.new(2014, 03, 2)
     yesterday_event = Event.new(:name => 'Joao Birthday', :start_date => today - 1.day)
     today_event = Event.new(:name => 'Ze Birthday', :start_date => today)
     tomorrow_event = Event.new(:name => 'Mane Birthday', :start_date => today + 1.day)
@@ -1602,7 +1616,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'list events in a range' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = DateTime.now
     event_in_range = Event.new(:name => 'Noosfero Conference', :start_date => today - 2.day, :end_date => today + 2.day)
     event_in_day = Event.new(:name => 'Ze Birthday', :start_date => today)
@@ -1616,7 +1630,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'not list events out of range' do
     profile = fast_create(Profile)
-    today = Date.today
+    today = DateTime.now
     event_in_range1 = Event.new(:name => 'Foswiki Conference', :start_date => today - 2.day, :end_date => today + 2.day)
     event_in_range2 = Event.new(:name => 'Debian Conference', :start_date => today - 2.day, :end_date => today + 3.day)
     event_out_of_range = Event.new(:name => 'Ze Birthday', :start_date => today - 5.day, :end_date => today - 3.day)
@@ -1630,9 +1644,9 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'sort events by date' do
     profile = fast_create(Profile)
-    event1 = Event.new(:name => 'Noosfero Hackaton', :start_date => Date.today)
-    event2 = Event.new(:name => 'Debian Day', :start_date => Date.today - 1)
-    event3 = Event.new(:name => 'Fisl 10', :start_date => Date.today + 1)
+    event1 = Event.new(:name => 'Noosfero Hackaton', :start_date => DateTime.now)
+    event2 = Event.new(:name => 'Debian Day', :start_date => DateTime.now - 1)
+    event3 = Event.new(:name => 'Fisl 10', :start_date => DateTime.now + 1)
     profile.events << [event1, event2, event3]
     assert_equal [event2, event1, event3], profile.events
   end
@@ -85,6 +85,17 @@ class TextArticleTest &lt; ActiveSupport::TestCase
     assert_equal "<img src=\"/test.png\">", article.body
   end
+  should 'change image path to relative for profile with own domain' do
+    person = create_user('testuser').person
+    person.domains << build(Domain)
+
+    article = TextArticle.new(:profile => person, :name => 'test')
+    env = Environment.default
+    article.body = "<img src=\"http://#{person.default_hostname}:3000/link-profile.png\">"
+    article.save!
+    assert_equal "<img src=\"/link-profile.png\">", article.body
+  end
+
   should 'not be translatable if there is no language available on environment' do
     environment = fast_create(Environment)
     environment.languages = nil
@@ -109,4 +120,12 @@ class TextArticleTest &lt; ActiveSupport::TestCase
     assert text.translatable?
   end
+  should 'display preview when configured on parent that is a blog' do
+    person = fast_create(Person)
+    post = fast_create(TextArticle, :profile_id => person.id)
+    blog = Blog.new(:display_preview => true)
+    post.parent = blog
+    assert post.display_preview?
+  end
+
 end
@@ -174,6 +174,11 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     assert_equal "<p>one\nparagraph</p>", build_article("one\nparagraph").to_html
   end
+  should 'have can_display_media_panel with default true' do
+    a = TextileArticle.new
+    assert a.can_display_media_panel?
+  end
+
   protected
   def build_article(input = nil, options = {})
@@ -235,4 +235,9 @@ end
       :attributes => { :colspan => '2', :rowspan => '3' }
   end
+  should 'have can_display_media_panel with default true' do
+    a = TinyMceArticle.new
+    assert a.can_display_media_panel?
+  end
+
 end
@@ -123,6 +123,7 @@ class UserTest &lt; ActiveSupport::TestCase
   def test_should_change_password
     user = create_user('changetest', :password => 'test', :password_confirmation => 'test', :email => 'changetest@example.com')
+    user.activate
     assert_nothing_raised do
       user.change_password!('test', 'newpass', 'newpass')
     end
@@ -132,6 +133,7 @@ class UserTest &lt; ActiveSupport::TestCase
   def test_should_give_correct_current_password_for_changing_password
     user = create_user('changetest', :password => 'test', :password_confirmation => 'test', :email => 'changetest@example.com')
+    user.activate
     assert_raise User::IncorrectPassword do
       user.change_password!('wrong', 'newpass', 'newpass')
     end
@@ -141,6 +143,8 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'require matching confirmation when changing password by force' do
     user = create_user('changetest', :password => 'test', :password_confirmation => 'test', :email => 'changetest@example.com')
+    user.activate
+
     assert_raise ActiveRecord::RecordInvalid do
       user.force_change_password!('newpass', 'newpasswrong')
     end
@@ -153,6 +157,8 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_nothing_raised  do
       user.force_change_password!('newpass', 'newpass')
     end
+
+    user.activate
     assert user.authenticated?('newpass')
   end
@@ -256,6 +262,7 @@ class UserTest &lt; ActiveSupport::TestCase
     # when the user logs in, her password must be reencrypted with the new
     # method
+    user.activate
     user.authenticated?('test')
     # and the new password must be saved back to the database
@@ -273,6 +280,7 @@ class UserTest &lt; ActiveSupport::TestCase
     User.expects(:system_encryption_method).returns(:md5).at_least_once
     # but the user provided the wrong password
+    user.activate
     user.authenticated?('WRONG_PASSWORD')
     # and then her password is not updated
@@ -520,7 +528,9 @@ class UserTest &lt; ActiveSupport::TestCase
   should 'not authenticate a not activated user' do
     user = new_user :login => 'testuser', :password => 'test123', :password_confirmation => 'test123'
-    assert_nil User.authenticate('testuser', 'test123')
+    assert_raises User::UserNotActivated do
+      User.authenticate('testuser', 'test123')
+    end
   end
   should 'have activation code but no activated at when created' do
	@@ -903,7 +903,7 @@ module ApplicationHelper		@@ -903,7 +903,7 @@ module ApplicationHelper
903	end	903	end
904		904
905	def base_url	905	def base_url
906	- environment.top_url(request.scheme)	906	+ profile ? profile.top_url(request.scheme) : environment.top_url(request.scheme)
907	end	907	end
908	alias :top_url :base_url	908	alias :top_url :base_url
909		909
	@@ -51,7 +51,7 @@ module ContentViewerHelper		@@ -51,7 +51,7 @@ module ContentViewerHelper
51	elsif date_format == 'past_time'	51	elsif date_format == 'past_time'
52	left_time = true	52	left_time = true
53	end	53	end
54	- content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')	54	+ content_tag('span', show_time(article.published_at, use_numbers , year, left_time), :class => 'date')
55	end	55	end
56		56
57	def link_to_comments(article, args = {})	57	def link_to_comments(article, args = {})
	@@ -16,7 +16,7 @@ module EventsHelper		@@ -16,7 +16,7 @@ module EventsHelper
16		16
17	content_tag( 'tr',	17	content_tag( 'tr',
18	content_tag('td',	18	content_tag('td',
19	- content_tag('div', show_date(article.start_date) + ( article.end_date.nil? ? '' : (_(" to ") + show_date(article.end_date))),:class => 'event-date' ) +	19	+ content_tag('div', show_time(article.start_date) + ( article.end_date.nil? ? '' : (_(" to ") + show_time(article.end_date))),:class => 'event-date' ) +
20	content_tag('div',link_to(article.name,article.url),:class => 'event-title') +	20	content_tag('div',link_to(article.name,article.url),:class => 'event-title') +
21	content_tag('div',(article.address.nil? or article.address == '') ? '' : (_('Place: ') + article.address),:class => 'event-place')	21	content_tag('div',(article.address.nil? or article.address == '') ? '' : (_('Place: ') + article.address),:class => 'event-place')
22	)	22	)
	@@ -30,7 +30,7 @@ module EventsHelper		@@ -30,7 +30,7 @@ module EventsHelper
30	# the day itself	30	# the day itself
31	date,	31	date,
32	# is there any events in this date?	32	# is there any events in this date?
33	- events.any? {\|event\| event.date_range.include?(date)},	33	+ events.any? {\|event\| event.date_range.cover?(date)},
34	# is this date in the current month?	34	# is this date in the current month?
35	true	35	true
36	]	36	]
	@@ -151,7 +151,7 @@ module FormsHelper		@@ -151,7 +151,7 @@ module FormsHelper
151	datepicker_options[:close_text] \|\|= _('Done')	151	datepicker_options[:close_text] \|\|= _('Done')
152	datepicker_options[:constrain_input] \|\|= true	152	datepicker_options[:constrain_input] \|\|= true
153	datepicker_options[:current_text] \|\|= _('Today')	153	datepicker_options[:current_text] \|\|= _('Today')
154	- datepicker_options[:date_format] \|\|= 'mm/dd/yy'	154	+ datepicker_options[:date_format] \|\|= 'yy/mm/dd'
155	datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]	155	datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
156	datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]	156	datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
157	datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]	157	datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
	@@ -236,7 +236,7 @@ module FormsHelper		@@ -236,7 +236,7 @@ module FormsHelper
236	weekHeader: #{datepicker_options[:week_header].to_json},	236	weekHeader: #{datepicker_options[:week_header].to_json},
237	yearRange: #{datepicker_options[:year_range].to_json},	237	yearRange: #{datepicker_options[:year_range].to_json},
238	yearSuffix: #{datepicker_options[:year_suffix].to_json}	238	yearSuffix: #{datepicker_options[:year_suffix].to_json}
239	- })	239	+ }).datepicker('setDate', new Date('#{value}'))
240	</script>	240	</script>
241	".html_safe	241	".html_safe
242	result	242	result
	@@ -86,7 +86,7 @@ module LayoutHelper		@@ -86,7 +86,7 @@ module LayoutHelper
86	end	86	end
87		87
88	def theme_stylesheet_path	88	def theme_stylesheet_path
89	- "/assets#{theme_path}/style.css"	89	+ "#{theme_path}/style.css".gsub(%r{^/}, '')
90	end	90	end
91		91
92	def layout_template	92	def layout_template
	@@ -81,7 +81,7 @@ class Category < ActiveRecord::Base		@@ -81,7 +81,7 @@ class Category < ActiveRecord::Base
81	end	81	end
82		82
83	def upcoming_events(limit = 10)	83	def upcoming_events(limit = 10)
84	- self.events.where('start_date >= ?', Date.today).reorder('start_date').paginate(:page => 1, :per_page => limit)	84	+ self.events.where('start_date >= ?', DateTime.now.beginning_of_day).order('start_date').paginate(page: 1, per_page: limit)
85	end	85	end
86		86
87	def display_in_menu?	87	def display_in_menu?
	@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article		@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article
35	false	35	false
36	end	36	end
37		37
		38	+ def can_display_media_panel?
		39	+ true
		40	+ end
		41	+
38	end	42	end
	@@ -13,7 +13,7 @@ class Environment < ActiveRecord::Base		@@ -13,7 +13,7 @@ class Environment < ActiveRecord::Base
13	:reports_lower_bound, :noreply_email,	13	:reports_lower_bound, :noreply_email,
14	:signup_welcome_screen_body, :members_whitelist_enabled,	14	:signup_welcome_screen_body, :members_whitelist_enabled,
15	:members_whitelist, :highlighted_news_amount,	15	:members_whitelist, :highlighted_news_amount,
16	- :portal_news_amount, :date_format	16	+ :portal_news_amount, :date_format, :signup_intro
17		17
18	has_many :users	18	has_many :users
19		19
	@@ -579,6 +579,14 @@ class Profile < ActiveRecord::Base		@@ -579,6 +579,14 @@ class Profile < ActiveRecord::Base
579	options.merge(Noosfero.url_options)	579	options.merge(Noosfero.url_options)
580	end	580	end
581		581
		582	+ def top_url(scheme = 'http')
		583	+ url = scheme + '://'
		584	+ url << url_options[:host]
		585	+ url << ':' << url_options[:port].to_s if url_options.key?(:port)
		586	+ url << Noosfero.root('')
		587	+ url
		588	+ end
		589	+
582	private :generate_url, :url_options	590	private :generate_url, :url_options
583		591
584	def default_hostname	592	def default_hostname
	@@ -28,4 +28,8 @@ class TinyMceArticle < TextArticle		@@ -28,4 +28,8 @@ class TinyMceArticle < TextArticle
28	true	28	true
29	end	29	end
30		30
		31	+ def can_display_media_panel?
		32	+ true
		33	+ end
		34	+
31	end	35	end