Merge branch 'master' into staging

Leandro Santos
2 parents c7b2cb8c 5a45530a
Showing 101 changed files with 2046 additions and 1695 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/memberships_helper.rb
app/helpers/profile_image_helper.rb
app/models/add_member.rb
app/models/community.rb
app/models/task.rb
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
app/views/profile/_private_profile.html.erb
app/views/profile/join.html.erb
app/views/profile_editor/_moderation.html.erb
app/views/tasks/_add_member_footer.html.erb
app/views/tasks/_task.html.erb
plugins/admin_notifications/README
plugins/admin_notifications/controllers/admin_notifications_plugin_admin_controller.rb
plugins/admin_notifications/controllers/admin_notifications_plugin_myprofile_controller.rb
plugins/admin_notifications/controllers/public/admin_notifications_plugin_public_controller.rb
plugins/admin_notifications/db/migrate/20150721132025_create_notification_table.rb
plugins/admin_notifications/db/migrate/20160321190726_change_notification_relation_to_polymorphic.rb
plugins/admin_notifications/db/migrate/20160330171610_rename_plugin_tables.rb
@@ -86,8 +86,16 @@ class ProfileController &lt; PublicController
     @articles = profile.top_level_articles.includes([:profile, :parent])
   end
+  def join_modal
+      profile.add_member(user)
+      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name
+      redirect_to :action => :index
+  end
+
   def join
     if !user.memberships.include?(profile)
+      return if profile.community? && show_confirmation_modal?(profile)
+
       profile.add_member(user)
       if !profile.members.include?(user)
         render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
@@ -56,6 +56,8 @@ module ApplicationHelper
   include TaskHelper
+  include MembershipsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -986,11 +988,11 @@ module ApplicationHelper
   def task_information(task)
     values = {}
+    values.merge!(task.information[:variables]) if task.information[:variables]
     values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
-    values.merge!(task.information[:variables]) if task.information[:variables]
-    task.information[:message] % values
+    (task.information[:message] % values).html_safe
   end
   def add_zoom_to_article_images
 module MembershipsHelper
+
+  def join_community_button options={:logged => false}
+    url = options[:logged] ? profile.join_url : profile.join_not_logged_url
+
+    if show_confirmation_modal? profile
+      modal_button :add, _('Join this community'), url, class: 'join-community'
+    else
+      button :add, _('Join this community'), url, class: 'join-community'
+    end
+  end
+
+  def show_confirmation_modal? profile
+    profile.requires_email? && current_person && !current_person.public_fields.include?("email")
+  end
+
 end
@@ -61,6 +61,8 @@ module ProfileImageHelper
     image_tag(profile_icon(profile, size), opt )
   end
+  include MembershipsHelper
+
   def links_for_balloon(profile)
     if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
       if profile.kind_of?(Person)
