Merge branch 'notification_plugin' into 'master'

Notification plugin See merge request !1

Merge branch 'notification_plugin' into 'master'
Notification plugin See merge request !1
Thiago Ribeiro
2 parents 180ad529 211e635e
Showing 96 changed files with 2036 additions and 247 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/helpers/events_helper.rb
app/helpers/forms_helper.rb
app/models/article.rb
app/models/category.rb
app/models/enterprise_homepage.rb
app/models/event.rb
app/models/textile_article.rb
app/models/tiny_mce_article.rb
app/views/cms/_event.html.erb
app/views/cms/edit.html.erb
app/views/content_viewer/_publishing_info.html.erb
db/migrate/20150722042714_change_article_date_to_datetime.rb
db/schema.rb
features/events.feature
plugins/community_track/lib/community_track_plugin/step.rb
plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
plugins/community_track/test/unit/community_track_plugin/step_test.rb
@@ -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])
@@ -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
@@ -635,6 +635,14 @@ 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
+
   def image?
     false
   end
@@ -743,9 +751,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.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)
+    self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :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
@@ -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,7 +35,7 @@ class Event &lt; Article
   end
  
   scope :by_day, lambda { |date|
-    { :conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}],
+    { :conditions => [' 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'
     }
   }
@@ -80,7 +80,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
@@ -88,7 +88,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
@@ -114,7 +114,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
@@ -134,6 +134,10 @@ class Event &lt; Article
     true
   end
  
+  def can_display_media_panel?
+    true
+  end
+
   include Noosfero::TranslatableContent
   include MaybeAddHttp
  
@@ -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
@@ -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 %>
  
 <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) %>
@@ -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
@@ -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)
@@ -6,7 +6,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
@@ -0,0 +1,80 @@
+class EnvironmentNotificationPluginAdminController < AdminController
+  before_filter :admin_required, :except => [:hide_notification]
+  def index
+    @notifications = environment.environment_notifications.order('updated_at DESC')
+  end
+
+  def new
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.new
+    if request.post?
+      @notification = EnvironmentNotificationPlugin::EnvironmentNotification.new(params[:notifications])
+      @notification.message = @notification.message.html_safe
+      @notification.environment_id = environment.id
+      if @notification.save
+        session[:notice] = _("Notification successfully created")
+        redirect_to :action => :index
+      else
+        session[:notice] = _("Notification couldn't be created")
+      end
+    end
+  end
+
+  def destroy
+    if request.delete?
+      notification = environment.environment_notifications.find_by_id(params[:id])
+      if notification && notification.destroy
+        session[:notice] = _('The notification was deleted.')
+      else
+        session[:notice] = _('Could not remove the notification')
+      end
+    end
+    redirect_to :action => :index
+  end
+
+  def edit
+    @notification = environment.environment_notifications.find_by_id(params[:id])
+    if request.post?
+      if @notification.update_attributes(params[:notifications])
+        session[:notice] = _('The notification was edited.')
+      else
+        session[:notice] = _('Could not edit the notification.')
+      end
+    redirect_to :action => :index
+    end
+  end
+
+  def change_status
+    @notification = environment.environment_notifications.find_by_id(params[:id])
+
+    @notification.active = !@notification.active
+
+    if @notification.save!
+      session[:notice] = _('The status of the notification was changed.')
+    else
+      session[:notice] = _('Could not change the status of the notification.')
+    end
+
+    redirect_to :action => :index
+  end
+
+  def hide_notification
+    result = false
+
+    if logged_in?
+      @notification = environment.environment_notifications.find_by_id(params[:notification_id])
+
+      if @notification
+        @notification.users << current_user
+        result = @notification.users.include?(current_user)
+      end
+    end
+
+    render json: result
+  end
+
+  protected
+  def admin_required
+    redirect_to :root unless current_user.person.is_admin?
+  end
+
+end
@@ -0,0 +1,24 @@
+class CreateNotificationTable < ActiveRecord::Migration
+  def up
+    create_table :environment_notifications do |t|
+      t.text :message
+      t.integer :environment_id
+      t.string :type
+      t.boolean :active
+      t.boolean :display_only_in_homepage, :default => false
+      t.boolean :display_to_all_users,     :default => false
+      t.column :created_at,                :datetime
+      t.column :updated_at,                :datetime
+    end
+
+    create_table :environment_notifications_users, id: false do |t|
+      t.belongs_to :environment_notification, index: true
+      t.belongs_to :user, index: true
+    end
+  end
+
+  def down
+    drop_table :environment_notifications
+    drop_table :environment_notifications_users
+  end
+end
@@ -0,0 +1,29 @@
+class EnvironmentNotificationPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Environment Notifications Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin for environment notifications.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def js_files
+    %w(
+    public/environment_notification_plugin.js
+    )
+  end
+
+  def body_beginning
+    expanded_template('environment_notification_plugin_admin/show_notification.html.erb')
+  end
+
+  def admin_panel_links
+    {:title => _('Notification Manager'), :url => {:controller => 'environment_notification_plugin_admin', :action => 'index'}}
+  end
+
+end
@@ -0,0 +1,10 @@
+class EnvironmentNotificationsUser < ActiveRecord::Base
+  self.table_name = "environment_notifications_users"
+
+  belongs_to :user
+  belongs_to :environment_notification, class_name: 'EnvironmentNotificationPlugin::EnvironmentNotification'
+
+  attr_accessible :user_id, :environment_notification_id
+
+  validates_uniqueness_of :user_id, :scope => :environment_notification_id
+end
@@ -0,0 +1,5 @@
+require_dependency 'environment'
+
+class Environment
+  has_many :environment_notifications, class_name: 'EnvironmentNotificationPlugin::EnvironmentNotification'
+end
@@ -0,0 +1,6 @@
+require_dependency 'user'
+
+class User
+  has_many :environment_notifications_users
+  has_many :environment_notifications, :through => :environment_notifications_users
+end
@@ -0,0 +1,2 @@
+class EnvironmentNotificationPlugin::DangerNotification < EnvironmentNotificationPlugin::EnvironmentNotification
+end
@@ -0,0 +1,27 @@
+class EnvironmentNotificationPlugin::EnvironmentNotification < ActiveRecord::Base
+
+  self.table_name = "environment_notifications"
+
+  TYPE_LIST = [
+    "EnvironmentNotificationPlugin::WarningNotification",
+    "EnvironmentNotificationPlugin::SuccessNotification",
+    "EnvironmentNotificationPlugin::InformationNotification",
+    "EnvironmentNotificationPlugin::DangerNotification"
+  ]
+
+  attr_accessible :message, :environment_id, :active, :type, :display_only_in_homepage, :display_to_all_users
+
+  has_many :environment_notifications_users
+  has_many :users, :through => :environment_notifications_users
+
+  validates_presence_of :message
+  validates_presence_of :environment_id
+  validate :notification_type_must_be_in_type_list
+
+  def notification_type_must_be_in_type_list
+    unless TYPE_LIST.include?(type)
+      errors.add(:type, "invalid notification type")
+    end
+  end
+
+end
@@ -0,0 +1,2 @@
+class EnvironmentNotificationPlugin::InformationNotification < EnvironmentNotificationPlugin::EnvironmentNotification
+end
@@ -0,0 +1,2 @@
+class EnvironmentNotificationPlugin::SuccessNotification < EnvironmentNotificationPlugin::EnvironmentNotification
+end
@@ -0,0 +1,2 @@
+class EnvironmentNotificationPlugin::WarningNotification < EnvironmentNotificationPlugin::EnvironmentNotification
+end
@@ -0,0 +1,40 @@
+(function($) {
+  "use strict";
+
+  function notificationBar() {
+    var completeMessage = $(".notification-bar").remove();
+    $("#content-inner").before(completeMessage);
+  },
+
+  function hideNotification(){
+    var notification = $(this).parent();
+    var id = notification.attr("data-notification");
+
+    $.ajax({
+      url: noosfero_root()+"/admin/plugin/environment_notification/hide_notification",
+      type: "POST",
+      data: {notification_id: id},
+      success: function(response) {
+        notification.fadeOut();
+      }
+    });
+  }
+
+  function mceRestrict() {
+    tinyMCE.init({
+      menubar : false,
+      selector: "textarea",
+      plugins: [
+          "autolink link"
+      ],
+      toolbar: "bold italic underline | link"
+    });
+  }
+
+  jQuery(document).ready(function(){
+    notificationBar();
+    $(".notification-close").on("click", hideNotification);
+    mceRestrict();
+  });
+
+})(jQuery);
 \ No newline at end of file