@@ -76,7 +78,7 @@ module ProfileImageHelper
           {_('Wall') => {:href => url_for(profile.public_profile_url)}},
           {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
           {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
-          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
+          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community'+ (show_confirmation_modal?(profile) ? ' modal-toggle' : '') , :style => 'display: none'}},
           {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
           {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
         ]
@@ -29,16 +29,18 @@ class AddMember &lt; Task
   end
   def information
-    requestor_email = " (#{requestor.email})" if requestor.may_display_field_to?("email")
-
-    {:message => _("%{requestor}%{requestor_email} wants to be a member of '%{organization}'."),
-     variables: {requestor: requestor.name, requestor_email: requestor_email, organization: organization.name}}
+    {:message => _("%{requestor} wants to be a member of '%{target}'."),
+     variables: {requestor: requestor.name, target: target.name}}
   end
   def accept_details
     true
   end
+  def footer
+    true
+  end
+
   def icon
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
@@ -63,4 +65,15 @@ class AddMember &lt; Task
     suggestion.disable if suggestion
   end
+  def task_finished_message
+    _("You have been accepted at \"%{target}\" with the profile \"%{requestor}\"") %
+      {:target => self.target.name,
+       :requestor => self.requestor.name}
+  end
+
+  def task_cancelled_message
+    _("Your request to enter community \"%{target} with the profile \"%{requestor}\" was not accepted. Please contact any profile admin from %{url} for more information.") %
+    {:target => self.target.name, :url => self.target.url,
+     :requestor => self.requestor.name}
+  end
 end
@@ -2,6 +2,7 @@ class Community &lt; Organization
   attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
   attr_accessible :address_reference, :district, :tag_list, :language, :description
+  attr_accessible :requires_email
   after_destroy :check_invite_member_for_destroy
   def self.type_name
@@ -12,6 +13,9 @@ class Community &lt; Organization
   N_('Language')
   settings_items :language
+  settings_items :requires_email, :type => :boolean
+
+  alias_method :requires_email?, :requires_email
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -213,6 +213,10 @@ class Task &lt; ApplicationRecord
     false
   end
+  def footer
+    false
+  end
+
   def icon
     {:type => :defined_image, :src => "/images/icons-app/user-minor.png", :name => requestor.name, :url => requestor.url}
   end
@@ -7,15 +7,12 @@
         <%= button :delete, content_tag('span', _('Leave community')), profile.leave_url,
           class: 'leave-community',
           style: 'position: relative;' %>
-        <%= button :add, content_tag('span', _('Join this community')), profile.join_url,
-          class: 'join-community',
-          style: 'position: relative; display: none;' %>
       <% else %>
-        <%= button :add, _('Join this community'), profile.join_url, class: 'join-community' %>
+        <%= join_community_button({:logged => true}) %>
       <% end %>
     <% end %>
   <% else %>
-    <%= button :add, _('Join this community'), profile.join_not_logged_url %>
+    <%= join_community_button %>
   <% end %>
 </div>
@@ -7,7 +7,7 @@
 <% button_bar do %>
   <% if @action == :join && logged_in? %>
-    <%= button(:add, content_tag('span', _('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
+    <%= join_community_button({:logged => true}) %>
   <% end %>
   <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
     <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
-<h1><%= _('Joining %s') % profile.name %></h1>
+<div class="join-community-confirmation">
-<p>
-<%= _('Are you sure you want to join %s?') % profile.name %>
-</p>
+  <h1><%= _('To join %s, you must:') % profile.name %></h1>
-<%= form_tag do %>
-  <%= hidden_field_tag('back_to', @back_to) %>
-  <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
-  <% if logged_in? && request.xhr? %>
-    <%= modal_close_button _("No, I don't want") %>
-  <% else %>
-    <%= button(:cancel, _("No, I don't want."), profile.url) %>
+  <p>
+  <%= _("Authorize the visibility of your email address to the community administrator.") %>
+  </p>
+
+  <%= form_tag url_for({:action => :join_modal, :controller => :profile}) do %>
+    <%= hidden_field_tag('back_to', @back_to) %>
+    <%= submit_button(:ok, _("Authorize")) %>
+    <%= modal_close_button _("Cancel") %>
   <% end %>
-<% end %>
+
+</div>
+
@@ -9,7 +9,6 @@
       <%= _('Send administrator Email for every task') %>
     </div>
   </div>
-
   <div style='margin-bottom: 1em'>
     <h4><%= _('Invitation moderation:')%></h4>
   </div>
@@ -36,6 +35,12 @@
     <div style='margin-left: 30px'>
       <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).').html_safe %>
     </div>
+    <div id = "requires_email_option" style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;<%=" display: none;" unless profile.closed?  %>">
+      <%= check_box(:profile_data, :requires_email, :style => 'float: left') %>
+      <div style='margin-left: 30px'>
+        <%= _('New members must allow email visibility to the profile admin') %>
+      </div>
+    </div>
   </div>
   <div>
     <%= radio_button 'profile_data', 'closed', 'false', :style => 'float: left' %>
@@ -0,0 +1,7 @@
+<% if (task.organization.requires_email || task.requestor.may_display_field_to?("email")) %>
+  <div>
+    Email:
+    <span id="task_email"> <%=task.requestor.email %> </span>
+  </div>
+<% end %>
+
@@ -77,4 +77,10 @@
   <% end %>
+  <% if task.footer %>
+    <div id="task-footer-<%=task.id%>">
+      <%= render :partial => partial_for_class(task.class, nil, :footer), :locals => {:task => task} %>
+    </div>
+  <% end %>
+
 </div><!-- class="task_box" -->
@@ -0,0 +1,7 @@
+This plugin is the new version of "environment_notification" plugin.
+
+New features added:
+  - Create a notification for an organization;
+    - Only profile admin can create notifications;
+    - Organization notifications can be seen by members from any of the organization pages;
+    - home_page option set the notification to be seen only at organization homepage;
@@ -0,0 +1,16 @@
+class AdminNotificationsPluginAdminController < AdminController
+
+  include AdminNotificationsPlugin::NotificationManager
+
+  before_filter :admin_required
+
+  protected
+  def target
+    environment
+  end
+
+  def admin_required
+    redirect_to :root unless current_person.is_admin?
+  end
+
+end
@@ -0,0 +1,16 @@
+class AdminNotificationsPluginMyprofileController < MyProfileController
+
+  include AdminNotificationsPlugin::NotificationManager
+
+  before_filter :admin_required
+
+  protected
+  def target
+    profile
+  end
+
+  def admin_required
+    redirect_to :root unless target.is_admin?(current_person)
+  end
+
+end
@@ -0,0 +1,48 @@
+class AdminNotificationsPluginPublicController < PublicController
+
+  helper AdminNotificationsPlugin::NotificationHelper
+  include AdminNotificationsPlugin::NotificationHelper
+
+  def notifications_with_popup
+    @hide_notifications = hide_notifications
+    if params[:previous_path]
+      @previous_path = params[:previous_path]
+    else
+      @previous_path = nil
+    end
+  end
+
+  def close_notification
+    result = false
+
+    if logged_in?
+      @notification = AdminNotificationsPlugin::Notification.find_by_id(params[:notification_id])
+
+      if @notification
+        @notification.users << current_user
+        result = @notification.users.include?(current_user)
+      end
+    end
+
+    render json: result
+  end
+
+  def hide_notification
+    result = false
+
+    if logged_in?
+      @notification = AdminNotificationsPlugin::Notification.find_by_id(params[:notification_id])
+
+      if @notification
+        current_notificaions = []
+        current_notificaions = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
+        current_notificaions << @notification.id unless current_notificaions.include? @notification.id
+        cookies[:hide_notifications] = JSON.generate(current_notificaions)
+        result = current_notificaions.include? @notification.id
+      end
+    end
+
+    render json: result
+  end
+
+end
@@ -0,0 +1,28 @@
+class CreateNotificationTable < ActiveRecord::Migration
+  def up
+    create_table :environment_notifications do |t|
+      t.text :message
+      t.integer :environment_id
+      t.string :type
+      t.string :title
+      t.boolean :active
+      t.boolean :display_only_in_homepage, :default => false
+      t.boolean :display_to_all_users,     :default => false
+      t.boolean :display_popup,            :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
+      t.belongs_to :user
+    end
+    add_index :environment_notifications_users, [:environment_notification_id], name: :index_Zaem6uuw
+    add_index :environment_notifications_users, [:user_id], name: :index_ap3nohR9
+  end
+
+  def down
+    drop_table :environment_notifications
+    drop_table :environment_notifications_users
+  end
+end
@@ -0,0 +1,13 @@
+class ChangeNotificationRelationToPolymorphic < ActiveRecord::Migration
+  def up
+    rename_column(:environment_notifications, :environment_id, :target_id)
+    add_column(:environment_notifications, :target_type, :string)
+
+    execute("UPDATE environment_notifications SET target_type = 'Environment'")
+  end
+
+  def down
+    rename_column(:environment_notifications, :target_id, :environment_id)
+    remove_column(:environment_notifications, :target_type)
+  end
+end
@@ -0,0 +1,43 @@
+class RenamePluginTables < ActiveRecord::Migration
+  def up
+    remove_index :environment_notifications_users, name: :index_Zaem6uuw
+    remove_index :environment_notifications_users, name: :index_ap3nohR9
+
+    rename_column :environment_notifications_users, :environment_notification_id, :notification_id
+
+    rename_table :environment_notifications, :admin_notifications_plugin_notifications
+    rename_table :environment_notifications_users, :admin_notifications_plugin_notifications_users
+
+    add_index :admin_notifications_plugin_notifications_users, [:notification_id], :name => :index_notifications_users_notification_id
+    add_index :admin_notifications_plugin_notifications_users, [:user_id], :name => :index_notifications_users_user_id
+
+    Environment.all.each do |e|
+      if e.enabled_plugins.include?('EnvironmentNotificationPlugin')
+        e.enabled_plugins -= ['EnvironmentNotificationPlugin']
+        e.enabled_plugins += ['AdminNotificationsPlugin']
+        e.save!
+      end
+    end
+  end
+
+  def down
+    remove_index :admin_notifications_plugin_notifications_users, :name => :index_notifications_users_notification_id
+    remove_index :admin_notifications_plugin_notifications_users, :name => :index_notifications_users_user_id
+
+    rename_table :admin_notifications_plugin_notifications, :environment_notifications
+    rename_table :admin_notifications_plugin_notifications_users, :environment_notifications_users
+
+    rename_column :environment_notifications_users, :notification_id, :environment_notification_id
+
+    add_index :environment_notifications_users, [:environment_notification_id], name: :index_Zaem6uuw
+    add_index :environment_notifications_users, [:user_id], name: :index_ap3nohR9
+  end
+
+  Environment.all.each do |e|
+    if e.enabled_plugins.include?('AdminNotificationsPlugin')
+      e.enabled_plugins -= ['AdminNotificationsPlugin']
+      e.enabled_plugins += ['EnvironmentNotificationPlugin']
+      e.save!
+    end
+  end
+end
@@ -0,0 +1,8 @@
+class ChangeTypeToNewNamespace < ActiveRecord::Migration
+  def up
+    notification_types = %w(InformationNotification DangerNotification SuccessNotification WarningNotification)
+    notification_types.each do |notification_type|
+      execute("update admin_notifications_plugin_notifications set type = 'AdminNotificationsPlugin::#{notification_type}' where type = 'EnvironmentNotificationPlugin::#{notification_type}'")
+    end
+  end
+end
@@ -0,0 +1,14 @@
+Feature: Create envronment notification message
+  As an admin user
+  I want to create a notification
+  In order to notificate users
+
+  @selenium
+  Scenario: mce restricted mode should show on message creation
+    Given I am logged in as admin
+    And I follow "Administration"
+    And I follow "Plugins"
+    And I follow "Configuration"
+    And I follow "New Notification"
+    Then The tinymce "toolbar1" should be "bold italic underline | link"
+    Then The tinymce "menubar" should be "false"
@@ -0,0 +1,59 @@
+class AdminNotificationsPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Notifications Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin for notifications.")
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def js_files
+    %w(
+    admin_notifications_plugin.js
+    )
+  end
+
+  def body_beginning
+    lambda do
+      extend AdminNotificationsPlugin::NotificationHelper
+      render template: 'shared/show_notification'
+    end
+  end
+
+  def admin_panel_links
+    {:title => _('Notification Manager'), :url => {:controller => 'admin_notifications_plugin_admin', :action => 'index'}}
+  end
+
+  def control_panel_buttons
+    if context.profile.organization?
+      {
+        :title => _('Manage Notifications'),
+        :icon => 'important',
+        :url => {
+          :controller => 'admin_notifications_plugin_myprofile',
+          :action => 'index'
+        }
+      }
+    end
+  end
+
+  def account_controller_filters
+    block = proc do
+      if !logged_in?
+        cookies[:hide_notifications] = nil
+      end
+    end
+
+    [{
+      :type => "after_filter",
+      :method_name => "clean_hide_notifications_cookie",
+      :options => { },
+      :block => block
+    }]
+  end
+end
@@ -0,0 +1,18 @@
+module AdminNotificationsPlugin::NotificationHelper
+
+  def hide_notifications
+    invalid_id = -1
+    hide_notifications_ids = [invalid_id]
+    hide_notifications_ids = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
+    hide_notifications_ids
+  end
+
+  def self.substitute_variables(message, user)
+    if user
+      message = message.gsub("%{email}", user.person.email).gsub("%{name}", user.person.name)
+    end
+
+    message
+  end
+
+end
@@ -0,0 +1,60 @@
+module AdminNotificationsPlugin::NotificationManager
+
+  def index
+    @notifications = target.notifications.order('updated_at DESC')
+  end
+
+  def new
+    @notification = AdminNotificationsPlugin::Notification.new
+    if request.post?
+      @notification = AdminNotificationsPlugin::Notification.new(params[:notifications])
+      @notification.message = @notification.message.html_safe
+      @notification.target = target
+      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 = target.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 = target.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 = target.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
+
+end
@@ -0,0 +1,10 @@
+class AdminNotificationsPlugin::NotificationsUser < ActiveRecord::Base
+  self.table_name = "admin_notifications_plugin_notifications_users"
+
+  belongs_to :user
+  belongs_to :notification, class_name: 'AdminNotificationsPlugin::Notification'
+
+  attr_accessible :user_id, :notification_id
+
+  validates_uniqueness_of :user_id, :scope => :notification_id
+end
@@ -0,0 +1,5 @@
+require_dependency 'environment'
+
+class Environment
+  has_many :notifications, class_name: 'AdminNotificationsPlugin::Notification', :as => :target
+end
@@ -0,0 +1,5 @@
+require_dependency 'organization'
+
+class Organization
+  has_many :notifications, class_name: 'AdminNotificationsPlugin::Notification', :as => :target
+end
@@ -0,0 +1,6 @@
+require_dependency 'user'
+
+class User
+  has_many :notifications_users, :class_name => 'AdminNotificationsPlugin::NotificationsUser'
+  has_many :notifications, :through => :notifications_users
+end
@@ -0,0 +1,2 @@
+class AdminNotificationsPlugin::DangerNotification < AdminNotificationsPlugin::Notification
+end
@@ -0,0 +1,2 @@
+class AdminNotificationsPlugin::InformationNotification < AdminNotificationsPlugin::Notification
+end
@@ -0,0 +1,56 @@
+class AdminNotificationsPlugin::Notification < ActiveRecord::Base
+
+  self.table_name = "admin_notifications_plugin_notifications"
+
+  TYPE_LIST = [
+    "AdminNotificationsPlugin::WarningNotification",
+    "AdminNotificationsPlugin::SuccessNotification",
+    "AdminNotificationsPlugin::InformationNotification",
+    "AdminNotificationsPlugin::DangerNotification"
+  ]
+
+  attr_accessible :message, :target_id, :active, :type, :display_only_in_homepage, :display_to_all_users, :display_popup, :title, :target
+
+  has_many :notifications_users, :class_name => "AdminNotificationsPlugin::NotificationsUser"
+  has_many :users, :through => :notifications_users
+
+  belongs_to :target, :polymorphic => true
+
+  validates_presence_of :message
+  validates_presence_of :target_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
+
+  scope :active, lambda{|target| where(:target_id => (target.kind_of?(Organization) ? [target.id, target.environment.id] : target.id), :active => true)}
+
+  def self.visibles(target, user, controller_path)
+    notifications = AdminNotificationsPlugin::Notification.active(target).order('updated_at DESC')
+
+    if user
+      active_notifications_ids = notifications.pluck(:id) - user.notifications.pluck(:id)
+
+      notifications = notifications.where(id: active_notifications_ids)
+    else
+      notifications = notifications.where(display_to_all_users: true)
+    end
+
+    if controller_path != "home"
+      notifications = notifications.where.not("display_only_in_homepage = ? AND target_type = ?",true,"Environment")
+      if controller_path != "profile"
+        notifications = notifications.where.not("display_only_in_homepage = ? AND target_type = ?",true,"Profile")
+      end
+    end
+
+    notifications
+  end
+
+  def self.with_popup(target, user, previous_path)
+    AdminNotificationsPlugin::Notification.visibles(target, user, previous_path).where(display_popup: true)
+  end
+
+end
@@ -0,0 +1,2 @@
+class AdminNotificationsPlugin::SuccessNotification < AdminNotificationsPlugin::Notification
+end
@@ -0,0 +1,2 @@
+class AdminNotificationsPlugin::WarningNotification < AdminNotificationsPlugin::Notification
+end
@@ -0,0 +1,187 @@
+# 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: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-31 15:02-0300\n"
+"PO-Revision-Date: 2016-03-31 15:02-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"
+
+#: ../lib/notification_plugin.rb:8
+msgid "A plugin for notifications."
+msgstr ""
+
+#: ../lib/notification_plugin.rb:29
+msgid "Notification Manager"
+msgstr ""
+
+#: ../lib/notification_plugin.rb:35
+msgid "Manage Notifications"
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:14
+msgid "Notification successfully created"
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:17
+msgid "Notification couldn't be created"
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:26
+msgid "The notification was deleted."
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:28
+msgid "Could not remove the notification"
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:38
+msgid "The notification was edited."
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:40
+msgid "Could not edit the notification."
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:52
+msgid "The status of the notification was changed."
+msgstr ""
+
+#: ../lib/notification_plugin/notification_manager.rb:54
+msgid "Could not change the status of the notification."
+msgstr ""
+
+#: ../views/shared/_form.html.erb:5
+msgid "Back"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:11
+msgid "Optional Title:"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:13
+msgid "Enter your message here:"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:15
+msgid ""
+"Obs: You can use %{name} and %{email} variables to put the user's name and ema"
+"il in the message."
+msgstr ""
+
+#: ../views/shared/_form.html.erb:18
+msgid "Notifications Status"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:18
+msgid "Active"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:18
+msgid "Inactive"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:20
+msgid "Notifications Color/Type"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:20
+msgid "Blue - Information"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:20
+msgid "Yellow - Warning"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:20
+msgid "Green - Success"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:20
+msgid "Red - Danger"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:23
+msgid "Display only in the homepage"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:27
+msgid "Display to not logged users too"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:31
+msgid "Display popup until user close the notification"
+msgstr ""
+
+#: ../views/shared/_form.html.erb:35
+msgid "Save"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:3
+#: ../views/shared/_notifications_list.html.erb:16
+msgid "Notifications"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:7
+msgid "New Notification"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:10
+msgid "Back to control panel"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:19
+msgid "Actions"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:30
+msgid "Deactivate"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:30
+#: ../views/shared/_notifications_list.html.erb:32
+msgid "Do you want to change the status of this notification?"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:32
+msgid "Activate"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:34
+msgid "Edit"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:35
+msgid "Delete"
+msgstr ""
+
+#: ../views/shared/_notifications_list.html.erb:35
+msgid "Do you want to delete this notification?"
+msgstr ""
+
+#: ../views/shared/show_notification.html.erb:8
+msgid "There are active notifications in this environment!"
+msgstr ""
+
+#: ../views/shared/show_notification.html.erb:9
+msgid "Manage all notifications here."
+msgstr ""
+
+#: ../views/shared/show_notification.html.erb:28
+msgid "Do not show anymore"
+msgstr ""
+
+#: ../views/shared/show_notification.html.erb:29
+msgid "Hide for now"
+msgstr ""
@@ -0,0 +1,84 @@
+(function($) {
+  "use strict";
+
+  var admin_notifications_plugin = {
+
+
+    notificationBar: function() {
+      var completeMessage = $(".notification-plugin-notification-bar").remove();
+      $("#content-inner").before(completeMessage);
+    },
+
+    closeNotification: function(){
+      var notification = $(this).parent();
+      var id = notification.attr("data-notification");
+
+      $.ajax({
+        url: noosfero_root()+'/plugin/admin_notifications/public/close_notification',
+        type: "POST",
+        data: {notification_id: id},
+        success: function(response) {
+          notification.fadeOut();
+        }
+      });
+    },
+
+    hideNotification: function(){
+      var notification = $(this).parent();
+      var id = notification.attr("data-notification");
+
+      $.ajax({
+        url: noosfero_root()+'/plugin/admin_notifications/public/hide_notification',
+        type: "POST",
+        data: {notification_id: id},
+        success: function(response) {
+          notification.fadeOut();
+        }
+      });
+    },
+
+    hideUserNotification: function(){
+      var ids = $.cookie('hide_notifications');
+      if(ids === null) {
+        return null;
+      }
+
+      if(ids.startsWith('[') && ids.endsWith(']')){
+        ids = ids.substring(1, ids.length - 1);
+        ids = ids.split(",");
+
+        for(var i = 0; i < ids.length; i++) {
+          $('[data-notification="' + ids[i] + '"]').fadeOut();
+        }
+      }
+    },
+
+    showPopup: function() {
+      if($('.action-home-index').length > 0) {
+        jQuery(function($){
+          $.colorbox({href: noosfero_root()+'/plugin/admin_notifications/public/notifications_with_popup?previous_path=home'});
+        });
+      }
+      else {
+        jQuery(function($){
+          $.colorbox({href: noosfero_root()+'/plugin/admin_notifications/public/notifications_with_popup'});
+        });
+      }
+    },
+  };
+
+  $(document).ready(function(){
+    admin_notifications_plugin.notificationBar();
+    $(".notification-plugin-notification-bar .notification-close").on("click", admin_notifications_plugin.closeNotification);
+    $(".notification-plugin-notification-bar .notification-hide").on("click", admin_notifications_plugin.hideNotification);
+
+    if($('.notification-plugin-notification-bar').length > 0){
+      admin_notifications_plugin.hideUserNotification();
+    }
+
+    if($('.notification-plugin-notification-bar [notification-display-popup="true"]').length > 0){
+      admin_notifications_plugin.showPopup();
+    }
+  });
+
+})($);
@@ -0,0 +1,250 @@
+.notification-plugin-notification-bar{
+	display: block;
+}
+
+.notification-plugin-notification-bar .notification:hover,
+.notification-plugin-notification-modal .notification:hover{
+  opacity: 0.8;
+}
+
+#notification-plugin-notification-manager{
+  overflow: auto;
+}
+
+.notification-plugin-notification-bar .notification .notification-close,
+.notification-plugin-notification-modal .notification .notification-close{
+  background: url(images/close.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+}
+
+.notification-plugin-notification-bar .warningnotification,
+.notification-plugin-notification-bar .informationnotification,
+.notification-plugin-notification-bar .successnotification,
+.notification-plugin-notification-bar .dangernotification,
+.notification-plugin-notification-bar .adminnotification,
+.notification-plugin-notification-modal .warningnotification,
+.notification-plugin-notification-modal .informationnotification,
+.notification-plugin-notification-modal .successnotification,
+.notification-plugin-notification-modal .dangernotification{
+  margin-bottom: 10px;
+  padding: 7px 10px;
+  border-radius: 5px;
+  border: 1px solid blue;
+  font-size: 16px;
+  color: white;
+  overflow: auto;
+}
+
+.notification-plugin-notification-bar .warningnotification p,
+.notification-plugin-notification-bar .informationnotification p,
+.notification-plugin-notification-bar .successnotification p,
+.notification-plugin-notification-bar .dangernotification p,
+.notification-plugin-notification-bar .adminnotification p,
+.notification-plugin-notification-modal .warningnotification p,
+.notification-plugin-notification-modal .informationnotification p,
+.notification-plugin-notification-modal .successnotification p,
+.notification-plugin-notification-modal .dangernotification p{
+  margin: 0px;
+}
+
+.notification-plugin-notification-bar .warningnotification,
+.notification-plugin-notification-modal .warningnotification{
+  background: #fcf8e3;
+  border: 1px solid #faebcc;
+  color: #8a6d3b;
+}
+
+.notification-plugin-notification-bar .warningnotification p a,
+.notification-plugin-notification-modal .warningnotification p a{
+  font-weight: bold;
+  color: #8a6d3b;
+}
+
+
+.notification-plugin-notification-bar .informationnotification,
+.notification-plugin-notification-modal .informationnotification{
+  background: #d9edf7;
+  border: 1px solid #bce8f1;
+  color: #31708f;
+}
+
+.notification-plugin-notification-bar .informationnotification p a,
+.notification-plugin-notification-modal .informationnotification p a{
+  font-weight: bold;
+  color: #31708f;
+}
+
+.notification-plugin-notification-bar .successnotification,
+.notification-plugin-notification-modal .successnotification{
+  background: #dff0d8;
+  border: 1px solid #d6e9c6;
+  color: #3c763d;
+}
+
+.notification-plugin-notification-bar .successnotification p a
+.notification-plugin-notification-modal .successnotification p a{
+  font-weight: bold;
+  color: #3c763d;
+}
+
+.notification-plugin-notification-bar .dangernotification,
+.notification-plugin-notification-modal .dangernotification{
+  background: #f2dede;
+  border: 1px solid #ebccd1;
+  color: #a94442;
+}
+
+.notification-plugin-notification-bar .dangernotification  p a,
+.notification-plugin-notification-modal .dangernotification  p a{
+  font-weight: bold;
+  color: #a94442;
+}
+
+.notification-plugin-notification-bar .adminnotification,
+.notification-plugin-notification-modal .adminnotification{
+  background: #9a959a;
+  border: 1px solid #9a959a;
+}
+
+.notification-plugin-notification-bar .adminnotification p a,
+.notification-plugin-notification-modal .adminnotification p a{
+  font-weight: bold;
+  color: white;
+}
+
+#notification-plugin-notification-manager a.button.icon-deactivate{
+  background: url(images/hide.png) no-repeat;
+  background-position: center;
+}
+
+#notification-plugin-notification-manager a.button.icon-activate{
+  background: url(images/show.png) no-repeat;
+  background-position: center;
+}
+
+#notification-plugin-notification-manager .notification-line{
+  display: inline;
+  padding-top: 10px;
+  vertical-align: middle;
+  border-bottom: 1px solid #ccc;
+}
+
+#notification-plugin-notification-manager .notification-title-bar{
+  float: left;
+  width: 100%;
+  font-style: 14px;
+  font-weight: 700;
+  border-bottom: 2px solid black;
+  padding: 9px 0;
+}
+
+#notification-plugin-notification-manager .notification-title{
+  width: 80%;
+  float: left;
+  text-align: center;
+}
+
+.notification-plugin-notification-modal .notification-with-title{
+  margin-bottom: 0px;
+}
+
+.notification-plugin-notification-modal .notification .notification-title{
+  width: 100%;
+  float: left;
+  font-weight: bold;
+  text-align: left;
+}
+
+.notification-plugin-notification-modal .notification-with-title-message{
+  width: 100%;
+  float: left;
+  border-radius: 3px;
+  margin-bottom: 10px;
+  background-color: #f5f5f5;
+  font-size: 14px;
+  overflow: auto;
+}
+
+.notification-plugin-notification-modal .notification-with-title-message p{
+  padding: 0px 7px;
+}
+
+.notification-plugin-notification-modal .notification-with-title-message p a{
+  color: black;
+  font-weight: bold;
+}
+
+
+#notification-plugin-notification-manager .action-title{
+  width: 20%;
+  float: left;
+  text-align: center;
+}
+
+#notification-plugin-notification-manager .notification-action{
+  width: 18%;
+  float: left;
+  height: 30px;
+  padding-top: 9px;
+}
+
+#notification-plugin-notification-manager .main-bar .button,
+#notification-plugin-notification-manager .notification-action .button{
+  border-radius: 3px;
+}
+
+#notification-plugin-notification-manager .notification-message{
+  width: 82%;
+  float: left;
+}
+
+#notification-plugin-notification-manager .new-notification{
+  float: right;
+  width: auto;
+}
+
+#notification-plugin-notification-manager .back-button{
+  float: left;
+}
+
+#notification-plugin-notification-manager .main-bar{
+  display: inline;
+  width: 100%;
+}
+
+.notification-plugin-notification-bar .notification .notification-message,
+.notification-plugin-notification-modal .notification .notification-message{
+  width: 90%;
+  float: left;
+}
+
+.notification-plugin-notification-bar .notification .notification-close{
+  background: url(images/redclose.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+  float: right;
+  cursor: pointer;
+}
+
+.notification-plugin-notification-bar .notification .notification-hide{
+  background: url(images/greenhide.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+  float: right;
+  cursor: pointer;
+}
+
+.notification-plugin-notification-modal{
+  display: block;
+  min-width: 400px;
+  max-width: 700px;
+}
+
+.notification-plugin-form .notification-variables-options{
+  font-style: italic;
+  color: red;
+}
@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require 'account_controller'
+
+class AccountController
+  include AdminNotificationsPlugin::NotificationHelper
+end
+
+class AccountControllerTest < ActionController::TestCase
+  def setup
+    @controller = AccountController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('person').person
+
+    @environment = Environment.default
+    @environment.enable_plugin('AdminNotificationsPlugin')
+    @environment.save!
+
+    login_as(@person.user.login)
+  end
+
+  attr_accessor :person
+
+  should 'clean hide_notifications cookie after logout' do
+    @request.cookies[:hide_notifications] = JSON.generate([1,2])
+    get :index
+    assert !@request.cookies[:hide_notifications].blank?
+
+    @request.cookies[:hide_notifications] = nil
+    get :logout
+    assert_nil session[:user]
+    assert_response :redirect
+    assert_equal 1, @controller.hide_notifications.count
+    assert @controller.hide_notifications.include?(-1)
+  end
+end
@@ -0,0 +1,136 @@
+require 'test_helper'
+require_relative '../../controllers/admin_notifications_plugin_admin_controller'
+
+class AdminNotificationsPluginAdminControllerTest < ActionController::TestCase
+  def setup
+    @controller = AdminNotificationsPluginAdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('person').person
+
+    @environment = Environment.default
+    @environment.enable_plugin('AdminNotificationsPlugin')
+    @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 => "AdminNotificationsPlugin::DangerNotification"
+                }
+     assert_redirected_to :action => 'index'
+     notification = AdminNotificationsPlugin::Notification.last
+     assert_equal "Message", notification.message
+     assert notification.active
+     assert_equal "AdminNotificationsPlugin::DangerNotification", notification.type
+  end
+
+  should 'an user not to be able to create a notification' do
+     post :new, :notifications => {
+                  :message => "Message",
+                  :active => true,
+                  :type => "AdminNotificationsPlugin::DangerNotification"
+                }
+     assert_redirected_to :root
+     assert_nil AdminNotificationsPlugin::Notification.last
+  end
+
+   should 'an admin be able to edit a notification' do
+    @environment.add_admin(@person)
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+     post :edit, :id => @notification.id, :notifications => {
+                                            :message => "Edited Message",
+                                            :active => false,
+                                            :type => "AdminNotificationsPlugin::WarningNotification"
+                                          }
+     @notification = AdminNotificationsPlugin::Notification.last
+     assert_redirected_to :action => 'index'
+     assert_equal "Edited Message", @notification.message
+     assert !@notification.active
+     assert_equal "AdminNotificationsPlugin::WarningNotification", @notification.type
+  end
+
+  should 'an user not to be able to edit a notification' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+     post :edit, :notifications => {
+                   :message => "Edited Message",
+                   :active => false,
+                   :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+    delete :destroy, :id => @notification.id
+    assert_nil AdminNotificationsPlugin::Notification.find_by id: @notification.id
+  end
+
+  should 'an user not to be able to destroy a notification' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+     delete :destroy, :id => @notification.id
+
+     assert_redirected_to :root
+     assert_not_nil AdminNotificationsPlugin::Notification.find_by id: @notification.id
+  end
+
+  should 'an admin be able to change Notification status' do
+    @environment.add_admin(@person)
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+     post :change_status, :id => @notification.id
+     assert_redirected_to :root
+
+     @notification.reload
+     assert @notification.active
+  end
+
+end
@@ -0,0 +1,147 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require(
+  File.expand_path(File.dirname(__FILE__)) +
+  '/../../controllers/admin_notifications_plugin_myprofile_controller'
+)
+
+class AdminNotificationsPluginMyprofileControllerTest < ActionController::TestCase
+  def setup
+    @controller = AdminNotificationsPluginMyprofileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('person').person
+    @community = fast_create(Community)
+
+    environment = Environment.default
+    environment.enable_plugin('AdminNotificationsPlugin')
+    environment.save!
+
+    login_as(@person.user.login)
+    AdminNotificationsPluginMyprofileController.any_instance.stubs(:profile).returns(@community)
+  end
+
+  attr_accessor :person
+
+  should 'profile admin be able to create a notification' do
+    @community.add_admin(@person)
+    post :new, :profile => @community.identifier,
+                :notifications => {
+                  :message => "Message",
+                  :active => true,
+                  :type => "AdminNotificationsPlugin::DangerNotification"
+                }
+    assert_redirected_to :action => 'index'
+    notification = AdminNotificationsPlugin::Notification.last
+    assert_equal "Message", notification.message
+    assert notification.active
+    assert_equal "AdminNotificationsPlugin::DangerNotification", notification.type
+  end
+
+  should 'a regular user not to be able to create a notification' do
+    post :new, :profile => @community.identifier,
+    :notifications => {
+      :message => "Message",
+      :active => true,
+      :type => "AdminNotificationsPlugin::DangerNotification"
+    }
+
+  assert_redirected_to :root
+  assert_nil AdminNotificationsPlugin::Notification.last
+  end
+
+  should 'profile admin be able to edit a notification' do
+    @community.add_admin(@person)
+    @notification = AdminNotificationsPlugin::Notification.create(
+      :target => @community,
+      :message => "Message",
+      :active => true,
+      :type => "AdminNotificationsPlugin::DangerNotification"
+    )
+
+    post :edit, :profile => @community.identifier, :id => @notification.id,
+    :notifications => {
+      :message => "Edited Message",
+      :active => false,
+      :type => "AdminNotificationsPlugin::WarningNotification"
+    }
+    @notification = AdminNotificationsPlugin::Notification.last
+    assert_redirected_to :action => 'index'
+    assert_equal "Edited Message", @notification.message
+    assert !@notification.active
+    assert_equal "AdminNotificationsPlugin::WarningNotification", @notification.type
+  end
+
+  should 'a regular user not be able to edit a notification' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+      :target => @community,
+      :message => "Message",
+      :active => true,
+      :type => "AdminNotificationsPlugin::DangerNotification"
+    )
+    post :edit, :profile => @community.identifier,
+    :notifications => {
+      :message => "Edited Message",
+      :active => false,
+      :type => "AdminNotificationsPlugin::DangerNotification"
+    }
+    @notification.reload
+    assert_redirected_to :root
+    assert_equal "Message", @notification.message
+    assert @notification.active
+  end
+
+  should 'a profile admin be able to destroy a notification' do
+    @community.add_admin(@person)
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @community,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+    delete :destroy, :profile => @community.identifier, :id => @notification.id
+    assert_nil AdminNotificationsPlugin::Notification.find_by_id(@notification.id)
+  end
+
+  should 'a regular user not be able to destroy a notification' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @community,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+    delete :destroy, :profile => @community.identifier, :id => @notification.id
+
+    assert_redirected_to :root
+    assert_not_nil AdminNotificationsPlugin::Notification.find_by_id(@notification.id)
+  end
+
+  should 'a profile admin be able to change Notification status' do
+    @community.add_admin(@person)
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @community,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+    post :change_status, :profile => @community.identifier, :id => @notification.id
+    assert_redirected_to :action => 'index'
+
+    @notification.reload
+    assert !@notification.active
+  end
+
+  should 'a regular user not be able to change Notification status' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @community,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+    post :change_status, :profile => @community.identifier, :id => @notification.id
+    assert_redirected_to :root
+
+    @notification.reload
+    assert @notification.active
+  end
+
+end
@@ -0,0 +1,65 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require(
+  File.expand_path(File.dirname(__FILE__)) +
+  '/../../controllers/public/admin_notifications_plugin_public_controller'
+)
+
+class AdminNotificationsPluginPublicControllerTest < ActionController::TestCase
+  def setup
+    @controller = AdminNotificationsPluginPublicController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @person = create_user('person').person
+
+    @environment = Environment.default
+    @environment.enable_plugin('AdminNotificationsPlugin')
+    @environment.save!
+
+    login_as(@person.user.login)
+  end
+
+  should 'a logged in user be able to permanently hide notifications' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+     post :close_notification, :notification_id => @notification.id
+     assert_equal "true", @response.body
+     assert @notification.users.include?(@person.user)
+  end
+
+  should 'a logged in user be able to momentarily hide notifications' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+
+    @another_notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Another Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::WarningNotification"
+                    )
+     post :hide_notification, :notification_id => @notification.id
+     assert_equal "true", @response.body
+     assert @controller.hide_notifications.include?(@notification.id)
+     assert !@controller.hide_notifications.include?(@another_notification.id)
+  end
+
+  should 'not momentarily hide any notification if its id is not found' do
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+
+     post :hide_notification, :notification_id => nil
+     assert_equal "false", @response.body
+     assert !@controller.hide_notifications.include?(@notification.id)
+  end
+end
@@ -0,0 +1,120 @@
+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('AdminNotificationsPlugin')
+    @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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is a Notification Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is a Notification Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is a Notification Message",
+                      :display_to_all_users => true,
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is an old Notification Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+
+    @notification2 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is a new Notification Message",
+                      :display_to_all_users => true,
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is a Notification Message",
+                      :active => false,
+                      :type => "AdminNotificationsPlugin::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 = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Hello, this is a Notification Message",
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::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
+
+  should 'a notification be displayed with a Popup' do
+    login_as(@person.user.login)
+    @notification = AdminNotificationsPlugin::Notification.create(
+                      :target => @environment,
+                      :message => "Message",
+                      :display_popup => true,
+                      :active => true,
+                      :type => "AdminNotificationsPlugin::DangerNotification"
+                    )
+     assert_equal true, @notification.display_popup?
+
+     get :index
+     assert_no_match /div id="cboxWrapper"/, @response.body
+  end
+end
@@ -0,0 +1,10 @@
+module NotificationTestHelper
+  def create_notification target, display_only_in_homepage=false, message="any_message", active=true
+    AdminNotificationsPlugin::WarningNotification.create!(
+      :target => target,
+      :message => message,
+      :active => active,
+      :display_only_in_homepage => display_only_in_homepage
+    )
+  end
+end
@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class NotificationHelperTest < ActiveSupport::TestCase
+  def setup
+    @env = Environment.default
+    @env.enable_plugin('AdminNotificationsPlugin')
+
+    @user = User.create!(:environment_id => @env.id, :email => "user@domain.com", :login   => "new_user", :password => "test", :password_confirmation => "test", :name => "UserName")
+  end
+
+  should 'substitute all email variables to the current user email' do
+    message = "Hello user with email %{email}! please, update your current email (%{email})."
+
+    new_message = AdminNotificationsPlugin::NotificationHelper.substitute_variables(message, @user)
+
+    assert message != new_message
+    assert_equal new_message, "Hello user with email user@domain.com! please, update your current email (user@domain.com)."
+  end
+
+  should 'not substitute emails variables if there is no current user' do
+    message = "Hello user with email %{email}! please, update your current email (%{email})."
+
+    new_message = AdminNotificationsPlugin::NotificationHelper.substitute_variables(message, nil)
+
+    assert_equal message, new_message
+    assert_not_includes new_message, "user@domain.com"
+  end
+
+   should 'substitute all name variables to the current user name' do
+    message = "Hello %{name}! is %{name} your real name?."
+
+    new_message = AdminNotificationsPlugin::NotificationHelper.substitute_variables(message, @user)
+
+    assert message != new_message
+    assert_equal new_message, "Hello UserName! is UserName your real name?."
+  end
+
+  should 'not substitute name variables if there is no current user' do
+    message = "Hello %{name}! is %{name} your real name?."
+
+    new_message = AdminNotificationsPlugin::NotificationHelper.substitute_variables(message, nil)
+
+    assert_equal message, new_message
+    assert_not_includes new_message, "UserName"
+  end
+end
@@ -0,0 +1,193 @@
+require_relative '../../../../test/test_helper'
+require_relative '../helpers/notification_test_helper'
+
+class NotificationTest < ActiveSupport::TestCase
+
+  include NotificationTestHelper
+
+  def setup
+    @env = Environment.default
+    @env.enable_plugin('AdminNotificationsPlugin')
+
+    @user = User.create!(:environment_id => @env.id, :email => "user@domain.com", :login   => "new_user", :password => "test", :password_confirmation => "test")
+    @danger_notification = AdminNotificationsPlugin::DangerNotification.create!(
+                      :target => @env,
+                      :message => "Danger Message",
+                      :active => true,
+                    )
+
+    @warning_notification = AdminNotificationsPlugin::WarningNotification.create!(
+                      :target => @env,
+                      :message => "Warning Message",
+                      :active => true,
+                    )
+
+    @information_notification = AdminNotificationsPlugin::InformationNotification.create!(
+                      :target => @env,
+                      :message => "Information Message",
+                      :active => true,
+                    )
+  end
+
+  should 'get all notifications that a user did not close' do
+    @information_notification.users << @user
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, @user, nil)
+
+    assert notifications.include?(@danger_notification)
+    assert notifications.include?(@warning_notification)
+    assert !notifications.include?(@information_notification)
+  end
+
+  should 'get only notifications configured to be displayed to all users' do
+    @information_notification.display_to_all_users = true
+    @information_notification.save!
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, nil, nil)
+
+    assert !notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+  end
+
+  should 'get only notifications configured to be displayed to all users and in all pages' do
+    @information_notification.display_to_all_users = true
+    @information_notification.display_only_in_homepage = true
+    @information_notification.save!
+
+    @danger_notification.display_to_all_users = true
+    @danger_notification.save!
+
+    @warning_notification.display_only_in_homepage = true
+    @warning_notification.save!
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, nil, 'not_home')
+
+    assert notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert !notifications.include?(@information_notification)
+  end
+
+  should 'get only notifications configured to be displayed in all pages' do
+    @danger_notification.display_to_all_users = true
+    @danger_notification.display_only_in_homepage = true
+    @danger_notification.save!
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, @user, "not_home")
+
+    assert !notifications.include?(@danger_notification)
+    assert notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, nil, "home")
+
+    assert notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert !notifications.include?(@information_notification)
+  end
+
+  should 'get notifications configured to be displayed on profile' do
+    community = fast_create(Community)
+
+    AdminNotificationsPlugin::Notification.destroy_all
+    env_home_notification = create_notification(@env, true)
+    env_not_home_notification = create_notification(@env, false)
+    profile_not_home_notification = create_notification(community, false)
+    profile_home_notification = create_notification(community, true)
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(community, @user, "profile")
+    assert_equivalent notifications.to_a, [env_not_home_notification, profile_not_home_notification, profile_home_notification]
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(community, @user, "profile_but_bot_homepage")
+    assert_equivalent notifications.to_a, [env_not_home_notification, profile_not_home_notification]
+  end
+
+  should 'get notifications configured to be displayed on environment' do
+    community = fast_create(Community)
+
+    AdminNotificationsPlugin::Notification.destroy_all
+    env_home_notification = create_notification(@env, true)
+    env_not_home_notification = create_notification(@env, false)
+    profile_not_home_notification = create_notification(community, false)
+    profile_home_notification = create_notification(community, true)
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, @user, "home")
+    assert_equivalent notifications.to_a, [env_home_notification, env_not_home_notification]
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, @user, "not_home_not_profile")
+    assert_equivalent notifications.to_a, [env_not_home_notification]
+  end
+
+  should 'get only notifications configured to be displayed to all users and in all pages and not closed by an user' do
+    @information_notification.display_to_all_users = true
+    @information_notification.save!
+
+    @danger_notification.display_to_all_users = true
+    @danger_notification.display_only_in_homepage = true
+    @danger_notification.save!
+
+    @warning_notification.display_to_all_users = true
+    @warning_notification.save!
+
+    @warning_notification.users << @user
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, @user, 'not_home')
+
+    assert !notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+  end
+
+  should 'get only active notifications' do
+    @information_notification.active = false
+    @information_notification.save!
+
+    notifications = AdminNotificationsPlugin::Notification.visibles(@env, @user, 'home')
+
+    assert notifications.include?(@danger_notification)
+    assert notifications.include?(@warning_notification)
+    assert !notifications.include?(@information_notification)
+  end
+
+  should 'get only notifications with popup' do
+    @information_notification.display_popup = true
+    @information_notification.display_to_all_users = true
+    @information_notification.save!
+
+    notifications = AdminNotificationsPlugin::Notification.with_popup(@env, @user, 'home')
+
+    assert !notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+
+    notifications = AdminNotificationsPlugin::Notification.with_popup(@env, nil, nil)
+
+    assert !notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+  end
+
+  should 'get only notifications with popup not closed by an user' do
+    @information_notification.display_popup = true
+    @information_notification.display_to_all_users = true
+    @information_notification.save!
+
+    @danger_notification.display_popup = true
+    @danger_notification.display_to_all_users = true
+    @danger_notification.save!
+
+    @danger_notification.users << @user
+
+    notifications = AdminNotificationsPlugin::Notification.with_popup(@env, @user, 'home')
+
+    assert !notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+
+    notifications = AdminNotificationsPlugin::Notification.with_popup(@env, nil, nil)
+
+    assert notifications.include?(@danger_notification)
+    assert !notifications.include?(@warning_notification)
+    assert notifications.include?(@information_notification)
+  end
+end
@@ -0,0 +1 @@
+<%= render :partial => "shared/form" %>
@@ -0,0 +1 @@
+<%= render :partial => "shared/notifications_list" %>
@@ -0,0 +1 @@
+<%= render :partial => "shared/form" %>
@@ -0,0 +1 @@
+<%= render :partial => "shared/form" %>
@@ -0,0 +1 @@
+<%= render :partial => "shared/notifications_list" %>
@@ -0,0 +1 @@
+<%= render :partial => "shared/form" %>
@@ -0,0 +1,22 @@
+<% @notifications = AdminNotificationsPlugin::Notification.with_popup(environment, current_user, @previous_path).where("id NOT IN (?)", @hide_notifications) %>
+
+<div class="notification-plugin-notification-modal">
+  <% @notifications.each do |notification| %>
+    <% if !notification.title.blank? %>
+      <div class="<%= notification.type.gsub("AdminNotificationsPlugin::", "").downcase %> notification notification-with-title" data-notification="<%=notification.id%>">
+        <div class="notification-title">
+          <%= notification.title %>
+        </div>
+      </div>
+      <div class="notification-message notification-with-title-message">
+        <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user) %>
+      </div>
+    <% else %>
+      <div class="<%= notification.type.gsub("AdminNotificationsPlugin::", "").downcase %> notification notification-without-title" data-notification="<%=notification.id%>">
+        <div class="notification-message">
+          <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user) %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+</div>
@@ -0,0 +1,39 @@
+<div class="notification-plugin-form">
+
+  <% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;', :class => 'mceEditor'} %>
+
+  <%= button :back, _('Back'), :controller => 'admin_notifications_plugin_admin' %>
+
+  <%= form_for :notifications do |f| %>
+
+    <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'restricted'} %>
+
+    <%= labelled_form_field(_("Optional Title:"), f.text_field(:title, value: @notification.title)) %>
+
+    <%= labelled_form_field(_("Enter your message here:"), f.text_area(:message, abstract_options)) %>
+    <small class="notification-variables-options">
+      <%= _("Obs: You can use %{name} and %{email} variables to put the user's name and email in the message.") %>
+    </small>
+
+    <%= labelled_form_field(_('Notifications Status'), select(:notifications, :active, options_for_select_with_title({_("Active") => true, _("Inactive") => false}, @notification.active))) %>
+
+    <%= labelled_form_field(_('Notifications Color/Type'), select(:notifications, :type, options_for_select_with_title({_("Blue - Information") => "AdminNotificationsPlugin::InformationNotification", _("Yellow - Warning") => "AdminNotificationsPlugin::WarningNotification", _("Green - Success") => "AdminNotificationsPlugin::SuccessNotification", _("Red - Danger") => "AdminNotificationsPlugin::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>
+
+    <div>
+      <%= labelled_check_box(_("Display popup until user close the notification"), 'notifications[display_popup]', '1', @notification.display_popup?) %>
+    </div>
+
+    <% button_bar do %>
+      <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
+    <% end %>
+
+  <% end %>
+</div>
@@ -0,0 +1,39 @@
+<div id="notification-plugin-notification-manager">
+  <div class="notification-manager-title">
+    <h1><%= _("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,33 @@
+<% if current_user && current_user.person.is_admin? %>
+  <% active_notifications = AdminNotificationsPlugin::Notification.active(environment) %>
+  <% unless active_notifications.blank? %>
+    <div class="notification-plugin-notification-bar">
+      <div class="adminnotification notification">
+        <div class="notification-message">
+          <p>
+            <%= _("There are active notifications in this environment!") %>
+            <%= link_to _("Manage all notifications here."), AdminNotificationsPlugin.admin_url %>
+          </p>
+        </div>
+      </div>
+    </div>
+  <% end %>
+<% end %>
+
+<% target = profile.present? ? profile : environment %>
+
+<% @notifications = AdminNotificationsPlugin::Notification.visibles(target, current_user, controller_path).where("id NOT IN (?)", hide_notifications) %>
+
+<div class="notification-plugin-notification-bar">
+  <% @notifications.each do |notification| %>
+    <div class="<%= notification.type.gsub("AdminNotificationsPlugin::", "").downcase %> notification" data-notification="<%=notification.id%>" notification-display-popup="<%=notification.display_popup?%>">
+      <div class="notification-message">
+        <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user) %>
+      </div>
+      <% if logged_in? %>
+        <div class="notification-close" title="<%= _('Do not show anymore') %>"></div>
+        <div class="notification-hide" title="<%= _('Hide for now') %>"></div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
@@ -0,0 +1,7 @@
+**This plugin is deprecated. Please use "admin_notifications" plugin instead.**
+
+If you already were using this plugin, migrating* it will switch automatically to the new plugin.
+If you want to start using this plugin from scratch, activate and use the new one instead.
+
+*NOTE: running Noosfero in production mode already runs
+  the migrations and therefore switch plugins automatically.
@@ -1,103 +0,0 @@
-class EnvironmentNotificationPluginAdminController < AdminController
-
-  helper EnvironmentNotificationHelper
-  include EnvironmentNotificationHelper
-
-  before_filter :admin_required, :except => [:close_notification, :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 close_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
-
-  def hide_notification
-    result = false
-
-    if logged_in?
-      @notification = environment.environment_notifications.find_by id: params[:notification_id]
-
-      if @notification
-        current_notificaions = []
-        current_notificaions = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
-        current_notificaions << @notification.id unless current_notificaions.include? @notification.id
-        cookies[:hide_notifications] = JSON.generate(current_notificaions)
-        result = current_notificaions.include? @notification.id
-      end
-    end
-
-    render json: result
-  end
-
-  protected
-  def admin_required
-    redirect_to :root unless current_user.person.is_admin?
-  end
-
-end
@@ -1,15 +0,0 @@
-class EnvironmentNotificationPluginPublicController < PublicController
-
-  helper EnvironmentNotificationHelper
-  include EnvironmentNotificationHelper
-
-  def notifications_with_popup
-    @hide_notifications = hide_notifications
-    if params[:previous_path]
-      @previous_path = params[:previous_path]
-    else
-      @previous_path = nil
-    end
-  end
-
-end
@@ -1,28 +0,0 @@
-class CreateNotificationTable < ActiveRecord::Migration
-  def up
-    create_table :environment_notifications do |t|
-      t.text :message
-      t.integer :environment_id
-      t.string :type
-      t.string :title
-      t.boolean :active
-      t.boolean :display_only_in_homepage, :default => false
-      t.boolean :display_to_all_users,     :default => false
-      t.boolean :display_popup,            :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
-      t.belongs_to :user
-    end
-    add_index :environment_notifications_users, [:environment_notification_id], name: :index_Zaem6uuw
-    add_index :environment_notifications_users, [:user_id], name: :index_ap3nohR9
-  end
-
-  def down
-    drop_table :environment_notifications
-    drop_table :environment_notifications_users
-  end
-end
@@ -0,0 +1,14 @@
+class ReactivatePluginAfterRename < ActiveRecord::Migration
+  def up
+    script_path = Rails.root.join('script').to_s
+    system(script_path + '/noosfero-plugins disable environment_notification')
+    system(script_path + '/noosfero-plugins enable admin_notifications')
+
+    system("rake db:migrate")
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+
+end
@@ -1,14 +0,0 @@
-Feature: Create envronment notification message
-  As an admin user
-  I want to create an environment notification
-  In order to notificate users
-
-  @selenium
-  Scenario: mce restricted mode should show on message creation
-    Given I am logged in as admin
-    And I follow "Administration"
-    And I follow "Plugins"
-    And I follow "Configuration"
-    And I follow "New Notification"
-    Then The tinymce "toolbar1" should be "bold italic underline | link"
-    Then The tinymce "menubar" should be "false"
@@ -1,18 +0,0 @@
-module EnvironmentNotificationHelper
-
-  def hide_notifications
-    invalid_id = -1
-    hide_notifications_ids = [invalid_id]
-    hide_notifications_ids = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
-    hide_notifications_ids
-  end
-
-  def self.substitute_variables(message, user)
-    if user
-      message = message.gsub("%{email}", user.person.email).gsub("%{name}", user.person.name)
-    end
-
-    message
-  end
-
-end
 class EnvironmentNotificationPlugin < Noosfero::Plugin
-
   def self.plugin_name
-    "Environment Notifications Plugin"
+    "Environment Notifications Plugin *DEPRECATED*"
   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
-    lambda do
-      extend EnvironmentNotificationHelper
-      render template: 'environment_notification_plugin_admin/show_notification'
-    end
-  end
-
-  def admin_panel_links
-    {:title => _('Notification Manager'), :url => {:controller => 'environment_notification_plugin_admin', :action => 'index'}}
-  end
-
-  def account_controller_filters
-    block = proc do
-      if !logged_in?
-        cookies[:hide_notifications] = nil
-      end
-    end
-
-    [{
-      :type => "after_filter",
-      :method_name => "clean_hide_notifications_cookie",
-      :options => { },
-      :block => block
-    }]
+    _("A plugin for environment notifications. *DEPRECATED*")
   end
 end
@@ -1,10 +0,0 @@
-class EnvironmentNotificationsUser < ApplicationRecord
-  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
@@ -1,5 +0,0 @@
-require_dependency 'environment'
-
-class Environment
-  has_many :environment_notifications, class_name: 'EnvironmentNotificationPlugin::EnvironmentNotification'
-end
@@ -1,6 +0,0 @@
-require_dependency 'user'
-
-class User
-  has_many :environment_notifications_users
-  has_many :environment_notifications, :through => :environment_notifications_users
-end
@@ -1,2 +0,0 @@
-class EnvironmentNotificationPlugin::DangerNotification < EnvironmentNotificationPlugin::EnvironmentNotification
-end
@@ -1,50 +0,0 @@
-class EnvironmentNotificationPlugin::EnvironmentNotification < ApplicationRecord
-
-  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, :display_popup, :title
-
-  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
-
-  scope :active, -> environment { where environment_id: environment.id, active: true }
-
-  def self.visibles(environment, user, controller_path)
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.active(environment).order('updated_at DESC')
-
-    if user
-      active_notifications_ids = notifications.pluck(:id) - user.environment_notifications.pluck(:id)
-
-      notifications = notifications.where(id: active_notifications_ids)
-    else
-      notifications = notifications.where(display_to_all_users: true)
-    end
-
-    if controller_path != "home"
-      notifications = notifications.where(display_only_in_homepage: false)
-    end
-
-    notifications
-  end
-
-  def self.with_popup(environment, user, previous_path)
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(environment, user, previous_path).where(display_popup: true)
-  end
-end
@@ -1,2 +0,0 @@
-class EnvironmentNotificationPlugin::InformationNotification < EnvironmentNotificationPlugin::EnvironmentNotification
-end
@@ -1,2 +0,0 @@
-class EnvironmentNotificationPlugin::SuccessNotification < EnvironmentNotificationPlugin::EnvironmentNotification
-end
@@ -1,2 +0,0 @@
-class EnvironmentNotificationPlugin::WarningNotification < EnvironmentNotificationPlugin::EnvironmentNotification
-end
@@ -1,177 +0,0 @@
-# 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.3~rc2-1-ga15645d\n"
-"POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-09-14 12:12-0000\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/environment_notification/lib/environment_notification_plugin.rb:8
-msgid "A plugin for environment notifications."
-msgstr ""
-
-#: plugins/environment_notification/lib/environment_notification_plugin.rb:29
-msgid "Notification Manager"
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:19
-msgid "Notification successfully created"
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:22
-msgid "Notification couldn't be created"
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:31
-msgid "The notification was deleted."
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:33
-msgid "Could not remove the notification"
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:43
-msgid "The notification was edited."
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:45
-msgid "Could not edit the notification."
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:57
-msgid "The status of the notification was changed."
-msgstr ""
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:59
-msgid "Could not change the status of the notification."
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:8
-msgid "There are active notifications in this environment!"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:9
-msgid "Manage all notifications here."
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:26
-msgid "Do not show anymore"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:27
-msgid "Hide for now"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:4
-msgid "Back"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:10
-msgid "Optional Title:"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:12
-msgid "Enter your message here:"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:14
-msgid ""
-"Obs: You can use %{name} and %{email} variables to put the user's name and "
-"email in the message."
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:17
-msgid "Notifications Status"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Notifications Color/Type"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Blue - Information"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Yellow - Warning"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Green - Success"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Red - Danger"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:22
-msgid "Display only in the homepage"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:26
-msgid "Display to not logged users too"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:30
-msgid "Display popup until user close the notification"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:34
-msgid "Save"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:3
-msgid "Environment Notifications"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:7
-msgid "New Notification"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:10
-msgid "Back to control panel"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:16
-msgid "Notifications"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:19
-msgid "Actions"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:30
-msgid "Deactivate"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:30
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:32
-msgid "Do you want to change the status of this notification?"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:32
-msgid "Activate"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:34
-msgid "Edit"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:35
-msgid "Delete"
-msgstr ""
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:35
-msgid "Do you want to delete this notification?"
-msgstr ""
@@ -1,178 +0,0 @@
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 1.3~rc2-1-ga15645d\n"
-"POT-Creation-Date: 2015-10-30 16:35-0300\n"
-"PO-Revision-Date: 2015-09-14 12:12-0000\n"
-"Last-Translator: FULL NAME <arthurmde@gmail.com>\n"
-"Language-Team: Portuguese\n"
-"Language: Portuguese\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/environment_notification/lib/environment_notification_plugin.rb:8
-msgid "A plugin for environment notifications."
-msgstr "Plugin para notificações do ambiente"
-
-#: plugins/environment_notification/lib/environment_notification_plugin.rb:29
-msgid "Notification Manager"
-msgstr "Gerenciador de Notificações"
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:19
-msgid "Notification successfully created"
-msgstr "Notificação criada com sucesso"
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:22
-msgid "Notification couldn't be created"
-msgstr "Não foi possível criar notificação"
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:31
-msgid "The notification was deleted."
-msgstr "A notificação foi removida"
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:33
-msgid "Could not remove the notification"
-msgstr "Não foi possível remover a notificação"
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:43
-msgid "The notification was edited."
-msgstr "A notificação foi editada."
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:45
-msgid "Could not edit the notification."
-msgstr "Não foi possível editar a notificação."
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:57
-msgid "The status of the notification was changed."
-msgstr "O status da notificação foi modificado"
-
-#: plugins/environment_notification/controllers/environment_notification_plugin_admin_controller.rb:59
-msgid "Could not change the status of the notification."
-msgstr "Não foi possível alterar o status da notificação"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:8
-msgid "There are active notifications in this environment!"
-msgstr "Existem notificações ativas neste ambiente!"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:9
-msgid "Manage all notifications here."
-msgstr "Gerencie todas as notificações aqui."
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:26
-msgid "Do not show anymore"
-msgstr "Não mostrar mais"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/show_notification.html.erb:27
-msgid "Hide for now"
-msgstr "Ocultar momentaneamente"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:4
-msgid "Back"
-msgstr "Voltar"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:10
-msgid "Optional Title:"
-msgstr "Título Opcional:"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:12
-msgid "Enter your message here:"
-msgstr "Entre com a sua mensagem aqui:"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:14
-msgid ""
-"Obs: You can use %{name} and %{email} variables to put the user's name and "
-"email in the message."
-msgstr ""
-"Obs: Você pode usar as variáveis %{name} e %{email} para inserir o nome e "
-"email do usuário logado na mensagem."
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:17
-msgid "Notifications Status"
-msgstr "Status da Notificação"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Notifications Color/Type"
-msgstr "Cor/Tipo de Notificação"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Blue - Information"
-msgstr "Azul - Informação"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Yellow - Warning"
-msgstr "Amarelo - Atenção"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Green - Success"
-msgstr "Verde - Sucesso"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:19
-msgid "Red - Danger"
-msgstr "Vermelho - Perigo"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:22
-msgid "Display only in the homepage"
-msgstr "Apresentar apenas na página inicial"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:26
-msgid "Display to not logged users too"
-msgstr "Apresentar notificação para usuários não logados também"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:30
-msgid "Display popup until user close the notification"
-msgstr "Apresentar Popup da notificação até que o usuário a feche"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/_form.html.erb:34
-msgid "Save"
-msgstr "Salvar"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:3
-msgid "Environment Notifications"
-msgstr "Notificações do Ambiente"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:7
-msgid "New Notification"
-msgstr "Nova Notificação"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:10
-msgid "Back to control panel"
-msgstr "Voltar ao Painel de Controle"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:16
-msgid "Notifications"
-msgstr "Notificações"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:19
-msgid "Actions"
-msgstr "Ações"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:30
-msgid "Deactivate"
-msgstr "Desativar"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:30
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:32
-msgid "Do you want to change the status of this notification?"
-msgstr "Você quer alterar o status dessa notificação?"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:32
-msgid "Activate"
-msgstr "Ativar"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:34
-msgid "Edit"
-msgstr "Editar"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:35
-msgid "Delete"
-msgstr "Remover"
-
-#: plugins/environment_notification/views/environment_notification_plugin_admin/index.html.erb:35
-msgid "Do you want to delete this notification?"
-msgstr "Você quer remover essa notificação?"
@@ -1,84 +0,0 @@
-(function($) {
-  "use strict";
-
-  var environment_notification_plugin = {
-
-
-    notificationBar: function() {
-      var completeMessage = $(".environment-notification-plugin-notification-bar").remove();
-      $("#content-inner").before(completeMessage);
-    },
-
-    closeNotification: function(){
-      var notification = $(this).parent();
-      var id = notification.attr("data-notification");
-
-      $.ajax({
-        url: noosfero_root()+"/admin/plugin/environment_notification/close_notification",
-        type: "POST",
-        data: {notification_id: id},
-        success: function(response) {
-          notification.fadeOut();
-        }
-      });
-    },
-
-    hideNotification: function(){
-      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();
-        }
-      });
-    },
-
-    hideUserNotification: function(){
-      var ids = $.cookie('hide_notifications');
-      if(ids === null) {
-        return null;
-      }
-
-      if(ids.startsWith('[') && ids.endsWith(']')){
-        ids = ids.substring(1, ids.length - 1);
-        ids = ids.split(",");
-
-        for(var i = 0; i < ids.length; i++) {
-          $('[data-notification="' + ids[i] + '"]').fadeOut();
-        }
-      }
-    },
-
-    showPopup: function() {
-      if($('.action-home-index').length > 0) {
-        jQuery(function($){
-          $.colorbox({href: noosfero_root()+'/plugin/environment_notification/public/notifications_with_popup?previous_path=home'});
-        });
-      }
-      else {
-        jQuery(function($){
-          $.colorbox({href: noosfero_root()+'/plugin/environment_notification/public/notifications_with_popup'});
-        });
-      }
-    },
-  };
-
-  $(document).ready(function(){
-    environment_notification_plugin.notificationBar();
-    $(".environment-notification-plugin-notification-bar .notification-close").on("click", environment_notification_plugin.closeNotification);
-    $(".environment-notification-plugin-notification-bar .notification-hide").on("click", environment_notification_plugin.hideNotification);
-
-    if($('.environment-notification-plugin-notification-bar').length > 0){
-      environment_notification_plugin.hideUserNotification();
-    }
-
-    if($('.environment-notification-plugin-notification-bar [notification-display-popup="true"]').length > 0){
-      environment_notification_plugin.showPopup();
-    }
-  });
-
-})($);
@@ -1,250 +0,0 @@
-.environment-notification-plugin-notification-bar{
-	display: block;
-}
-
-.environment-notification-plugin-notification-bar .notification:hover,
-.environment-notification-plugin-notification-notification-modal .notification:hover{
-  opacity: 0.8;
-}
-
-#environment-notification-plugin-notification-manager{
-  overflow: auto;
-}
-
-.environment-notification-plugin-notification-bar .notification .notification-close,
-.environment-notification-plugin-notification-notification-modal .notification .notification-close{
-  background: url(images/close.png) no-repeat;
-  background-position: center;
-  width: 20px;
-  height: 20px;
-}
-
-.environment-notification-plugin-notification-bar .warningnotification,
-.environment-notification-plugin-notification-bar .informationnotification,
-.environment-notification-plugin-notification-bar .successnotification,
-.environment-notification-plugin-notification-bar .dangernotification,
-.environment-notification-plugin-notification-bar .adminnotification,
-.environment-notification-plugin-notification-notification-modal .warningnotification,
-.environment-notification-plugin-notification-notification-modal .informationnotification,
-.environment-notification-plugin-notification-notification-modal .successnotification,
-.environment-notification-plugin-notification-notification-modal .dangernotification{
-  margin-bottom: 10px;
-  padding: 7px 10px;
-  border-radius: 5px;
-  border: 1px solid blue;
-  font-size: 16px;
-  color: white;
-  overflow: auto;
-}
-
-.environment-notification-plugin-notification-bar .warningnotification p,
-.environment-notification-plugin-notification-bar .informationnotification p,
-.environment-notification-plugin-notification-bar .successnotification p,
-.environment-notification-plugin-notification-bar .dangernotification p,
-.environment-notification-plugin-notification-bar .adminnotification p,
-.environment-notification-plugin-notification-notification-modal .warningnotification p,
-.environment-notification-plugin-notification-notification-modal .informationnotification p,
-.environment-notification-plugin-notification-notification-modal .successnotification p,
-.environment-notification-plugin-notification-notification-modal .dangernotification p{
-  margin: 0px;
-}
-
-.environment-notification-plugin-notification-bar .warningnotification,
-.environment-notification-plugin-notification-notification-modal .warningnotification{
-  background: #fcf8e3;
-  border: 1px solid #faebcc;
-  color: #8a6d3b;
-}
-
-.environment-notification-plugin-notification-bar .warningnotification p a,
-.environment-notification-plugin-notification-notification-modal .warningnotification p a{
-  font-weight: bold;
-  color: #8a6d3b;
-}
-
-
-.environment-notification-plugin-notification-bar .informationnotification,
-.environment-notification-plugin-notification-notification-modal .informationnotification{
-  background: #d9edf7;
-  border: 1px solid #bce8f1;
-  color: #31708f;
-}
-
-.environment-notification-plugin-notification-bar .informationnotification p a,
-.environment-notification-plugin-notification-notification-modal .informationnotification p a{
-  font-weight: bold;
-  color: #31708f;
-}
-
-.environment-notification-plugin-notification-bar .successnotification,
-.environment-notification-plugin-notification-notification-modal .successnotification{
-  background: #dff0d8;
-  border: 1px solid #d6e9c6;
-  color: #3c763d;
-}
-
-.environment-notification-plugin-notification-bar .successnotification p a
-.environment-notification-plugin-notification-notification-modal .successnotification p a{
-  font-weight: bold;
-  color: #3c763d;
-}
-
-.environment-notification-plugin-notification-bar .dangernotification,
-.environment-notification-plugin-notification-notification-modal .dangernotification{
-  background: #f2dede;
-  border: 1px solid #ebccd1;
-  color: #a94442;
-}
-
-.environment-notification-plugin-notification-bar .dangernotification  p a,
-.environment-notification-plugin-notification-notification-modal .dangernotification  p a{
-  font-weight: bold;
-  color: #a94442;
-}
-
-.environment-notification-plugin-notification-bar .adminnotification,
-.environment-notification-plugin-notification-notification-modal .adminnotification{
-  background: #9a959a;
-  border: 1px solid #9a959a;
-}
-
-.environment-notification-plugin-notification-bar .adminnotification p a,
-.environment-notification-plugin-notification-notification-modal .adminnotification p a{
-  font-weight: bold;
-  color: white;
-}
-
-#environment-notification-plugin-notification-manager a.button.icon-deactivate{
-  background: url(images/hide.png) no-repeat;
-  background-position: center;
-}
-
-#environment-notification-plugin-notification-manager a.button.icon-activate{
-  background: url(images/show.png) no-repeat;
-  background-position: center;
-}
-
-#environment-notification-plugin-notification-manager .notification-line{
-  display: inline;
-  padding-top: 10px;
-  vertical-align: middle;
-  border-bottom: 1px solid #ccc;
-}
-
-#environment-notification-plugin-notification-manager .notification-title-bar{
-  float: left;
-  width: 100%;
-  font-style: 14px;
-  font-weight: 700;
-  border-bottom: 2px solid black;
-  padding: 9px 0;
-}
-
-#environment-notification-plugin-notification-manager .notification-title{
-  width: 80%;
-  float: left;
-  text-align: center;
-}
-
-.environment-notification-plugin-notification-notification-modal .notification-with-title{
-  margin-bottom: 0px;
-}
-
-.environment-notification-plugin-notification-notification-modal .notification .notification-title{
-  width: 100%;
-  float: left;
-  font-weight: bold;
-  text-align: left;
-}
-
-.environment-notification-plugin-notification-notification-modal .notification-with-title-message{
-  width: 100%;
-  float: left;
-  border-radius: 3px;
-  margin-bottom: 10px;
-  background-color: #f5f5f5;
-  font-size: 14px;
-  overflow: auto;
-}
-
-.environment-notification-plugin-notification-notification-modal .notification-with-title-message p{
-  padding: 0px 7px;
-}
-
-.environment-notification-plugin-notification-notification-modal .notification-with-title-message p a{
-  color: black;
-  font-weight: bold;
-}
-
-
-#environment-notification-plugin-notification-manager .action-title{
-  width: 20%;
-  float: left;
-  text-align: center;
-}
-
-#environment-notification-plugin-notification-manager .notification-action{
-  width: 18%;
-  float: left;
-  height: 30px;
-  padding-top: 9px;
-}
-
-#environment-notification-plugin-notification-manager .main-bar .button,
-#environment-notification-plugin-notification-manager .notification-action .button{
-  border-radius: 3px;
-}
-
-#environment-notification-plugin-notification-manager .notification-message{
-  width: 82%;
-  float: left;
-}
-
-#environment-notification-plugin-notification-manager .new-notification{
-  float: right;
-  width: auto;
-}
-
-#environment-notification-plugin-notification-manager .back-button{
-  float: left;
-}
-
-#environment-notification-plugin-notification-manager .main-bar{
-  display: inline;
-  width: 100%;
-}
-
-.environment-notification-plugin-notification-bar .notification .notification-message,
-.environment-notification-plugin-notification-notification-modal .notification .notification-message{
-  width: 90%;
-  float: left;
-}
-
-.environment-notification-plugin-notification-bar .notification .notification-close{
-  background: url(images/redclose.png) no-repeat;
-  background-position: center;
-  width: 20px;
-  height: 20px;
-  float: right;
-  cursor: pointer;
-}
-
-.environment-notification-plugin-notification-bar .notification .notification-hide{
-  background: url(images/greenhide.png) no-repeat;
-  background-position: center;
-  width: 20px;
-  height: 20px;
-  float: right;
-  cursor: pointer;
-}
-
-.environment-notification-plugin-notification-notification-modal{
-  display: block;
-  min-width: 400px;
-  max-width: 700px;
-}
-
-.environment-notification-plugin-form .notification-variables-options{
-  font-style: italic;
-  color: red;
-}
@@ -1,36 +0,0 @@
-require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
-require 'account_controller'
-
-class AccountController
-  include EnvironmentNotificationHelper
-end
-
-class AccountControllerTest < ActionController::TestCase
-  def setup
-    @controller = AccountController.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 'clean hide_notifications cookie after logout' do
-    @request.cookies[:hide_notifications] = JSON.generate([1,2])
-    get :index
-    assert !@request.cookies[:hide_notifications].blank?
-
-    @request.cookies[:hide_notifications] = nil
-    get :logout
-    assert_nil session[:user]
-    assert_response :redirect
-    assert_equal 1, @controller.hide_notifications.count
-    assert @controller.hide_notifications.include?(-1)
-  end
-end
@@ -1,183 +0,0 @@
-require 'test_helper'
-require_relative '../../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 :close_notification, :notification_id => @notification.id
-     assert_equal "true", @response.body
-     assert @notification.users.include?(@person.user)
-  end
-
-  should 'a logged in user be able to momentarily hide notifications' do
-    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
-                      :environment_id => @environment.id,
-                      :message => "Message",
-                      :active => true,
-                      :type => "EnvironmentNotificationPlugin::DangerNotification"
-                    )
-
-    @another_notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
-                      :environment_id => @environment.id,
-                      :message => "Another Message",
-                      :active => true,
-                      :type => "EnvironmentNotificationPlugin::WarningNotification"
-                    )
-     post :hide_notification, :notification_id => @notification.id
-     assert_equal "true", @response.body
-     assert @controller.hide_notifications.include?(@notification.id)
-     assert !@controller.hide_notifications.include?(@another_notification.id)
-  end
-
-  should 'not momentarily hide any notification if its id is not found' do
-    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
-                      :environment_id => @environment.id,
-                      :message => "Message",
-                      :active => true,
-                      :type => "EnvironmentNotificationPlugin::DangerNotification"
-                    )
-
-     post :hide_notification, :notification_id => nil
-     assert_equal "false", @response.body
-     assert !@controller.hide_notifications.include?(@notification.id)
-  end
-end
@@ -1,120 +0,0 @@
-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
-
-  should 'a notification be displayed with a Popup' do
-    login_as(@person.user.login)
-    @notification = EnvironmentNotificationPlugin::EnvironmentNotification.create(
-                      :environment_id => @environment.id,
-                      :message => "Message",
-                      :display_popup => true,
-                      :active => true,
-                      :type => "EnvironmentNotificationPlugin::DangerNotification"
-                    )
-     assert_equal true, @notification.display_popup?
-
-     get :index
-     assert_no_match /div id="cboxWrapper"/, @response.body
-  end
-end
@@ -1,46 +0,0 @@
-require 'test_helper'
-
-class EnvironmentNotificationHelperTest < ActiveSupport::TestCase
-  def setup
-    @env = Environment.default
-    @env.enable_plugin('EnvironmentNotificationPlugin')
-
-    @user = User.create!(:environment_id => @env.id, :email => "user@domain.com", :login   => "new_user", :password => "test", :password_confirmation => "test", :name => "UserName")
-  end
-
-  should 'substitute all email variables to the current user email' do
-    message = "Hello user with email %{email}! please, update your current email (%{email})."
-
-    new_message = EnvironmentNotificationHelper.substitute_variables(message, @user)
-
-    assert message != new_message
-    assert_equal new_message, "Hello user with email user@domain.com! please, update your current email (user@domain.com)."
-  end
-
-  should 'not substitute emails variables if there is no current user' do
-    message = "Hello user with email %{email}! please, update your current email (%{email})."
-
-    new_message = EnvironmentNotificationHelper.substitute_variables(message, nil)
-
-    assert_equal message, new_message
-    assert_not_includes new_message, "user@domain.com"
-  end
-
-   should 'substitute all name variables to the current user name' do
-    message = "Hello %{name}! is %{name} your real name?."
-
-    new_message = EnvironmentNotificationHelper.substitute_variables(message, @user)
-
-    assert message != new_message
-    assert_equal new_message, "Hello UserName! is UserName your real name?."
-  end
-
-  should 'not substitute name variables if there is no current user' do
-    message = "Hello %{name}! is %{name} your real name?."
-
-    new_message = EnvironmentNotificationHelper.substitute_variables(message, nil)
-
-    assert_equal message, new_message
-    assert_not_includes new_message, "UserName"
-  end
-end
@@ -1,162 +0,0 @@
-require_relative '../../../../test/test_helper'
-
-class EnvironmentNotificationTest < ActiveSupport::TestCase
-
-  def setup
-    @env = Environment.default
-    @env.enable_plugin('EnvironmentNotificationPlugin')
-
-    User.destroy_all
-    EnvironmentNotificationPlugin::EnvironmentNotification.destroy_all
-    EnvironmentNotificationsUser.destroy_all
-
-    @user = User.create!(:environment_id => @env.id, :email => "user@domain.com", :login   => "new_user", :password => "test", :password_confirmation => "test")
-    @danger_notification = EnvironmentNotificationPlugin::DangerNotification.create!(
-                      :environment_id => @env.id,
-                      :message => "Danger Message",
-                      :active => true,
-                    )
-
-    @warning_notification = EnvironmentNotificationPlugin::WarningNotification.create!(
-                      :environment_id => @env.id,
-                      :message => "Warning Message",
-                      :active => true,
-                    )
-
-    @information_notification = EnvironmentNotificationPlugin::InformationNotification.create!(
-                      :environment_id => @env.id,
-                      :message => "Information Message",
-                      :active => true,
-                    )
-  end
-
-  should 'get all notifications that a user did not closed' do
-    @information_notification.users << @user
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, @user, nil)
-
-    assert notifications.include?(@danger_notification)
-    assert notifications.include?(@warning_notification)
-    assert !notifications.include?(@information_notification)
-  end
-
-  should 'get only notifications configured to be displayed to all users' do
-    @information_notification.display_to_all_users = true
-    @information_notification.save!
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, nil, nil)
-
-    assert !notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-  end
-
-  should 'get only notifications configured to be displayed to all users and in all pages' do
-    @information_notification.display_to_all_users = true
-    @information_notification.display_only_in_homepage = true
-    @information_notification.save!
-
-    @danger_notification.display_to_all_users = true
-    @danger_notification.save!
-
-    @warning_notification.display_only_in_homepage = true
-    @warning_notification.save!
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, nil, 'not_home')
-
-    assert notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert !notifications.include?(@information_notification)
-  end
-
-  should 'get only notifications configured to be displayed in all pages' do
-    @danger_notification.display_to_all_users = true
-    @danger_notification.display_only_in_homepage = true
-    @danger_notification.save!
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, @user, "not_home")
-
-    assert !notifications.include?(@danger_notification)
-    assert notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, nil, "home")
-
-    assert notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert !notifications.include?(@information_notification)
-  end
-
-  should 'get only notifications configured to be displayed to all users and in all pages and not closed by an user' do
-    @information_notification.display_to_all_users = true
-    @information_notification.save!
-
-    @danger_notification.display_to_all_users = true
-    @danger_notification.display_only_in_homepage = true
-    @danger_notification.save!
-
-    @warning_notification.display_to_all_users = true
-    @warning_notification.save!
-
-    @warning_notification.users << @user
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, @user, 'not_home')
-
-    assert !notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-  end
-
-  should 'get only active notifications' do
-    @information_notification.active = false
-    @information_notification.save!
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(@env, @user, 'home')
-
-    assert notifications.include?(@danger_notification)
-    assert notifications.include?(@warning_notification)
-    assert !notifications.include?(@information_notification)
-  end
-
-  should 'get only notifications with popup' do
-    @information_notification.display_popup = true
-    @information_notification.display_to_all_users = true
-    @information_notification.save!
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.with_popup(@env, @user, 'home')
-
-    assert !notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.with_popup(@env, nil, nil)
-
-    assert !notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-  end
-
-  should 'get only notifications with popup not closed by an user' do
-    @information_notification.display_popup = true
-    @information_notification.display_to_all_users = true
-    @information_notification.save!
-
-    @danger_notification.display_popup = true
-    @danger_notification.display_to_all_users = true
-    @danger_notification.save!
-
-    @danger_notification.users << @user
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.with_popup(@env, @user, 'home')
-
-    assert !notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-
-    notifications = EnvironmentNotificationPlugin::EnvironmentNotification.with_popup(@env, nil, nil)
-
-    assert notifications.include?(@danger_notification)
-    assert !notifications.include?(@warning_notification)
-    assert notifications.include?(@information_notification)
-  end
-end
@@ -1,39 +0,0 @@
-<div class="environment-notification-plugin-form">
-
-  <% abstract_options = {:value => @notification.message, :style => 'width: 100%; height: 200px;', :class => 'mceEditor'} %>
-
-  <%= button :back, _('Back'), :controller => 'environment_notification_plugin_admin' %>
-
-  <%= form_for :notifications do |f| %>
-
-    <%= render :file => 'shared/tiny_mce', :locals => {:mode => 'restricted'} %>
-
-    <%= labelled_form_field(_("Optional Title:"), f.text_field(:title, value: @notification.title)) %>
-
-    <%= labelled_form_field(_("Enter your message here:"), f.text_area(:message, abstract_options)) %>
-    <small class="notification-variables-options">
-      <%= _("Obs: You can use %{name} and %{email} variables to put the user's name and email in the message.") %>
-    </small>
-
-    <%= labelled_form_field(_('Notifications Status'), select(:notifications, :active, options_for_select_with_title({"Active" => true, "Inactive" => false}, @notification.active))) %>
-
-    <%= labelled_form_field(_('Notifications Color/Type'), select(:notifications, :type, options_for_select_with_title({_("Blue - Information") => "EnvironmentNotificationPlugin::InformationNotification", _("Yellow - Warning") => "EnvironmentNotificationPlugin::WarningNotification", _("Green - Success") => "EnvironmentNotificationPlugin::SuccessNotification", _("Red - 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>
-
-    <div>
-      <%= labelled_check_box(_("Display popup until user close the notification"), 'notifications[display_popup]', '1', @notification.display_popup?) %>
-    </div>
-
-    <% button_bar do %>
-      <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
-    <% end %>
-
-  <% end %>
-</div>
@@ -1 +0,0 @@
-<%= render :partial => "form" %>
@@ -1,40 +0,0 @@
-<div id="environment-notification-plugin-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>
-
@@ -1 +0,0 @@
-<%= render :partial => "form" %>
@@ -1,31 +0,0 @@
-<% if current_user && current_user.person.is_admin? %>
-  <% active_notifications = EnvironmentNotificationPlugin::EnvironmentNotification.active(environment) %>
-  <% unless active_notifications.blank? %>
-    <div class="environment-notification-plugin-notification-bar">
-      <div class="adminnotification notification">
-        <div class="notification-message">
-          <p>
-            <%= _("There are active notifications in this environment!") %>
-            <%= link_to _("Manage all notifications here."), EnvironmentNotificationPlugin.admin_url %>
-          </p>
-        </div>
-      </div>
-    </div>
-  <% end %>
-<% end %>
-
-<% @notifications = EnvironmentNotificationPlugin::EnvironmentNotification.visibles(environment, current_user, controller_path).where("id NOT IN (?)", hide_notifications) %>
-
-<div class="environment-notification-plugin-notification-bar">
-  <% @notifications.each do |notification| %>
-    <div class="<%= notification.type.gsub("EnvironmentNotificationPlugin::", "").downcase %> notification" data-notification="<%=notification.id%>" notification-display-popup="<%=notification.display_popup?%>">
-      <div class="notification-message">
-        <%= EnvironmentNotificationHelper.substitute_variables(notification.message, current_user) %>
-      </div>
-      <% if logged_in? %>
-        <div class="notification-close" title="<%= _('Do not show anymore') %>"></div>
-        <div class="notification-hide" title="<%= _('Hide for now') %>"></div>
-      <% end %>
-    </div>
-  <% end %>
-</div>
@@ -1,22 +0,0 @@
-<% @notifications = EnvironmentNotificationPlugin::EnvironmentNotification.with_popup(environment, current_user, @previous_path).where("id NOT IN (?)", @hide_notifications) %>
-
-<div class="environment-notification-plugin-notification-notification-modal">
-  <% @notifications.each do |notification| %>
-    <% if !notification.title.blank? %>
-      <div class="<%= notification.type.gsub("EnvironmentNotificationPlugin::", "").downcase %> notification notification-with-title" data-notification="<%=notification.id%>">
-        <div class="notification-title">
-          <%= notification.title %>
-        </div>
-      </div>
-      <div class="notification-message notification-with-title-message">
-        <%= EnvironmentNotificationHelper.substitute_variables(notification.message, current_user) %>
-      </div>
-    <% else %>
-      <div class="<%= notification.type.gsub("EnvironmentNotificationPlugin::", "").downcase %> notification notification-without-title" data-notification="<%=notification.id%>">
-        <div class="notification-message">
-          <%= EnvironmentNotificationHelper.substitute_variables(notification.message, current_user) %>
-        </div>
-      </div>
-    <% end %>
-  <% end %>
-</div>
@@ -1555,3 +1555,21 @@ table#recaptcha_table tr:hover td {
   clear: both;
 }
+
+/*************************** join community confirmation ********************************/
+
+.join-community-confirmation h1 {
+	font-variant: small-caps;
+	font-size: 20px;
+	color: #555753;
+	text-align: left;
+}
+
+.join-community-confirmation {
+	padding: 5px 20px 0px 20px;
+}
+
+.join-community-confirmation input.button.with-text {
+	padding-right: 4px;
+}
+
@@ -18,9 +18,11 @@ jQuery(function($) {
   })
   $(".join-community").live('click', function(){
+    $('#cboxClose').remove();
     clicked = $(this);
     url = clicked.attr("href");
-    loading_for_button(this);
+    if (!clicked.hasClass('modal-toggle'))
+      loading_for_button(this);
     $.post(url, function(data){
       clicked.fadeOut(function(){
         clicked.css("display","none");
@@ -23,4 +23,14 @@
     });
   });
+
+ $("#profile_data_closed_false").click(function(){
+  $("#requires_email_option").prop("checked",false);
+  $("#requires_email_option").hide();
+ });
+
+ $("#profile_data_closed_true").click(function(){
+  $("#requires_email_option").show();
+ });
+
 })(jQuery);
@@ -3,6 +3,8 @@ require &#39;profile_controller&#39;
 class ProfileControllerTest < ActionController::TestCase
+  include MembershipsHelper
+
   self.default_params = {profile: 'testuser'}
   def setup
     @profile = create_user('testuser').person
@@ -384,6 +386,61 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
+  should 'show regular join button for person with public email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    Person.any_instance.stubs(:public_fields).returns(["email"])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'show join modal for person with private email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    Person.any_instance.stubs(:public_fields).returns([])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'show regular join button for community without email visibility requirement' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => false)
+    Person.any_instance.stubs(:public_fields).returns([])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'show regular join button for community without email visibility requirement and person with public email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => false)
+    Person.any_instance.stubs(:public_fields).returns(['email'])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'render join modal for community with email visibility requirement and person with private email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    login_as @profile.identifier
+    post :join, :profile => community.identifier
+    assert_template "join"
+  end
+
+  should 'create add member task from join-community modal' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    admin = create_user('community-admin').person
+    community.add_admin(admin)
+
+    login_as @profile.identifier
+    assert_difference 'AddMember.count' do
+      post :join_modal, :profile => community.identifier
+    end
+    assert_redirected_to :action => 'index'
+  end
+
   should 'actually leave profile' do
     community = fast_create(Community)
     admin = fast_create(Person)
	@@ -86,8 +86,16 @@ class ProfileController < PublicController		@@ -86,8 +86,16 @@ class ProfileController < PublicController
86	@articles = profile.top_level_articles.includes([:profile, :parent])	86	@articles = profile.top_level_articles.includes([:profile, :parent])
87	end	87	end
88		88
		89	+ def join_modal
		90	+ profile.add_member(user)
		91	+ session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name
		92	+ redirect_to :action => :index
		93	+ end
		94	+
89	def join	95	def join
90	if !user.memberships.include?(profile)	96	if !user.memberships.include?(profile)
		97	+ return if profile.community? && show_confirmation_modal?(profile)
		98	+
91	profile.add_member(user)	99	profile.add_member(user)
92	if !profile.members.include?(user)	100	if !profile.members.include?(user)
93	render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json	101	render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
1	module MembershipsHelper	1	module MembershipsHelper
		2	+
		3	+ def join_community_button options={:logged => false}
		4	+ url = options[:logged] ? profile.join_url : profile.join_not_logged_url
		5	+
		6	+ if show_confirmation_modal? profile
		7	+ modal_button :add, _('Join this community'), url, class: 'join-community'
		8	+ else
		9	+ button :add, _('Join this community'), url, class: 'join-community'
		10	+ end
		11	+ end
		12	+
		13	+ def show_confirmation_modal? profile
		14	+ profile.requires_email? && current_person && !current_person.public_fields.include?("email")
		15	+ end
		16	+
2	end	17	end
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7		7
8	<% button_bar do %>	8	<% button_bar do %>
9	<% if @action == :join && logged_in? %>	9	<% if @action == :join && logged_in? %>
10	- <%= button(:add, content_tag('span', _('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>	10	+ <%= join_community_button({:logged => true}) %>
11	<% end %>	11	<% end %>
12	<% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>	12	<% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
13	<%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>	13	<%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
1	-<h1><%= _('Joining %s') % profile.name %></h1>	1	+<div class="join-community-confirmation">
2		2
3	-<p>
4	-<%= _('Are you sure you want to join %s?') % profile.name %>
5	-</p>	3	+ <h1><%= _('To join %s, you must:') % profile.name %></h1>
6		4
7	-<%= form_tag do %>
8	- <%= hidden_field_tag('back_to', @back_to) %>
9	- <%= hidden_field_tag(:confirmation, 1) %>
10	- <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
11	- <% if logged_in? && request.xhr? %>
12	- <%= modal_close_button _("No, I don't want") %>
13	- <% else %>
14	- <%= button(:cancel, _("No, I don't want."), profile.url) %>	5	+ <p>
		6	+ <%= _("Authorize the visibility of your email address to the community administrator.") %>
		7	+ </p>
		8	+
		9	+ <%= form_tag url_for({:action => :join_modal, :controller => :profile}) do %>
		10	+ <%= hidden_field_tag('back_to', @back_to) %>
		11	+ <%= submit_button(:ok, _("Authorize")) %>
		12	+ <%= modal_close_button _("Cancel") %>
15	<% end %>	13	<% end %>
16	-<% end %>	14	+
		15	+</div>
		16	+
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+<% if (task.organization.requires_email \|\| task.requestor.may_display_field_to?("email")) %>
	2	+ <div>
	3	+ Email:
	4	+ <span id="task_email"> <%=task.requestor.email %> </span>
	5	+ </div>
	6	+<% end %>
	7	+
	@@ -77,4 +77,10 @@		@@ -77,4 +77,10 @@
77		77
78	<% end %>	78	<% end %>
79		79
		80	+ <% if task.footer %>
		81	+ <div id="task-footer-<%=task.id%>">
		82	+ <%= render :partial => partial_for_class(task.class, nil, :footer), :locals => {:task => task} %>
		83	+ </div>
		84	+ <% end %>
		85	+
80	</div><!-- class="task_box" -->	86	</div><!-- class="task_box" -->
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+This plugin is the new version of "environment_notification" plugin.
	2	+
	3	+New features added:
	4	+ - Create a notification for an organization;
	5	+ - Only profile admin can create notifications;
	6	+ - Organization notifications can be seen by members from any of the organization pages;
	7	+ - home_page option set the notification to be seen only at organization homepage;
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+class AdminNotificationsPluginAdminController < AdminController
	2	+
	3	+ include AdminNotificationsPlugin::NotificationManager
	4	+
	5	+ before_filter :admin_required
	6	+
	7	+ protected
	8	+ def target
	9	+ environment
	10	+ end
	11	+
	12	+ def admin_required
	13	+ redirect_to :root unless current_person.is_admin?
	14	+ end
	15	+
	16	+end
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+class AdminNotificationsPluginMyprofileController < MyProfileController
	2	+
	3	+ include AdminNotificationsPlugin::NotificationManager
	4	+
	5	+ before_filter :admin_required
	6	+
	7	+ protected
	8	+ def target
	9	+ profile
	10	+ end
	11	+
	12	+ def admin_required
	13	+ redirect_to :root unless target.is_admin?(current_person)
	14	+ end
	15	+
	16	+end
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+class AdminNotificationsPluginPublicController < PublicController
	2	+
	3	+ helper AdminNotificationsPlugin::NotificationHelper
	4	+ include AdminNotificationsPlugin::NotificationHelper
	5	+
	6	+ def notifications_with_popup
	7	+ @hide_notifications = hide_notifications
	8	+ if params[:previous_path]
	9	+ @previous_path = params[:previous_path]
	10	+ else
	11	+ @previous_path = nil
	12	+ end
	13	+ end
	14	+
	15	+ def close_notification
	16	+ result = false
	17	+
	18	+ if logged_in?
	19	+ @notification = AdminNotificationsPlugin::Notification.find_by_id(params[:notification_id])
	20	+
	21	+ if @notification
	22	+ @notification.users << current_user
	23	+ result = @notification.users.include?(current_user)
	24	+ end
	25	+ end
	26	+
	27	+ render json: result
	28	+ end
	29	+
	30	+ def hide_notification
	31	+ result = false
	32	+
	33	+ if logged_in?
	34	+ @notification = AdminNotificationsPlugin::Notification.find_by_id(params[:notification_id])
	35	+
	36	+ if @notification
	37	+ current_notificaions = []
	38	+ current_notificaions = JSON.parse(cookies[:hide_notifications]) unless cookies[:hide_notifications].blank?
	39	+ current_notificaions << @notification.id unless current_notificaions.include? @notification.id
	40	+ cookies[:hide_notifications] = JSON.generate(current_notificaions)
	41	+ result = current_notificaions.include? @notification.id
	42	+ end
	43	+ end
	44	+
	45	+ render json: result
	46	+ end
	47	+
	48	+end