@@ -0,0 +1,141 @@
+.notification-bar {
+	display: block;
+}
+
+.notification:hover {
+  opacity: 0.8;
+}
+
+#notification-manager {
+  overflow: auto;
+}
+
+.notification .notification-close {
+  background: url(public/images/close.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+}
+
+.warningnotification,
+.informationnotification,
+.successnotification,
+.dangernotification {
+  margin-bottom: 10px;
+  padding: 7px 10px;
+  border-radius: 5px;
+  border: 1px solid blue;
+  font-size: 16px;
+  color: white;
+  overflow: auto;
+}
+
+.warningnotification p,
+.informationnotification p,
+.successnotification p,
+.dangernotification p {
+  margin: 0px;
+}
+
+.warningnotification {
+  background: #EEA236;
+  border: 1px solid #EEA236;
+}
+
+.informationnotification {
+  background: #5BC0DE;
+  border: 1px solid #46B8DA;
+}
+
+.successnotification {
+  background: #5CB85C;
+  border: 1px solid #4CAE4C;
+}
+
+.dangernotification {
+  background: #C9302C;
+  border: 1px solid #AC2925;
+}
+
+a.button.icon-deactivate {
+  background: url(public/images/hide.png) no-repeat;
+  background-position: center;
+}
+
+a.button.icon-activate {
+  background: url(public/images/show.png) no-repeat;
+  background-position: center;
+}
+
+.notification-line {
+  display: inline;
+  padding-top: 10px;
+  vertical-align: middle;
+  border-bottom: 1px solid #ccc;
+}
+
+.notification-title-bar {
+  float: left;
+  width: 100%;
+  font-style: 14px;
+  font-weight: 700;
+  border-bottom: 2px solid black;
+  padding: 9px 0;
+}
+
+.notification-title {
+  width: 80%;
+  float: left;
+  text-align: center;
+}
+
+.action-title {
+  width: 20%;
+  float: left;
+  text-align: center;
+}
+
+.notification-action {
+  width: 18%;
+  float: left;
+  height: 30px;
+  padding-top: 9px;
+}
+
+.main-bar .button,
+.notification-action .button {
+  border-radius: 3px;
+}
+
+.notification-message {
+  width: 82%;
+  float: left;
+}
+
+.new-notification {
+  float: right;
+  width: auto;
+}
+
+.back-button {
+  float: left;
+}
+
+.main-bar {
+  display: inline;
+  width: 100%;
+}
+
+.notification-bar .notification .notification-message {
+  width: 90%;
+  float: left;
+}
+
+.notification-bar .notification .notification-close {
+  background: url(public/images/close.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+  float: right;
+  cursor: pointer;
+}
@@ -0,0 +1,153 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require(
+  File.expand_path(File.dirname(__FILE__)) +
+  '/../../controllers/environment_notification_plugin_admin_controller'
+)
+
+class EnvironmentNotificationPluginAdminController; def rescue_action(e) raise e end;
+end
+
+class EnvironmentNotificationPluginAdminControllerTest < ActionController::TestCase
+  def setup
+    @controller = EnvironmentNotificationPluginAdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('person').person
+
+    @environment = Environment.default
+    @environment.enable_plugin('EnvironmentNotificationPlugin')
+    @environment.save!
+
+    login_as(@person.user.login)
+  end
+
+  attr_accessor :person
+
+  should 'an admin be able to create a notification' do
+    @environment.add_admin(@person)
+     post :new, :notifications => {
+                  :message => "Message",
+                  :active => true,
+                  :type => "EnvironmentNotificationPlugin::DangerNotification"
+                }
+     assert_redirected_to :action => 'index'
+     notification = EnvironmentNotificationPlugin::EnvironmentNotification.last
+     assert_equal "Message", notification.message
+     assert notification.active
+     assert_equal "EnvironmentNotificationPlugin::DangerNotification", notification.type
+  end
+
+  should 'an user not to be able to create a notification' do
+     post :new, :notifications => {
+                  :message => "Message",
+                  :active => true,
+                  :type => "EnvironmentNotificationPlugin::DangerNotification"
+                }
+     assert_redirected_to :root
+     assert_nil EnvironmentNotificationPlugin::EnvironmentNotification.last
+  end
+
+   should 'an admin be able to edit a notification' do
+    @environment.add_admin(@person)
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     post :edit, :id => @notification.id, :notifications => {
+                                            :message => "Edited Message",
+                                            :active => false,
+                                            :type => "EnvironmentNotificationPlugin::WarningNotification"
+                                          }
+     @notification = EnvironmentNotificationPlugin::EnvironmentNotification.last
+     assert_redirected_to :action => 'index'
+     assert_equal "Edited Message", @notification.message
+     assert !@notification.active
+     assert_equal "EnvironmentNotificationPlugin::WarningNotification", @notification.type
+  end
+
+  should 'an user not to be able to edit a notification' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     post :edit, :notifications => {
+                   :message => "Edited Message",
+                   :active => false,
+                   :type => "EnvironmentNotificationPlugin::DangerNotification"
+                 }
+     @notification.reload
+     assert_redirected_to :root
+     assert_equal "Message", @notification.message
+     assert @notification.active
+  end
+
+  should 'an admin be able to destroy a notification' do
+    @environment.add_admin(@person)
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+    delete :destroy, :id => @notification.id
+    assert_nil EnvironmentNotificationPlugin::EnvironmentNotification.find_by_id(@notification.id)
+  end
+
+  should 'an user not to be able to destroy a notification' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     delete :destroy, :id => @notification.id
+
+     assert_redirected_to :root
+     assert_not_nil EnvironmentNotificationPlugin::EnvironmentNotification.find_by_id(@notification.id)
+  end
+
+  should 'an admin be able to change Notification status' do
+    @environment.add_admin(@person)
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     post :change_status, :id => @notification.id
+     assert_redirected_to :action => 'index'
+
+     @notification.reload
+     assert !@notification.active
+  end
+
+  should 'an user not be able to change Notification status' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     post :change_status, :id => @notification.id
+     assert_redirected_to :root
+
+     @notification.reload
+     assert @notification.active
+  end
+
+  should 'a logged in user be able to permanently hide notifications' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     post :hide_notification, :notification_id => @notification.id
+     assert_equal "true", @response.body
+     assert_equal true, @notification.users.include?(@person.user)
+  end
+end
@@ -0,0 +1,105 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require 'home_controller'
+
+class HomeController; def rescue_action(e) raise e end;
+end
+
+class HomeControllerTest < ActionController::TestCase
+  def setup
+    @controller = HomeController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('person').person
+
+    @environment = Environment.default
+    @environment.enable_plugin('EnvironmentNotificationPlugin')
+    @environment.save!
+  end
+
+  attr_accessor :person
+
+  should 'an active notification be displayed on home page for a logged in user' do
+    login_as(@person.user.login)
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is a Notification Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     get :index
+     assert_match /Hello, this is a Notification Message/, @response.body
+  end
+
+
+  should 'an active notification not be displayed on home page for unlogged user' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is a Notification Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     get :index
+     assert_no_match /Hello, this is a Notification Message/, @response.body
+  end
+
+  should 'an active notification be displayed on home page for unlogged user' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is a Notification Message",
+                      :display_to_all_users => true,
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     get :index
+     assert_match /Hello, this is a Notification Message/, @response.body
+  end
+
+  should 'only display the notification with display_to_all_users option for unlogged user ' do
+    @notification1 = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is an old Notification Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+
+    @notification2 = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is a new Notification Message",
+                      :display_to_all_users => true,
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+
+
+     get :index
+     assert_no_match /Hello, this is a Notification Message/, @response.body
+     assert_match /Hello, this is a new Notification Message/, @response.body
+  end
+
+  should 'an inactive notification not be displayed on home page' do
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is a Notification Message",
+                      :active => false,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     get :index
+     assert_no_match /Hello, this is a Notification Message/, @response.body
+  end
+
+
+  should 'an active notification not be displayed to a logged in user after been closed by him' do
+    login_as(@person.user.login)
+    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
+                      :environment_id => @environment.id,
+                      :message => "Hello, this is a Notification Message",
+                      :active => true,
+                      :type => "EnvironmentNotificationPlugin::DangerNotification"
+                    )
+     @notification.users << @person.user
+     @notification.save!
+     assert_equal true, @notification.users.include?(@person.user)
+     get :index
+     assert_no_match /Hello, this is a Notification Message/, @response.body
+  end
+end
@@ -0,0 +1,27 @@
+<% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;'} %>
+
+<%= button :back, _('Back'), :controller => 'environment_notification_plugin_admin' %>
+
+<%= form_for :notifications do |f| %>
+
+  <%= render :file => 'shared/tiny_mce' %>
+
+  <%= labelled_form_field(_("Enter your message here:"), f.text_area(:message, abstract_options)) %>
+
+  <%= labelled_form_field(_('Notifications Status'), select(:notifications, :active, options_for_select_with_title({"Active" => true, "Inactive" => false}, @notification.active))) %>
+
+  <%= labelled_form_field(_('Notifications Type'), select(:notifications, :type, options_for_select_with_title({"Information" => "EnvironmentNotificationPlugin::InformationNotification", "Warning" => "EnvironmentNotificationPlugin::WarningNotification", "Success" => "EnvironmentNotificationPlugin::SuccessNotification", "Danger" => "EnvironmentNotificationPlugin::DangerNotification"}, @notification.type))) %>
+
+  <div>
+    <%= labelled_check_box(_("Display only in the homepage"), 'notifications[display_only_in_homepage]', '1', @notification.display_only_in_homepage?) %>
+  </div>
+
+  <div>
+    <%= labelled_check_box(_("Display to not logged users too"), 'notifications[display_to_all_users]', '1', @notification.display_to_all_users?) %>
+  </div>
+
+  <% button_bar do %>
+    <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
+  <% end %>
+
+<% end %>
@@ -0,0 +1 @@
+<%= render :partial => "form" %>
@@ -0,0 +1,40 @@
+<div id="notification-manager">
+  <div class="notification-manager-title">
+    <h1><%= _("Environment Notifications") %></h1>
+  </div>
+  <div class="buttons-bar">
+    <div class="new-notification">
+      <%= button :new, _('New Notification'), {:action => :new}, :method => :get %>
+    </div>
+    <div class="back-button">
+      <%= button :back, _('Back to control panel'), {:controller => 'admin_panel', :action => :index}, :method => :get %>
+    </div>
+  </div>
+
+  <div class="notification-title-bar">
+    <div class="notification-title">
+      <%= _('Notifications') %>
+    </div>
+    <div class="action-title">
+      <%= _('Actions') %>
+    </div>
+  </div>
+
+  <% @notifications.each do |notification| %>
+    <div class="notification-line">
+      <div class="notification-message">
+        <%= truncate(notification.message, length: 50) %>
+      </div>
+      <div class="notification-action">
+        <% if notification.active? %>
+          <%= button_without_text :deactivate, _('Deactivate'), {:action => :change_status, :id => notification}, :method => :post, :confirm => _("Do you want to change the status of this notification?") %>
+        <% else %>
+          <%= button_without_text :activate, _('Activate'), {:action => :change_status, :id => notification}, :method => :post, :confirm => _("Do you want to change the status of this notification?") %>
+        <% end %>
+        <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => notification.id} if !remove_content_button(:edit, notification) %>
+        <%= button_without_text :delete, _('Delete'), {:action => :destroy, :id => notification}, :method => :delete, :confirm => _("Do you want to delete this notification?") %>
+      </div>
+    </div>
+  <% end %>
+</div>
+
@@ -0,0 +1 @@
+<%= render :partial => "form" %>
@@ -0,0 +1,24 @@
+<div class="notification-bar">
+  <% if logged_in? %>
+    <% @notifications = environment.environment_notifications.order('updated_at DESC').where(active: true)  %>
+    <% @deactivated = current_user.environment_notifications %>
+    <% @notifications = @notifications - @deactivated %>
+  <% else %>
+    <% @notifications = environment.environment_notifications.order('updated_at DESC').where(active: true) %>
+  <% end %>
+
+  <% @notifications.each do |notification| %>
+    <% if controller_path == "home" || !notification.display_only_in_homepage? %>
+      <% if logged_in? || notification.display_to_all_users? %>
+        <div class="<%= notification.type.gsub("EnvironmentNotificationPlugin::", "").downcase %> notification" data-notification="<%=notification.id%>">
+          <div class="notification-message">
+            <%= notification.message %>
+          </div>
+          <% if logged_in? %>
+            <div class="notification-close"></div>
+          <% end %>
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+</div>
@@ -30,13 +30,13 @@ class EventPlugin::EventBlock &lt; Block
     events = user.nil? ? events.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
  
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
  
+
 # Re-raise errors caught by the controller.
 class HomeController
-  #append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
   def rescue_action(e)
     raise e
   end
@@ -15,7 +16,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)
@@ -27,6 +28,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"]'
@@ -41,15 +43,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/
@@ -60,8 +62,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',
@@ -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
@@ -48,6 +48,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
@@ -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>
@@ -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 {
@@ -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
  
@@ -305,7 +305,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'
  
@@ -314,10 +314,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)
@@ -325,9 +325,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('/')
@@ -337,8 +339,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
  
@@ -349,9 +351,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
  
@@ -362,8 +364,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'
  
@@ -373,7 +375,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
@@ -416,7 +418,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/}
@@ -475,7 +477,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
  
@@ -484,8 +486,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
  
@@ -772,7 +774,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
@@ -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
@@ -2180,4 +2191,27 @@ 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
+
 end
@@ -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
@@ -1563,8 +1563,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
@@ -1573,7 +1573,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)
@@ -1586,7 +1586,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)
@@ -1599,7 +1599,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)
  
@@ -1613,7 +1613,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)
@@ -1627,9 +1627,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
@@ -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
...	...	@@ -92,10 +92,10 @@ class SearchController < PublicController
92	92
93	93	def events
94	94	if params[:year].blank? && params[:year].blank? && params[:day].blank?
95		- @date = Date.today
	95	+ @date = DateTime.now
96	96	else
97		- year = (params[:year] ? params[:year].to_i : Date.today.year)
98		- month = (params[:month] ? params[:month].to_i : Date.today.month)
	97	+ year = (params[:year] ? params[:year].to_i : DateTime.now.year)
	98	+ month = (params[:month] ? params[:month].to_i : DateTime.now.month)
99	99	day = (params[:day] ? params[:day].to_i : 1)
100	100	@date = build_date(year, month, day)
101	101	end
...	...	@@ -106,9 +106,7 @@ class SearchController < PublicController
106	106	@events = @category ?
107	107	environment.events.by_day(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
108	108	environment.events.by_day(@date).paginate(:per_page => per_page, :page => params[:page])
109		- end
110		-
111		- if params[:year] \|\| params[:month]
	109	+ elsif params[:year] \|\| params[:month]
112	110	@events = @category ?
113	111	environment.events.by_month(@date).in_category(Category.find(@category_id)).paginate(:per_page => per_page, :page => params[:page]) :
114	112	environment.events.by_month(@date).paginate(:per_page => per_page, :page => params[:page])
...	...
...	...	@@ -51,7 +51,7 @@ module ContentViewerHelper
51	51	elsif date_format == 'past_time'
52	52	left_time = true
53	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	55	end
56	56
57	57	def link_to_comments(article, args = {})
...	...
...	...	@@ -43,9 +43,14 @@ module DatesHelper
43	43	end
44	44
45	45	# formats a datetime for displaying.
46		- def show_time(time)
47		- if time
48		- _('%{day} %{month} %{year}, %{hour}:%{minutes}') % { :year => time.year, :month => month_name(time.month), :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
	46	+ def show_time(time, use_numbers = false, year = true, left_time = false)
	47	+ if time && use_numbers
	48	+ _('%{month}/%{day}/%{year}, %{hour}:%{minutes}') % { :year => (year ? time.year : ''), :month => time.month, :day => time.day, :hour => time.hour, :minutes => time.strftime("%M") }
	49	+ elsif time && left_time
	50	+ date_format = time_ago_in_words(time)
	51	+ elsif time
	52	+ date_format = year ? _('%{month_name} %{day}, %{year} %{hour}:%{minutes}') : _('%{month_name} %{day} %{hour}:%{minutes}')
	53	+ date_format % { :day => time.day, :month_name => month_name(time.month), :year => time.year, :hour => time.hour, :minutes => time.strftime("%M") }
49	54	else
50	55	''
51	56	end
...	...	@@ -53,7 +58,7 @@ module DatesHelper
53	58
54	59	def show_period(date1, date2 = nil, use_numbers = false)
55	60	if (date1 == date2) \|\| (date2.nil?)
56		- show_date(date1, use_numbers)
	61	+ show_time(date1, use_numbers)
57	62	else
58	63	if date1.year == date2.year
59	64	if date1.month == date2.month
...	...	@@ -72,8 +77,8 @@ module DatesHelper
72	77	end
73	78	else
74	79	_('from %{date1} to %{date2}') % {
75		- :date1 => show_date(date1, use_numbers),
76		- :date2 => show_date(date2, use_numbers)
	80	+ :date1 => show_time(date1, use_numbers),
	81	+ :date2 => show_time(date2, use_numbers)
77	82	}
78	83	end
79	84	end
...	...	@@ -106,18 +111,18 @@ module DatesHelper
106	111
107	112	def build_date(year, month, day = 1)
108	113	if year.blank? and month.blank? and day.blank?
109		- Date.today
	114	+ DateTime.now
110	115	else
111	116	if year.blank?
112		- year = Date.today.year
	117	+ year = DateTime.now.year
113	118	end
114	119	if month.blank?
115		- month = Date.today.month
	120	+ month = DateTime.now.month
116	121	end
117	122	if day.blank?
118	123	day = 1
119	124	end
120		- Date.new(year.to_i, month.to_i, day.to_i)
	125	+ DateTime.new(year.to_i, month.to_i, day.to_i)
121	126	end
122	127	end
123	128
...	...
...	...	@@ -16,7 +16,7 @@ module EventsHelper
16	16
17	17	content_tag( 'tr',
18	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	20	content_tag('div',link_to(article.name,article.url),:class => 'event-title') +
21	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	30	# the day itself
31	31	date,
32	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	34	# is this date in the current month?
35	35	true
36	36	]
...	...
...	...	@@ -151,7 +151,7 @@ module FormsHelper
151	151	datepicker_options[:close_text] \|\|= _('Done')
152	152	datepicker_options[:constrain_input] \|\|= true
153	153	datepicker_options[:current_text] \|\|= _('Today')
154		- datepicker_options[:date_format] \|\|= 'mm/dd/yy'
	154	+ datepicker_options[:date_format] \|\|= 'yy/mm/dd'
155	155	datepicker_options[:day_names] \|\|= [_('Sunday'), _('Monday'), _('Tuesday'), _('Wednesday'), _('Thursday'), _('Friday'), _('Saturday')]
156	156	datepicker_options[:day_names_min] \|\|= [_('Su'), _('Mo'), _('Tu'), _('We'), _('Th'), _('Fr'), _('Sa')]
157	157	datepicker_options[:day_names_short] \|\|= [_('Sun'), _('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat')]
...	...	@@ -236,7 +236,7 @@ module FormsHelper
236	236	weekHeader: #{datepicker_options[:week_header].to_json},
237	237	yearRange: #{datepicker_options[:year_range].to_json},
238	238	yearSuffix: #{datepicker_options[:year_suffix].to_json}
239		- })
	239	+ }).datepicker('setDate', new Date('#{value}'))
240	240	</script>
241	241	".html_safe
242	242	result
...	...
...	...	@@ -635,6 +635,14 @@ class Article < ActiveRecord::Base
635	635	can_display_hits? && display_hits
636	636	end
637	637
	638	+ def display_media_panel?
	639	+ can_display_media_panel? && environment.enabled?('media_panel')
	640	+ end
	641	+
	642	+ def can_display_media_panel?
	643	+ false
	644	+ end
	645	+
638	646	def image?
639	647	false
640	648	end
...	...	@@ -743,9 +751,10 @@ class Article < ActiveRecord::Base
743	751	end
744	752
745	753	def body_images_paths
746		- require 'uri'
747	754	Nokogiri::HTML.fragment(self.body.to_s).css('img[src]').collect do \|i\|
748		- (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, URI.escape(i['src'])).to_s : i['src']
	755	+ src = i['src']
	756	+ src = URI.escape src if self.new_record? # xss_terminate runs on save
	757	+ (self.profile && self.profile.environment) ? URI.join(self.profile.environment.top_url, src).to_s : src
749	758	end
750	759	end
751	760
...	...
...	...	@@ -81,7 +81,7 @@ class Category < ActiveRecord::Base
81	81	end
82	82
83	83	def upcoming_events(limit = 10)
84		- self.events.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)
	84	+ self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :page => 1, :per_page => limit)
85	85	end
86	86
87	87	def display_in_menu?
...	...
...	...	@@ -35,4 +35,8 @@ class EnterpriseHomepage < Article
35	35	false
36	36	end
37	37
	38	+ def can_display_media_panel?
	39	+ true
	40	+ end
	41	+
38	42	end
...	...
...	...	@@ -23,7 +23,7 @@ class Event < Article
23	23
24	24	def initialize(*args)
25	25	super(*args)
26		- self.start_date \|\|= Date.today
	26	+ self.start_date \|\|= DateTime.now
27	27	end
28	28
29	29	validates_presence_of :title, :start_date
...	...	@@ -35,7 +35,7 @@ class Event < Article
35	35	end
36	36
37	37	scope :by_day, lambda { \|date\|
38		- { :conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}],
	38	+ { :conditions => [' 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}],
39	39	:order => 'start_date ASC'
40	40	}
41	41	}
...	...	@@ -80,7 +80,7 @@ class Event < Article
80	80
81	81	def self.date_range(year, month)
82	82	if year.nil? \|\| month.nil?
83		- today = Date.today
	83	+ today = DateTime.now
84	84	year = today.year
85	85	month = today.month
86	86	else
...	...	@@ -88,7 +88,7 @@ class Event < Article
88	88	month = month.to_i
89	89	end
90	90
91		- first_day = Date.new(year, month, 1)
	91	+ first_day = DateTime.new(year, month, 1)
92	92	last_day = first_day + 1.month - 1.day
93	93
94	94	first_day..last_day
...	...	@@ -114,7 +114,7 @@ class Event < Article
114	114	end
115	115
116	116	def duration
117		- ((self.end_date \|\| self.start_date) - self.start_date).to_i
	117	+ (((self.end_date \|\| self.start_date) - self.start_date).to_i/60/60/24)
118	118	end
119	119
120	120	alias_method :article_lead, :lead
...	...	@@ -134,6 +134,10 @@ class Event < Article
134	134	true
135	135	end
136	136
	137	+ def can_display_media_panel?
	138	+ true
	139	+ end
	140	+
137	141	include Noosfero::TranslatableContent
138	142	include MaybeAddHttp
139	143
...	...
...	...	@@ -24,6 +24,10 @@ class TextileArticle < TextArticle
24	24	true
25	25	end
26	26
	27	+ def can_display_media_panel?
	28	+ true
	29	+ end
	30	+
27	31	protected
28	32
29	33	def convert_to_html(textile)
...	...