Showing 154 changed files Show diff stats
Rakefile
VERSION
config/cdtc/config.yaml
config/dev/config.yaml
config/homologa/config.yaml
config/lappis/config.yaml
config/lappis/ips.yaml
config/lappis/ssh_config
config/local/config.yaml
cookbooks/backup/files/rsnapshot-spb
cookbooks/backup/recipes/default.rb
cookbooks/backup/templates/rsnapshot-spb.erb
cookbooks/basics/recipes/default.rb
cookbooks/colab/files/default/dashboard.py
cookbooks/colab/files/default/gitlab_profile.py
cookbooks/colab/files/default/profile.py
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/gitlab.py.erb
cookbooks/colab/templates/noosfero.py.erb
cookbooks/colab/templates/super_archives.py.erb
@@ -41,7 +41,8 @@ if $SPB_ENV == &#39;lxc&#39;
   end
  
   File.open('config/lxc/iptables-filter-rules', 'w') do |f|
-    lxc_host_bridge_ip = '192.168.122.1' # FIXME don't hardcode
+    lxc_host_bridge_name = `awk '{ if ($1 == "lxc.network.link") { print($3) } }' /etc/lxc/default.conf`.strip
+    lxc_host_bridge_ip = ` /sbin/ifconfig #{lxc_host_bridge_name} | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1 }' `.strip
     f.puts "-A INPUT -s #{lxc_host_bridge_ip} -p tcp -m state --state NEW --dport 22 -j ACCEPT"
     f.puts "-A INPUT -s #{lxc_host_bridge_ip} -p tcp -m state --state NEW --dport 5555 -j ACCEPT"
   end
-5.0a0
+5.0a7
@@ -13,3 +13,5 @@ relay_hostname: relay.spb.cdtc.unb.br
 relay_ip: 164.41.9.48
 alt_ssh_port: 55555
 from_address: noreply@spb.cdtc.unb.br
+dev_backup_frequency: true
+disable_send_emails: true
@@ -19,3 +19,5 @@ alt_ssh_port: 55555
 external_outgoing_mail_domain: serpro.gov.br
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
 google_analytics_id: 'UA-64206731-2'
+dev_backup_frequency: true
+disable_send_emails: true
@@ -20,3 +20,5 @@ external_outgoing_mail_relay: 189.9.150.53
 external_outgoing_mail_domain: serpro.gov.br
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
 google_analytics_id: 'UA-64206731-3'
+dev_backup_frequency: true
+disable_send_emails: true
@@ -3,14 +3,16 @@ admins:
 site_url: https://softwarepublico.lappis
 external_hostname: softwarepublico.lappis
 sisp_external_hostname: sisp.lappis
-external_ip: 10.0.0.11
+external_ip: 10.0.0.54
 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
 server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
 email_subject_prefix: '[spb]'
 lists_hostname: listas.softwarepublico.lappis
 lists_admin: paulo@softwarelivre.org
 relay_hostname: relay.softwarepublico.lappis
-relay_ip: 10.0.0.15
+relay_ip: 10.0.0.51
 alt_ssh_port: 5555
 from_address: noreply@softwarepublico.lappis
-
+# define less frequent backup for dev envs
+dev_backup_frequency: true
+disable_send_emails: true
-reverseproxy: 10.0.0.11
-database: 10.0.0.13
-social: 10.0.0.14
-email: 10.0.0.15
-integration: 10.0.0.12
+reverseproxy: 10.0.0.54
+database: 10.0.0.55
+social: 10.0.0.53
+email: 10.0.0.51
+integration: 10.0.0.52
@@ -2,28 +2,28 @@ Host *
   ForwardAgent yes
  
 Host reverseproxy.unconfigured
-  Hostname 10.0.0.11
+  Hostname 10.0.0.54
  
 Host reverseproxy
-  Hostname 10.0.0.11
+  Hostname 10.0.0.54
   Port 5555
-  ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p
+  ProxyCommand ssh 10.0.0.54 -p 22 nc %h %p
  
 Host database
-  Hostname 10.0.0.13
+  Hostname 10.0.0.55
   # connect via reverseproxy host
-  ProxyCommand ssh 10.0.0.11 nc %h %p
+  ProxyCommand ssh 10.0.0.54 nc %h %p
  
 Host social
-  Hostname 10.0.0.14
+  Hostname 10.0.0.53
   # connect via reverseproxy host
-  ProxyCommand ssh 10.0.0.11 nc %h %p
+  ProxyCommand ssh 10.0.0.54 nc %h %p
  
 Host email
-  Hostname 10.0.0.15
+  Hostname 10.0.0.51
   # connect via reverseproxy host
-  ProxyCommand ssh 10.0.0.11 nc %h %p
+  ProxyCommand ssh 10.0.0.54 nc %h %p
  
 Host integration
-  Hostname 10.0.0.11
-  # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand
+  Hostname 10.0.0.54
+  # Porta 22 de 10.0.0.54 cai aqui entao nao precisa de ProxyCommand
@@ -19,3 +19,5 @@ alt_ssh_port: 5555
 from_address: noreply@softwarepublico.dev
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
 colab_http_workers: 1
+dev_backup_frequency: true
+disable_send_emails: true
@@ -13,7 +13,7 @@ cookbook_file &#39;/usr/local/bin/backup_spb.sh&#39; do
   mode  0755
 end
  
-cookbook_file '/etc/cron.d/rsnapshot-spb' do
+template '/etc/cron.d/rsnapshot-spb' do
   owner 'root'
   group 'root'
   mode 0644
@@ -0,0 +1,8 @@
+<%if node['config']['dev_backup_frequency']%>
+20   23   1   *   *   root    rsnapshot monthly
+<%else%>
+0   */6   *   *   *   root    rsnapshot hourly
+59   23   *   *   *   root    rsnapshot daily
+40   23   *   *   7   root    rsnapshot weekly
+20   23   1   *   *   root    rsnapshot monthly
+<%end%>
@@ -65,6 +65,7 @@ package &#39;tmux&#39;
 package 'less'
 package 'htop'
 package 'ntp'
+package 'screen'
  
 cookbook_file '/usr/local/bin/is-a-container' do
   owner   'root'
@@ -0,0 +1,21 @@
+from colab.widgets.widget_manager import WidgetManager
+
+from colab.widgets.dashboard.dashboard_latest_collaborations import \
+	DashboardLatestCollaborationsWidget
+from colab.widgets.dashboard.dashboard_collaboration_graph import \
+	DashboardCollaborationGraphWidget
+from colab_superarchives.widgets.dashboard_most_relevant_threads import \
+	DashboardMostRelevantThreadsWidget
+from colab_superarchives.widgets.dashboard_latest_threads import \
+	DashboardLatestThreadsWidget
+
+# Dashboard Widgets
+WidgetManager.register_widget('dashboard',
+                              DashboardLatestCollaborationsWidget())
+WidgetManager.register_widget('dashboard',
+                              DashboardCollaborationGraphWidget())
+WidgetManager.register_widget('dashboard',
+                              DashboardMostRelevantThreadsWidget())
+WidgetManager.register_widget('dashboard',
+                              DashboardLatestThreadsWidget())
+
@@ -0,0 +1,5 @@
+from colab.widgets.widget_manager import WidgetManager
+
+from colab_gitlab.widgets.profile.profile import GitlabProfileWidget
+
+WidgetManager.register_widget('profile', GitlabProfileWidget())
@@ -0,0 +1,18 @@
+from colab.widgets.widget_manager import WidgetManager
+
+from colab_superarchives.widgets.group import GroupWidget
+from colab_superarchives.widgets.group_membership import GroupMembershipWidget
+from colab_superarchives.widgets.latest_posted import LatestPostedWidget
+from colab.accounts.widgets.latest_contributions import \
+    LatestContributionsWidget
+
+from colab.accounts.widgets.collaboration_chart import CollaborationChart
+from colab_superarchives.widgets.participation_chart import ParticipationChart
+
+# Profile Widgets
+WidgetManager.register_widget('group', GroupWidget())
+WidgetManager.register_widget('button', GroupMembershipWidget())
+WidgetManager.register_widget('list', LatestPostedWidget())
+WidgetManager.register_widget('list', LatestContributionsWidget())
+WidgetManager.register_widget('charts', CollaborationChart())
+WidgetManager.register_widget('charts', ParticipationChart())
@@ -26,7 +26,7 @@ package &#39;colab-spb-theme&#39; do
   notifies :restart, 'service[colab]'
 end
  
-package 'colab-spb-theme' do
+package 'colab-spb-plugin' do
   action :upgrade
   notifies :restart, 'service[colab]'
 end
@@ -161,6 +161,13 @@ template &#39;/etc/colab/plugins.d/noosfero.py&#39; do
   variables(:get_private_token => get_private_token)
 end
  
+template '/etc/colab/plugins.d/super_archives.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+  notifies :restart, 'service[colab]'
+end
+
 template '/etc/colab/plugins.d/spb.py' do
   owner 'root'
   group 'colab'
@@ -177,6 +184,31 @@ end
  
 execute 'colab-admin migrate'
  
+# Adding widgets for colab
+cookbook_file '/etc/colab/widgets.d/dashboard.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+
+  notifies :restart, 'service[colab]'
+end
+
+cookbook_file '/etc/colab/widgets.d/profile.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+
+  notifies :restart, 'service[colab]'
+end
+
+cookbook_file '/etc/colab/widgets.d/gitlab_profile.py' do
+  owner 'root'
+  group 'colab'
+  mode 0640
+
+  notifies :restart, 'service[colab]'
+end
+
 # Static files
 directory '/var/lib/colab/assets/spb/' do
   owner  'root'
@@ -11,6 +11,11 @@ upstream = &#39;http://&lt;%= node[&#39;peers&#39;][&#39;integration&#39;] %&gt;:81/gitlab/&#39;
 private_token = '<%= @get_private_token.call %>'
 verify_ssl = False
  
+middlewares = [
+    'colab.middlewares.cookie_middleware.CookiePreHandlerMiddleware',
+    'colab.middlewares.cookie_middleware.CookiePostHandlerMiddleware'
+]
+
 urls = {
     'include': 'colab_gitlab.urls',
     'namespace': 'gitlab',  # TODO: do not allow to change namespace
@@ -35,7 +40,7 @@ menu_urls = (
     url(display=_('Issues'), viewname='gitlab',
         kwargs={'path': 'dashboard/issues'}, auth=True),
     url(display=_('Merge Requests'), viewname='gitlab',
-        kwargs={'path': 'merge_requests'}, auth=True),
+        kwargs={'path': 'dashboard/merge_requests'}, auth=True),
  
 )
  
@@ -10,6 +10,11 @@ verbose_name = &#39;Noosfero Plugin&#39;
  
 upstream = 'http://<%= node['peers']['social'] %>:80/social/'
  
+middlewares = [
+    'colab.middlewares.cookie_middleware.CookiePreHandlerMiddleware',
+    'colab.middlewares.cookie_middleware.CookiePostHandlerMiddleware'
+]
+
 private_token = '<%= @get_private_token.call %>'
  
 urls = {
@@ -0,0 +1,27 @@
+
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+name = 'colab_superarchives'
+verbose_name = 'Super Archives'
+
+urls = {
+    'include': 'colab_superarchives.urls',
+    'prefix': '^archives/',
+}
+
+menu_title = _('Groups')
+
+url = colab_url_factory('archives')
+
+menu_urls = (
+    url(display=_('Groups'), viewname='thread_list', auth=False),
+)
+
+# Imported settings from colab
+LOCALE_PATHS = ('colab_superarchives/locale',)
+
+# Super Archives
+SUPER_ARCHIVES_PATH = '/var/lib/mailman/archives/private'
+SUPER_ARCHIVES_EXCLUDE = []
+SUPER_ARCHIVES_LOCK_FILE = '/var/lock/colab/import_emails.lock'
@@ -110,6 +110,16 @@ execute &#39;change-cache-owner&#39; do
   only_if 'ls -l /usr/lib/gitlab/tmp/cache | grep root'
 end
  
+execute 'change-assets-owner' do
+  command 'chown -R git:git /usr/lib/gitlab/public/assets'
+  only_if 'ls -l /usr/lib/gitlab/public/assets | grep root'
+end
+
+execute 'change-gitlab-assets-owner' do
+  command 'chown -R git:git /var/lib/gitlab-assets'
+  only_if 'ls -l /var/lib/gitlab-assets | grep root'
+end
+
 execute 'precompile-assets' do
   user 'git'
   cwd '/usr/lib/gitlab'
@@ -122,7 +122,12 @@ scache    unix  -       -       n       -       1       scache
 #scalemail-backend unix -       n       n       -       2       pipe
 #  flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store
 #  ${nexthop} ${user} ${extension}
-#
+
 mailman   unix  -       n       n       -       -       pipe
   flags=FR user=mailman:mailman argv=/usr/lib/mailman/bin/postfix-to-mailman.py
   ${nexthop} ${user}
+
+fs_mail   unix  -       n       n       -       -       pipe
+  flags=F user=spb argv=tee --append /var/tmp/fs_mail.dump
+
+
@@ -83,6 +83,16 @@ cookbook_file &#39;/etc/cron.d/mailman-spb&#39; do
   mode 0644
 end
  
+execute 'postfix:disable-send-emails' do
+  command "postconf 'default_transport = fs_mail'"
+  only_if { node['config']['disable_send_emails'] }
+end
+
+execute 'postfix:enable-send-emails' do
+  command "postconf 'default_transport = smtp'"
+  not_if { node['config']['disable_send_emails'] }
+end
+
 cookbook_file '/etc/postfix/master.cf' do
   notifies :reload, 'service[postfix]'
 end
@@ -87,6 +87,12 @@ plugins_spb.each do |plugin|
   end
 end
  
+execute 'sisp:environment:prepare' do
+  command "RAILS_ENV=production bundle exec rake sisp:prepare ADMINUSER=#{node['config']['admins'].first[1]} DOMAIN=#{node['config']['sisp_external_hostname']}"
+  cwd '/usr/lib/noosfero'
+  user 'noosfero'
+end
+
 execute 'plugins:activate' do
   command "RAILS_ENV=production bundle exec rake noosfero:plugins:enable_all"
   cwd '/usr/lib/noosfero'
@@ -67,6 +67,10 @@ server {
   access_log            /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.access.log;
   error_log             /var/log/nginx/ssl-<%= node['config']['sisp_external_hostname'] %>.error.log;
  
+  location = / {
+    rewrite ^ /social/search/sisp?sort=asc;
+  }
+
   # TODO caching
   location / {
     proxy_pass              http://colab;
 # copy this file to local.rake and adjust to your local environment
 ENV['CHAKE_RSYNC_OPTIONS'] = '--exclude tmp/dump'
+
+# if you have vagrant lxc installed and want to use it, just copy the settings below to your local.rake
+# and run vagrant up --provider lxc
+#ENV['VAGRANT_BOX'] = 'frensjan/centos-7-64-lxc' #you can figure out a different  lxc box if you want
+#ENV['SPB_ENV'] = 'lxc'
-5.0a0
+5.0a7
@@ -15,7 +15,7 @@ version = open(&#39;VERSION&#39;).read().strip()
  
 setup(
     name='colab-spb-plugin',
-    version='0.2.5',
+    version=version,
     author='Macartur Sousa',
     author_email='macartur.sc@gmail.com',
     url='https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-plugin/',
-
 from django.apps import AppConfig
+from colab.signals.signals import connect_signal, register_signal
+from celery.utils.log import get_task_logger
+from colab_spb.tasks import list_group_and_repository_creation
+
+logger = get_task_logger(__name__)
  
  
 class SpbAppConfig(AppConfig):
     name = 'colab_spb'
     verbose_name = 'SPB'
+    short_name = 'spb'
     namespace = 'spb'
+
+    signals_list = ['create_repo', 'create_mail_list']
+
+    def register_signal(self):
+        logger.info('Signals from {0} registed '.format(self.short_name))
+        register_signal(self.short_name, self.signals_list)
+
+    def connect_signal(self):
+        connect_signal('community_creation', 'noosfero',
+                       list_group_and_repository_creation)
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('colab_gitlab', '0001_initial'),
         ('colab_noosfero', '__first__'),
-        ('super_archives', '0002_mailinglist_is_private'),
+        ('colab_superarchives', '0002_thread_user'),
     ]
  
     operations = [
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('community', models.ForeignKey(to='colab_noosfero.NoosferoCommunity', null=True)),
                 ('group', models.ForeignKey(to='colab_gitlab.GitlabGroup', null=True)),
-                ('mail_list', models.ForeignKey(to='super_archives.MailingList', null=True)),
+                ('mail_list', models.ForeignKey(to='colab_superarchives.MailingList', null=True)),
             ],
             options={
             },
 from colab_gitlab import models as gitlab
 from colab_noosfero import models as noosfero
-from colab.super_archives import models as mailman
+from colab_superarchives import models as mailman
 from django.db import models
  
  
@@ -0,0 +1,162 @@
+import requests
+from unicodedata import normalize, category
+
+from django.conf import settings
+
+from celery.utils.log import get_task_logger
+from colab_superarchives.utils.mailman import create_list
+from colab.celery import app
+from colab_gitlab.models import GitlabGroup
+
+logger = get_task_logger(__name__)
+
+
+def normalize_name(name):
+    """
+    Removes letters' accents, replaces whitespaces for dash (-), and lowercases
+    all letters
+    """
+    name = name.replace(' ', '-')
+
+    if not isinstance(name, unicode):
+        name = unicode(name, 'utf-8')
+
+    name = ''.join(c for c in normalize('NFD', name) if category(c) != 'Mn')
+
+    return name.lower()
+
+
+def create_group_from_community(noosfero_community):
+    """ Create a group into Gitlab  from a Noosfero's Community"""
+
+    group_name = normalize_name(noosfero_community.name)
+
+    # If project already exist
+    group = GitlabGroup.objects.filter(name=group_name)
+    if group:
+        return group[0].id
+
+    app_config = settings.COLAB_APPS.get('colab_gitlab', {})
+    private_token = app_config.get('private_token')
+    upstream = app_config.get('upstream', '').rstrip('/')
+    verify_ssl = app_config.get('verify_ssl', False)
+
+    error_msg = u'Error trying to create group "%s" on Gitlab. Reason: %s'
+
+    users_endpoint = '{}/api/v3/groups'.format(upstream)
+
+    params = {
+        'name': group_name,
+        'path': noosfero_community.identifier,
+        'private_token': private_token
+    }
+    group_id = None
+    try:
+        response = requests.post(users_endpoint, params=params,
+                                 verify=verify_ssl)
+    except Exception as excpt:
+        reason = 'Request to API failed ({})'.format(excpt)
+        logger.error(error_msg, group_name, reason)
+        return
+
+    if response.status_code != 201:
+        if response.status_code is 404:
+            pass  # TODO: should request the existing group id if error 404
+        reason = 'Unknown [{}].'.format(response.status_code)
+        logger.error(error_msg, group_name, reason)
+        return
+    else:
+        group_id = response.json().get('id')
+        logger.info('Group {0} created'.format(group_name))
+
+    return group_id
+
+
+def include_members_into_group(admins, group_id):
+    """ Include members from a Noosfero's Community into a  Gitlab's group """
+
+    app_config = settings.COLAB_APPS.get('colab_gitlab', {})
+    private_token = app_config.get('private_token')
+    upstream = app_config.get('upstream', '').rstrip('/')
+    verify_ssl = app_config.get('verify_ssl', False)
+    error_msg = u'Error to include "%s" to create group "%s" on Gitlab. \
+    Reason: %s'
+
+    user_id = None
+    users_endpoint = '{}/api/v3/users'.format(upstream)
+    for admin in admins:
+        params = {'search': admin.username,
+                  'private_token': private_token}
+        response = requests.get(users_endpoint, params=params,
+                                verify=verify_ssl)
+        users = response.json()
+        # Be sure to get only one
+        for user in users:
+            if user['username'] == admin.username:
+                user_id = user['id']
+                break
+
+        users_endpoint = '{}/api/v3/groups/{}/members'.format(
+            upstream, group_id)
+        params = {
+            'user_id': user_id,
+            'access_level': 50,  # OWNER = 50
+            'private_token': private_token
+        }
+        try:
+            response = requests.post(users_endpoint, params=params,
+                                     verify=verify_ssl)
+        except Exception as excpt:
+            reason = 'Request to API failed ({})'.format(excpt)
+            logger.error(error_msg, admin.username, reason)
+            return
+        logger.info('Members included')
+
+
+def create_project(project_name, group_id):
+    """ Create a project into Gitlab group """
+
+    project_name = normalize_name(project_name)
+
+    app_config = settings.COLAB_APPS.get('colab_gitlab', {})
+    private_token = app_config.get('private_token')
+    upstream = app_config.get('upstream', '').rstrip('/')
+    verify_ssl = app_config.get('verify_ssl', False)
+    error_msg = u'Error to create project "%s" into Gitlab. Reason: %s'
+
+    users_endpoint = '{}/api/v3/projects'.format(upstream)
+    params = {
+        'name': project_name,
+        'public': True,
+        'visibility_level': 20,  # show to all
+        'namespace_id': group_id,
+        'private_token': private_token
+    }
+    try:
+        requests.post(users_endpoint, params=params,
+                      verify=verify_ssl)
+    except Exception as excpt:
+        reason = 'Request to API failed ({})'.format(excpt)
+        logger.error(error_msg, project_name, reason)
+        return
+    logger.info('Project created')
+
+
+@app.task(bind=True)
+def list_group_and_repository_creation(self, **kwargs):
+    logger.info('Community created: {0}'.format(''.join(kwargs)))
+
+    noosfero_community = kwargs['community']
+    admins = noosfero_community.admins.all()
+    if not len(admins):
+        logger.error('Failed to create list, the software does not '
+                     'have an admin.')
+        return -1
+
+    group_id = create_group_from_community(noosfero_community)
+    include_members_into_group(admins, group_id)
+    create_project(noosfero_community.name, group_id)
+    listname = normalize_name(noosfero_community.name)
+    create_list(listname, admins[0])
+
+    return 0
@@ -0,0 +1,18 @@
+from django import template
+
+from colab_spb.models import CommunityAssociations
+
+register = template.Library()
+
+@register.simple_tag
+def get_community(mailinglist):
+    ml = mailinglist
+    community = ""
+
+    try:
+        community_association = CommunityAssociations.objects.get(mail_list=ml)
+        community = community_association.community.name
+    except CommunityAssociations.DoesNotExist:
+        community = "software"
+
+    return community
 # -*- coding: utf-8 -*-
 from django.shortcuts import render
 from django.http import HttpResponse
-from colab.super_archives.models import MailingList, Thread
-from colab.accounts.utils import mailman
+from colab_superarchives.models import MailingList, Thread
+from colab_superarchives.utils import mailman
 from colab.accounts.models import User
 from colab_spb.models import CommunityAssociations
  
 PACKAGE = colab-spb-theme
-VERSION = 0.3.11
+VERSION = $(shell cat VERSION)
 DISTDIR = dist
 PACKAGE_NAME = $(PACKAGE)-$(VERSION)
 TARBALL = $(PACKAGE_NAME).tar.gz
-5.0a0
+5.0a7
@@ -428,7 +428,8 @@ header #sisp-header-quick-access a {
     font-weight: bold;
 }
  
+/*
 header #spb-header-content,
 header #sisp-header-content {
     padding-top: 13px;
-}
+} */
@@ -62,8 +62,10 @@ body {
   bottom: 0;
 }
  
-#main-content {
+body div#main-content {
   margin-top: 0;
+  padding: 20px 0 60px 0;
+  color: #172738;
 }
  
 li hr {
@@ -508,11 +510,6 @@ span.highlighted {
     margin: 0 2px;
 }
  
-#main-content {
-    padding: 40px 0 60px 0;
-    color: #172738;
-}
-
 .colab-content {
     max-width: 960px;
     min-width: 960px;
@@ -580,10 +577,22 @@ form.signup {
  
 .signup-help {
     font-size: 16px;
-    font-family: Arial;
+}
+
+.mailinglist-help,
+.signup-help {
     padding-top: 7px;
+    font-family: Arial;
+    position: absolute;
+}
  
-  }
+.mailinglist-help {
+    font-size: 15px;
+}
+
+.list-container {
+    padding-top: 30px;
+}
  
 a.btn {
   margin: 2px 0 2px 0;
@@ -58,7 +58,7 @@
     text-decoration: none;
 }
  
-.btn:hover {
+colab-search-form .btn:hover {
     color: white;
 }
  
@@ -0,0 +1,37 @@
+var colab = (function( $ ){
+  var $window = $(window);
+
+  var sidebar, offset, maxMarginTop, reference,
+
+  sidebarScroll = function() {
+
+    if($window.scrollTop() > offset.top) {
+      var marginTop = $window.scrollTop() - offset.top;
+      marginTop = marginTop > maxMarginTop ? maxMarginTop : marginTop;
+
+      sidebar.stop().animate({
+        marginTop: marginTop
+      });
+    } else {
+      sidebar.stop().animate({
+        marginTop: 0
+      });
+    }
+  },
+
+  init = function(sidebarSelector, referenceSelector) {
+    sidebar = $(sidebarSelector);
+    reference = $(referenceSelector);
+    offset = sidebar.offset();
+    maxMarginTop = reference.height() - sidebar.height();
+
+    $window.scroll(function() {
+      sidebarScroll();
+    });
+  };
+
+
+  return {
+    init: init
+  };
+})( jQuery );
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n staticfiles %}
+
+{% block head_js %}
+  <script src="{% static 'js/scroll.js' %}"></script>
+{% endblock %}
+
+{% block title %}Cadastre-se - SPB{% endblock %}
 {% block main-content %}
 <div class="colab-content container">
   <h2>Cadastre-se</h2>
@@ -9,6 +15,7 @@
     {% csrf_token %}
     <div class="row">
       <div class="col-md-6 col-lg-6 col-sm-6 col-xs-12">
+        <div class="signup-fields">
           <fieldset>
             {% for field in user_form %}
               <div class="form-group{% if field.field.required %} required{% endif %}{% if field.errors %} alert alert-danger has-error{% endif %}">
@@ -22,17 +29,22 @@
           </fieldset>
  
           <input type="submit" value="Cadastrar" id="btn-cadastrar" class="btn btn-primary">
+        </div>
       </div>
       <div class="col-md-6 col-lg-6 col-sm-6 col-xs-12">
         <div style="border-left: 1px solid #ccc; padding-left: 52px; min-height: 450px">
           <div class="signup-help">
-            <p>Em caso de dúvidas visite a seção de <a href="/social/spb/ajuda#faq">Ajuda</a></p>
+            <p>Em caso de dúvidas, visite a seção de <a href="/social/spb/ajuda#faq">Ajuda</a></p>
             <hr>
-            <p>Caso ainda permaneça com dúvidas, fique à vontade para entrar em contato conosco através do email <a href="mailto:admin@softwarepublico.gov.br">admin@softwarepublico.gov.br</a></p>
+            <p>Caso ainda permaneça com dúvidas, fique à vontade para entrar em contato conosco através do email: <a href="mailto:admin@softwarepublico.gov.br">admin@softwarepublico.gov.br</a></p>
           </div>
         </div>
       </div>
     </div>
   </form>
 </div>
+
+  <script>
+    $(colab.init('.signup-help', '.signup-fields'));
+  </script>
 {% endblock %}
@@ -10,65 +10,14 @@
   <div id="footer" role="contentinfo">
     <a name="afooter" id="afooter"></a>
     <div id="doormat-container" class="columns-4">
-      <div class="doormatColumn column-0">
-        <dl class="doormatSection">
-          <dt class="doormatSectionHeader">Assuntos</dt>
-          <dd class="doormatSectionBody">
-            <a href="/social/sisp/publique-seu-software" class="external-link">Publique seu software</a>
-          </dd>
-          <!--
-          <dd class="doormatSectionBody">
-            <a href="http://antigo.softwarepublico.gov.br/mpv/" class="external-link">Prestadores de serviço</a>
-          </dd>
-          -->
-        </dl>
-      </div>
-      <div class="doormatColumn column-1">
-        <dl class="doormatSection">
-          <dt class="doormatSectionHeader">Portal do SISP</dt>
-          <dd class="doormatSectionBody">
-            <a href="/social/sisp/entenda-o-que-e" class="external-link">Entenda o que é</a>
-          </dd>
-          <!--
-          <dd class="doormatSectionBody">
-            <a href="/social/profile/sisp/events" class="external-link">Eventos</a>
-          </dd>
-          -->
-        </dl>
-      </div>
-      <div class="doormatColumn column-2">
-        <dl class="doormatSection">
-          <dt class="doormatSectionHeader">Serviços</dt>
-          <dd class="doormatSectionBody">
-            <a href="/social/sisp/ajuda#faq" class="external-link">FAQ</a>
-          </dd>
-          <dd class="doormatSectionBody">
-            <a href="/social/sisp/contato" class="external-link">Contato</a>
-          </dd>
-          <!--
-          <dd class="doormatSectionBody">
-            <a href="/archives/thread/sisp-usuarios/relatar-erros#msg-1635" class="external-link">Relatar erros</a>
-          </dd>
-          -->
-        </dl>
-      </div>
-      <div class="doormatColumn column-3">
-        <dl class="doormatSection">
-          <dt class="doormatSectionHeader">RSS</dt>
-          <dd class="doormatSectionBody">
-            <a href="/social/sisp/rss/o-que-e" class="external-link">O que é?</a>
-          </dd>
-          <dd class="doormatSectionBody">
-            <a href="/rss/colab/latest" class="external-link">Assine</a>
-          </dd>
-        </dl>
+      <div class ="doormatColumn column-0">
         <dl class="doormatSection">
           <dt class="doormatSectionHeader">Navegação</dt>
           <dd class="doormatSectionBody">
-            <a href="/social/sisp/acessibilidade" class="external-link">Acessibilidade</a>
+            <a href="" onclick="return false;" class="external-link">Acessibilidade</a>
           </dd>
           <dd class="doormatSectionBody">
-            <a href="/social/sisp/mapa-do-site" class="external-link">Mapa do site</a>
+            <a href="" onclick="return false;" class="external-link">Mapa do site</a>
           </dd>
         </dl>
       </div>
@@ -8,9 +8,6 @@
   </div>
   <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
     <div id="header" role="banner">
-    <div id="sisp-header-quick-access">
-      <p class='pull-right'>Acesso rápido: <a href="{{ SPB_PORTAL }}">Software Público Brasileiro</a></p>
-    </div>
     <div id="sisp-header-content">
       <ul id="accessibility">
         <li>
@@ -49,7 +46,7 @@
       <div id="second-nav">
         <ul id="portal-siteactions">
           <li id="siteaction-accessibility">
-            <a href="/social/sisp/acessibilidade" title="Acessibilidade" accesskey="5">
+            <a href="" onclick="return false;" title="Acessibilidade" accesskey="5">
               Acessibilidade
             </a>
           </li>
@@ -59,7 +56,7 @@
             </a>
           </li>
           <li id="siteaction-mapadosite">
-            <a href="/social/sisp/mapa-do-site" title="Mapa do Site" accesskey="7">
+            <a href="" onclick="return false;" title="Mapa do Site" accesskey="7">
               Mapa do Site
             </a>
           </li>
@@ -67,8 +64,7 @@
       </div>
       <div id="logo">
         <a id="portal-logo" title="" href="/">
-          <span id="portal-title-1">Portal do</span>
-          <h1 id="portal-title" class="corto">SISP</h1>
+          <h1 id="portal-title" class="corto">Catálogo do SISP</h1>
           <span id="portal-description">MINISTÉRIO DO PLANEJAMENTO, ORÇAMENTO E GESTÃO</span>
         </a>
       </div>
@@ -8,9 +8,6 @@
   </div>
   <script src="//barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
 	<div id="header" role="banner">
-    <div id="spb-header-quick-access">
-      <p class='pull-right'>Acesso rápido: <a href="{{ SISP_PORTAL }}">Portal do SISP</a></p>
-    </div>
     <div id="spb-header-content">
       <ul id="accessibility">
         <li>
 {% extends 'base.html' %}
-{% load i18n tz superarchives %}
+{% load i18n tz superarchives staticfiles spb_extra %}
+
+{% block head_js %}
+  <script src="{% static 'js/scroll.js' %}"></script>
+{% endblock %}
+
+{% block title %}{{ mailinglist.name|title }} - Listas de discussão - SPB{% endblock %}
+
+{% block title %}{{ mailinglist.name|title }}{% endblock %}
  
 {% block main-content %}
   <div class="colab-content container">
@@ -44,19 +52,37 @@
   {% endblock %}
  
   {% block mailinglist_view_thread_list %}
-    {% for thread in thread_list %}
-      <div class="row colab-thread">
-        <div class="col-md-12 colab-thread">
-          <small class="colab-thread-modified-time">{{ thread.latest_message.received_time|date:"d F Y" }} {% trans "at" %} {{thread.latest_message.received_time|date:"h:m" }} - <a class="colab-thread-modified-author" href="{{thread.latest_message.author_url}}">{{thread.latest_message.author }}</a>
-          </small><br>
-          <h4><a class="colab-thread-subject" href="{{thread.get_absolute_url}}">{{ thread.latest_message.subject_clean }}</h4>
-          {% with thread.latest_message.body|truncatechars:"85" as description %}
-            <span class="colab-thread-latest-message">{{description | default_if_none:"a"}}</span></a><br>
-          {% endwith %}
-        <hr/>
+    <div class="row">
+      <div class="list-container">
+        <div class="col-md-8">
+          <div class="thread-list">
+            <div style="border-right: 1px solid #ccc; padding-right: 32px; min-height: 450px">
+              {% for thread in thread_list %}
+              <div class="row colab-thread">
+                <div class="col-md-12 colab-thread">
+                  <small class="colab-thread-modified-time">{{ thread.latest_message.received_time|date:"d F Y" }} {% trans "at" %} {{thread.latest_message.received_time|date:"h:m" }} - <a class="colab-thread-modified-author" href="{{thread.latest_message.author_url}}">{{thread.latest_message.author }}</a>
+                  </small><br>
+                  <h4><a class="colab-thread-subject" href="{{thread.get_absolute_url}}">{{ thread.latest_message.subject_clean }}</h4>
+                    {% with thread.latest_message.body|truncatechars:"85" as description %}
+                    <span class="colab-thread-latest-message">{{description | default_if_none:"a"}}</span></a><br>
+                    {% endwith %}
+                    <hr/>
+                  </div>
+                </div>
+                {% endfor %}
+              </div>
+          </div>
+        </div>
+
+        <div class="col-md-4">
+          <div class="mailinglist-help">
+            <p>Em caso de dúvidas, visite o <a href="/social/{% get_community mailinglist %}/como-participar-da-lista-de-discussao">Guia de Uso</a></p>
+            <hr>
+            <p>Caso ainda permaneça com dúvidas, fique à vontade para entrar em contato conosco através do email: <a href="mailto:admin@softwarepublico.gov.br">admin@softwarepublico.gov.br</a></p>
+          </div>
         </div>
       </div>
-    {% endfor %}
+    </div>
   {% endblock %}
  
   {% block mailinglist_view_paginator %}
@@ -109,4 +135,9 @@
     {% endif %}
   {% endblock %}
   </div>
+
+  <script>
+    $(colab.init('.mailinglist-help', '.thread-list'));
+  </script>
+
 {% endblock %}
@@ -0,0 +1,61 @@
+{% extends 'base.html' %}
+{% load i18n tz superarchives %}
+
+{% block title %}Login - SPB{% endblock %}
+
+{% block main-content %}
+<div class="row">
+  {% if form.errors %}
+    {% if form.errors.items|length == 1 %}
+      <div class="alert alert-danger">
+        <b>{% trans "Please correct the error below and try again." %}</b>
+      </div>
+    {% else %}
+      <div class="alert alert-danger">
+        <b>{% trans "Please correct the errors below and try again." %}</b>
+      </div>
+    {% endif %}
+  {% endif %}
+
+  {% for error in form.non_field_errors %}
+  <div class="alert alert-danger">
+    {{ error }}
+  </div>
+  {% endfor %}
+</div>
+
+
+<br>
+<form action="{% url 'login' %}" method="post" role="form" class="form-horizontal signup">
+  {% csrf_token %}
+
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-4 col-sm-8 col-sm-offset-2 col-xs-12">
+      <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{% trans 'Login' %}</h3></div>
+
+        <div class="panel-body">
+          <div class="form-group{% if form.username.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.username.label_tag }}
+            <input class="form-control" id="id_username" maxlength="254" name="username" type="text">
+            {{ form.username.errors }}
+          </div>
+          <div class="form-group{% if form.password.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.password.label_tag }}
+            <input class="form-control" id="id_password" name="password" type="password">
+            {{ form.password.errors }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="submit">
+      <input type="submit" value="{% trans 'Login' %}" class="btn btn-primary btn-lg btn-block">
+    </div>
+    <p class="text-center"><a href="{% url 'password_reset' %}">{% trans 'Forgot Password?' %}</a></p>
+  </div>
+
+</form>
+{% endblock %}
@@ -2,7 +2,7 @@
 {% load i18n tz highlight superarchives search_preview_templates %}
 {% load static from staticfiles %}
  
-{% block title %}{% trans 'search'|title %}{% endblock %}
+{% block title %}{% trans 'search'|title %} - SPB{% endblock %}
  
 {% block head_js %}
 <script type="text/javascript" src="{% static 'third-party/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js' %}"></script>
@@ -107,7 +107,7 @@
             {% if page.has_previous %}
               {% if page.previous_page_number > 1 %}
                 <li>
-                  <a href="{% append_to_get page=page.previous_page_number|add:-2 %}">{{ page.number|add:-2 }}</a>
+                  <a href="{% append_to_get page=page.previous_page_number|add:-1 %}">{{ page.number|add:-2 }}</a>
                 </li>
               {% endif %}
               <li>
 {% extends 'base.html' %}
 {% load i18n %}
  
-{% block title %}Listas de discussão{% endblock %}
+{% block title %}Listas de discussão - SPB{% endblock %}
  
 {% block main-content %}
   <div class="colab-content container">
@@ -25,7 +25,7 @@
             {% endfor %}
           </ul>
           <div class="text-right">
-            <a href="{% url 'haystack_search' %}?order=latest&list={{ mailinglist.name }}&type=thread">
+            <a href="{% url 'haystack_search' %}?order=latest&tag={{ mailinglist.name }}&type=thread">
               {% trans "more..." %}
             </a>
           </div>
@@ -39,7 +39,7 @@
             {% endfor %}
           </ul>
           <div class="text-right">
-            <a href="{% url 'haystack_search' %}?list={{ mailinglist.name }}&type=thread">
+            <a href="{% url 'haystack_search' %}?tag={{ mailinglist.name }}&type=thread">
               {% trans "more..." %}
             </a>
           </div>
 PACKAGE = noosfero-spb
-VERSION = 4.2.12
+VERSION = $(shell cat VERSION)
 DISTDIR = $(PACKAGE)-$(VERSION)
 TARBALL = $(DISTDIR).tar.gz
  
@@ -11,9 +11,10 @@ themes_dir=/usr/lib/noosfero/public/designs/themes
 noosfero_dir=/usr/lib/noosfero
  
 dist: clean
-	mkdir $(DISTDIR)
-	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR) && tar xaf -)
-	tar --exclude=.git -czf $(TARBALL) $(DISTDIR)
+	mkdir -p dist/$(DISTDIR)
+	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd dist/$(DISTDIR) && tar xaf -)
+	cd dist/ && tar --exclude=.git -czf $(TARBALL) $(DISTDIR)
+	$(RM) -r $(DISTDIR)
  
 clean:
 	$(RM) -r dist/
-5.0a0
+5.0a7
@@ -5,6 +5,8 @@ class GovUserPluginController &lt; ApplicationController
     :governmental_sphere, :governmental_power, :juridical_nature, :sisp
   ]
  
+  protect "create_institution_admin", :environment
+
   def hide_registration_incomplete_percentage
     response = false
  
@@ -65,7 +67,10 @@ class GovUserPluginController &lt; ApplicationController
   def get_institutions
     redirect_to "/" if !request.xhr? || params[:query].blank?
  
-    institutions = Institution.search_institution(params[:query]).select([:id, :name])
+    selected_institutions = Institution.where(id: params[:selected_institutions]).select([:id, :name])
+    institutions = Institution.search_institution(params[:query], environment).select("institutions.id, institutions.name")
+    institutions -= selected_institutions
+
     institutions_list = institutions.map { |institution|
       {:value=>institution.name, :id=>institution.id}
     }
 class GovUserPluginMyprofileController < MyProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
  
+  protect "edit_institution", :profile
+
   def index
   end
  
@@ -19,7 +21,7 @@ class GovUserPluginMyprofileController &lt; MyProfileController
  
   def update_institution
     @institution.community.update_attributes(params[:community])
-    @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature))
+    @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature).merge({:name => params[:community][:name]}))
     if @institution.type == "PublicInstitution"
       begin
         governmental_updates
@@ -0,0 +1,17 @@
+#encoding: utf-8
+
+class AppliesAccentuationOnModelsWithoutThem < ActiveRecord::Migration
+  def up
+    execute "UPDATE governmental_powers SET name = 'Judiciário' WHERE name = 'Judiciario'"
+    execute "UPDATE governmental_powers SET name = 'Não se Aplica' WHERE name = 'Nao se Aplica'"
+
+    execute "UPDATE juridical_natures SET name = 'Administração Direta' WHERE name = 'Administracao Direta'"
+    execute "UPDATE juridical_natures SET name = 'Empresa Pública' WHERE name = 'Empresa Publica'"
+    execute "UPDATE juridical_natures SET name = 'Fundação' WHERE name = 'Fundacao'"
+    execute "UPDATE juridical_natures SET name = 'Orgão Autônomo' WHERE name = 'Orgao Autonomo'"
+  end
+
+  def down
+    say "This migration has no back state"
+  end
+end
@@ -0,0 +1,16 @@
+class FixInstitutionsWithWrongCountry < ActiveRecord::Migration
+  def up
+    select_all("SELECT id, data FROM profiles WHERE type = 'Community'").each do |community|
+      settings = YAML.load(community['data'] || {}.to_yaml)
+      if !settings[:country].nil? && settings[:country].downcase == "brasil"
+        settings[:country] = 'BR'
+        assignments = ActiveRecord::Base.send(:sanitize_sql_for_assignment, {:data => settings.to_yaml})
+        update("UPDATE profiles SET %s WHERE id = %d" % [assignments, community['id']])
+      end
+    end
+  end
+
+  def down
+    say "This migration can't be reverted."
+  end
+end
@@ -0,0 +1,18 @@
+class FixCommunitiesWithWrongState < ActiveRecord::Migration
+  def up
+    select_all("SELECT id, data FROM profiles WHERE type = 'Community'").each do |community|
+      settings = YAML.load(community['data'] || {}.to_yaml)
+      new_state = Institution::VALID_STATES[settings[:state].upcase] if settings[:state].present?
+
+      if new_state.present?
+        settings[:state] = new_state
+        assignments = ActiveRecord::Base.send(:sanitize_sql_for_assignment, {:data => settings.to_yaml})
+        update("UPDATE profiles SET %s WHERE id = %d" % [assignments, community['id']])
+      end
+    end
+  end
+
+  def down
+    say "This migration can't be reverted."
+  end
+end
@@ -5,9 +5,12 @@ Feature: Institution Field
  
   Background:
     Given "GovUserPlugin" plugin is enabled
+    And "SoftwareCommunitiesPlugin" plugin is enabled
     And I am logged in as mpog_admin
+    And I go to /admin/environment_themes/set/noosfero-spb-theme
     And I go to /admin/plugins
     And I check "GovUserPlugin"
+    And I check "SoftwareCommunitiesPlugin"
     And I press "Save changes"
     And Institutions has initial default values on database
     And I am logged in as mpog_admin
@@ -27,6 +30,19 @@ Feature: Institution Field
     And I should see "CNPJ"
     And I should see "Acronym"
     And I choose "Public Institution"
-    Then I should see "Governmental Sphere:"
-    And I should see "Governmental Power:"
-    And I should see "Juridical Nature:"
+    Then I should see "Governmental Sphere"
+    And I should see "Governmental Power"
+    And I should see "Juridical Nature"
+
+  @selenium
+  Scenario: Clean state and city values when country is diferent of Brazil
+    Given I follow "Edit Profile"
+    When I follow "Create new institution"
+    And I select "Brazil" from "community_country"
+    And I select "Distrito Federal" from "community_state"
+    And I fill in "community_city" with "Gama"
+    And I select "United States" from "community_country"
+    Then I should not see "community_state"
+    And I should not see "community_city"
+    And I select "Brazil" from "community_country"
+    Then I should not see "Gama"
@@ -27,8 +27,8 @@ Feature: rate_community
     And Institutions has initial default values on database
     And the following public institutions
       | name                       | acronym | country | state | city       | cnpj               | juridical_nature | governmental_power | governmental_sphere | corporate_name |
-      | Ministerio das Cidades     | MC      | BR      | DF    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
-      | Ministerio do Planejamento | MP      | BR      | DF    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
+      | Ministerio das Cidades     | MC      | BR      | Distrito Federal    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
+      | Ministerio do Planejamento | MP      | BR      | Distrito Federal    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
  
   Scenario: display message on task when a rating with the same institution exists on the same software
     Given the following organization ratings
@@ -38,7 +38,7 @@ Feature: rate_community
     And I go to mycommunity's control panel
     And I follow "Process requests" within ".pending-tasks"
     And I choose "Accept" within ".task_decisions"
-    Then I should see "This instiution already has an accepted rating" in the page
+    Then I should see "This institution already has an accepted rating" in the page
  
   Scenario: do not display message on task when a rating with the same institution does not exist on the same software
     Given the following organization ratings
@@ -8,6 +8,7 @@ Feature: Create institution on user report
     And "SoftwareCommunitiesPlugin" plugin is enabled
     And "OrganizationRatings" plugin is enabled
     And I am logged in as mpog_admin
+    And I go to /admin/environment_themes/set/noosfero-spb-theme
     And I go to /admin/plugins
     And I check "GovUserPlugin"
     And I check "SoftwareCommunitiesPlugin"
@@ -23,20 +24,20 @@ Feature: Create institution on user report
     And I should not see "Number of Beneficiaries"
     And I should not see "Saved resources"
     And I should not see "Organization name or Enterprise name"
-    When I click on anything with selector "#comments-additional-information"
-    Then I should see "Number of Beneficiaries"
-    And I should see "Organization name or Enterprise name"
-    And I should see "Saved resources"
+    When I click on anything with selector "comments-additional-information"
+    Then I should see "Número de beneficiados"
+    And I should see "Nome do órgão ou empresa"
+    And I should see "Recursos economizados"
  
   @selenium
   Scenario: Show new institution fields when clicked in add new institution
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
-    And I click on anything with selector "#comments-additional-information"
+    And I sleep for 1 seconds
+    And I click on anything with selector "comments-additional-information"
     And I fill in "input_institution" with "None institution"
     And I sleep for 2 seconds
     When I follow "Add"
-    Then I should see "New Institution"
-    And I should see "Public Institution"
+    Then I should see "Public Institution"
     And I should see "Private Institution"
     And I should see "Corporate Name"
     And I should see "Name"
@@ -46,33 +47,30 @@ Feature: Create institution on user report
     And I should see "CNPJ"
     And I should see "Acronym"
     And I choose "Public Institution"
-    And I should see "Governmental Sphere:"
-    And I should see "Governmental Power:"
-    And I should see "Juridical Nature:"
+    And I should see "Governmental Sphere"
+    And I should see "Governmental Power"
+    And I should see "Juridical Nature"
  
   @selenium
   Scenario: Create new institution with name changed in the modal
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
-    And I click on anything with selector "#comments-additional-information"
+    And I sleep for 1 seconds
+    And I click on anything with selector "comments-additional-information"
     And I fill in "input_institution" with "None institution"
     And I sleep for 2 seconds
-    When I click on anything with selector "#create_institution_link"
+    When I click on anything with selector "create_institution_link"
     And I fill in "community_name" with "Noosfero Institution"
-    And I select "United States" from "#community_country"
-    And I follow "#save_institution_button"
+    And I select "United States" from "Country"
+    And I sleep for 1 seconds
+    And I follow "Save"
     Then I should see "Noosfero Institution"
  
   @selenium
   Scenario: Check new institution name in the modal
     Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
-    And I click on anything with selector "#comments-additional-information"
+    And I sleep for 1 seconds
+    And I click on anything with selector "comments-additional-information"
     And I fill in "input_institution" with "None institution"
     And I sleep for 2 seconds
-    When I click on anything with selector "#create_institution_link"
-    Then I should see "None Institution" within "community_name"
-
-
-
-
-
-
+    When I click on anything with selector "create_institution_link"
+    Then I should see "None institution" in "Corporate Name" field
@@ -5,12 +5,15 @@ Feature: Institution Field
  
   Background:
     Given "GovUserPlugin" plugin is enabled
+    And "SoftwareCommunitiesPlugin" plugin is enabled
     And the following users
       | login | name        |
       | joao  | Joao Silva  |
     And I am logged in as admin
+    And I go to /admin/environment_themes/set/noosfero-spb-theme
     And I go to /admin/plugins
     And I check "GovUserPlugin"
+    And I check "SoftwareCommunitiesPlugin"
     And I press "Save changes"
     And feature "skip_new_user_email_confirmation" is enabled on environment
     And I go to /admin/features/manage_fields
@@ -21,16 +24,16 @@ Feature: Institution Field
     And Institutions has initial default values on database
     And the following public institutions
       | name                       | acronym | country | state | city       | cnpj               | juridical_nature | governmental_power | governmental_sphere | corporate_name |
-      | Ministerio das Cidades     | MC      | BR      | DF    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
-      | Governo do DF              | GDF     | BR      | DF    | Taguatinga | 12.645.166/0001-44 | Autarquia        | Legislativo        | Federal             | Governo do DF |
-      | Ministerio do Planejamento | MP      | BR      | DF    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
+      | Ministerio das Cidades     | MC      | BR      | Distrito Federal    | Gama       | 58.745.189/0001-21 | Autarquia        | Executivo          | Federal             | Ministerio das Cidades |
+      | Governo do DF              | GDF     | BR      | Distrito Federal    | Taguatinga | 12.645.166/0001-44 | Autarquia        | Legislativo        | Federal             | Governo do DF |
+      | Ministerio do Planejamento | MP      | BR      | Distrito Federal    | Brasilia   | 41.769.591/0001-43 | Autarquia        | Judiciario         | Federal             | Ministerio do Planejamento |
  
+	@selenium
   Scenario: Go to control panel when clicked on 'Complete your profile' link
     Given I am logged in as "joao"
     And I am on joao's control panel
     When I follow "Complete your profile"
     Then I should see "Profile settings for "
-    And I should see "Personal information"
  
   @selenium
   Scenario: Verify text information to use governmental e-mail
@@ -44,13 +47,12 @@ Feature: Institution Field
     Given I am logged in as "joao"
     And I am on joao's control panel
     When I follow "Edit Profile"
-    And I follow "Add new institution"
     And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
-    And I follow "Add new institution"
+    And I follow "Add institution"
     And I type in "Gover" in autocomplete list "#input_institution" and I choose "Governo do DF"
-    And I follow "Add new institution"
-    Then I should see "Ministerio do Planejamento" within ".institutions_added"
-    And I should see "Governo do DF" within ".institutions_added"
+    And I follow "Add institution"
+    Then I should see "Ministerio do Planejamento"
+    And I should see "Governo do DF"
  
   @selenium
   Scenario: Verify if field 'city' is shown when Brazil is selected
@@ -75,3 +77,14 @@ Feature: Institution Field
     And I fill in "input_institution" with "Some Nonexistent Institution"
     And I sleep for 1 seconds
     Then I should see "No institution found"
+
+  @selenium
+  Scenario: Does not suggest institution that already exists
+    Given I am logged in as "joao"
+    And I am on joao's control panel
+    When I follow "Edit Profile"
+    And I type in "Minis" in autocomplete list "#input_institution" and I choose "Ministerio do Planejamento"
+    And I follow "Add institution"
+    And I fill in "input_institution" with "Minis"
+    And I sleep for 1 seconds
+    Then I should not see "Ministerio do Planejamento" within "ul.ui-autocomplete"
@@ -6,7 +6,7 @@ OrganizationRating.class_eval do
  
   attr_accessible :institution, :institution_id
  
-  validate :verify_institution
+  validate :verify_institution, :verify_organization_rating_values
  
   private
  
@@ -18,4 +18,11 @@ OrganizationRating.class_eval do
     end
   end
  
+  def verify_organization_rating_values
+    if self.institution.nil? && (self.people_benefited || self.saved_value)
+      self.errors.add :institution, _("Report values cannot be saved without an institution")
+      false
+    end
+  end
+
 end
@@ -3,6 +3,7 @@ require_dependency &#39;search_controller&#39;
 class SearchController
  
   def communities
+    @titles[:communities] = _("Communities Search")
     delete_communities = []
     valid_communities_string = Community.get_valid_communities_string
     Community.all.each{|community| delete_communities << community.id unless eval(valid_communities_string)}
@@ -14,7 +15,7 @@ class SearchController
   end
  
   def institutions
-    @titles[:institutions] = _("Institution Catalog")
+    @titles[:institutions] = _("Institutions Search")
     results = filter_communities_list{|community| community.institution?}
     results = results.paginate(:per_page => 24, :page => params[:page])
     @searches[@asset] = {:results => results}
+#encoding: utf-8
+
 class Institution < ActiveRecord::Base
   has_many :comments
  
   SEARCH_FILTERS = {
-    :order => %w[],
+    :order => %w[more_recent more_popular more_active],
     :display => %w[compact]
   }
  
   CNPJ_FORMAT = /^\d{2}\.\d{3}\.\d{3}\/\d{4}\-\d{2}$/
  
+  VALID_STATES = { "AC"=>"Acre", "AL"=>"Alagoas", "AM"=>"Amazonas", "AP"=>"Amapá", "BA"=>"Bahia", "CE"=>"Ceará",
+                   "DF"=>"Distrito Federal", "ES"=>"Espírito Santo", "GO"=>"Goiás", "MA"=>"Maranhão", "MT"=>"Mato Grosso",
+                   "MS"=>"Mato Grosso do Sul", "MG"=>"Minas Gerais", "PA"=>"Pará", "PB"=>"Paraíba", "PR"=>"Paraná",
+                   "PE"=>"Pernambuco", "PI"=>"Piauí", "RJ"=>"Rio de Janeiro", "RN"=>"Rio Grande do Norte", "RO"=>"Rondônia",
+                   "RS"=>"Rio Grande do Sul", "RR"=>"Roraima", "SC"=>"Santa Catarina", "SE"=>"Sergipe", "SP"=>"São Paulo", "TO"=>"Tocantins" }
+
   def self.default_search_display
     'compact'
   end
@@ -31,8 +39,8 @@ class Institution &lt; ActiveRecord::Base
  
   belongs_to :community
  
-  scope :search_institution, lambda{ |value|
-    where("name ilike ? OR acronym ilike ?", "%#{value}%", "%#{value}%" )
+  scope :search_institution, lambda{ |value, env|
+    joins(:community).where("(profiles.name ilike ? OR institutions.acronym ilike ?) AND profiles.environment_id = ?", "%#{value}%", "%#{value}%", env.id)
   }
  
   validate :validate_country, :validate_state, :validate_city,
@@ -76,12 +84,12 @@ class Institution &lt; ActiveRecord::Base
   end
  
   def validate_state
-    unless self.community.blank?
-      if self.community.country == "BR" &&
-        (self.community.state.blank? || self.community.state == "-1") &&
-        self.errors[:state].blank?
-
-        self.errors.add(:state, _("can't be blank"))
+    if self.community.present? && self.community.country == "BR"
+      if self.community.state.blank?
+        self.errors.add(:state, _("can't be blank")) if self.errors[:state].blank?
+        return false
+      elsif !VALID_STATES.values.include?(self.community.state)
+        self.errors.add(:state, _("invalid state")) if self.errors[:state].blank?
         return false
       end
     end
 class PrivateInstitution < Institution
   validates :cnpj,
-            :presence=>true,
             :format => {with: CNPJ_FORMAT},
             :if => :is_a_brazilian_institution?
  
   validates :cnpj,
-            :uniqueness=>true, :unless => 'cnpj.blank?'
+            :uniqueness => true, :unless => 'cnpj.blank?'
  
   private
     def is_a_brazilian_institution?
 class PublicInstitution < Institution
   validates :governmental_power, :governmental_sphere, :juridical_nature,
-            :presence=>true
+            :presence=>true, :unless=>lambda{self.community.country != "BR"}
  
   validates :cnpj,
             :format => {with: CNPJ_FORMAT},
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.3.1-61-g25bc299\n"
-"POT-Creation-Date: 2016-01-07 13:00-0000\n"
+"Project-Id-Version: 1.3.1-64-g92ff843\n"
+"POT-Creation-Date: 2016-01-22 17:58-0000\n"
 "PO-Revision-Date: 2015-09-01 20:59-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,39 +17,77 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
-#: plugins/gov_user/test/unit/gov_user_person_test.rb:50
-#: plugins/gov_user/test/unit/gov_user_person_test.rb:56
-msgid "Name Should begin with a capital letter and no special characters"
-msgstr ""
-
-#: plugins/gov_user/controllers/gov_user_plugin_myprofile_controller.rb:28
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:181
+#: plugins/gov_user/controllers/gov_user_plugin_myprofile_controller.rb:30
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:183
 msgid "Could not find Governmental Power or Governmental Sphere"
 msgstr ""
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:137
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:80
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:139
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:78
 msgid "Select a Governmental Sphere"
 msgstr ""
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:142
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:87
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:144
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:85
 msgid "Select a Governmental Power"
 msgstr ""
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:147
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:93
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:149
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:91
 msgid "Select a Juridical Nature"
 msgstr ""
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:227
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:229
 msgid "Institution successful created!"
 msgstr ""
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:232
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:234
 msgid "Institution could not be created!"
 msgstr ""
  
+#: plugins/gov_user/test/unit/gov_user_person_test.rb:49
+#: plugins/gov_user/test/unit/gov_user_person_test.rb:55
+msgid "Name Should begin with a capital letter and no special characters"
+msgstr ""
+
+#: plugins/gov_user/lib/institution_modal_helper.rb:9
+msgid "Create new institution"
+msgstr ""
+
+#: plugins/gov_user/lib/institution_modal_helper.rb:55
+msgid "New Institution"
+msgstr ""
+
+#: plugins/gov_user/lib/institution.rb:58
+msgid "invalid, only public and private institutions are allowed."
+msgstr ""
+
+#: plugins/gov_user/lib/institution.rb:70
+#: plugins/gov_user/lib/institution.rb:84
+#: plugins/gov_user/lib/institution.rb:97
+msgid "can't be blank"
+msgstr ""
+
+#: plugins/gov_user/lib/institutions_block.rb:4
+#: plugins/gov_user/views/person_editor_extras.html.erb:2
+msgid "Institutions"
+msgstr ""
+
+#: plugins/gov_user/lib/institutions_block.rb:12
+msgid "{#} institution"
+msgid_plural "{#} institutions"
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/gov_user/lib/institutions_block.rb:16
+msgid "This block displays the institutions in which the user is a member."
+msgstr ""
+
+#: plugins/gov_user/lib/institutions_block.rb:24
+#: plugins/gov_user/lib/institutions_block.rb:30
+msgid "institutions|View all"
+msgstr ""
+
 #: plugins/gov_user/lib/gov_user_plugin.rb:21
 msgid "Add features related to Brazilian government."
 msgstr ""
@@ -64,67 +102,75 @@ msgid &quot;Institution Info&quot;
 msgstr ""
  
 #: plugins/gov_user/lib/gov_user_plugin.rb:331
-#: plugins/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb:4
 #: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:4
+#: plugins/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb:4
 msgid "Institution"
 msgstr ""
  
-#: plugins/gov_user/lib/institution.rb:58
-msgid "invalid, only public and private institutions are allowed."
+#: plugins/gov_user/lib/ext/organization_rating.rb:16
+msgid "institution not found"
 msgstr ""
  
-#: plugins/gov_user/lib/institution.rb:70
-#: plugins/gov_user/lib/institution.rb:84
-#: plugins/gov_user/lib/institution.rb:97
-msgid "can't be blank"
+#: plugins/gov_user/lib/ext/search_controller.rb:6
+msgid "Communities Search"
 msgstr ""
  
-#: plugins/gov_user/lib/ext/user.rb:19
-msgid "Email must be different from secondary email."
+#: plugins/gov_user/lib/ext/search_controller.rb:18
+msgid "Institutions Search"
 msgstr ""
  
-#: plugins/gov_user/lib/ext/user.rb:40
-msgid "E-mail or secondary e-mail already taken."
+#: plugins/gov_user/views/incomplete_registration.html.erb:3
+msgid "Complete Profile"
 msgstr ""
  
-#: plugins/gov_user/lib/ext/user.rb:50
-msgid "Invalid secondary email format."
+#: plugins/gov_user/views/incomplete_registration.html.erb:6
+msgid "Complete your profile"
 msgstr ""
  
-#: plugins/gov_user/lib/ext/search_controller.rb:17
-msgid "Institution Catalog"
+#: plugins/gov_user/views/incomplete_registration.html.erb:7
+msgid "Hide"
 msgstr ""
  
-#: plugins/gov_user/lib/ext/organization_rating.rb:16
-msgid "institution not found"
+#: plugins/gov_user/views/person_editor_extras.html.erb:6
+msgid "Add institution"
 msgstr ""
  
-#: plugins/gov_user/lib/institution_modal_helper.rb:9
-msgid "Create new institution"
+#: plugins/gov_user/views/person_editor_extras.html.erb:13
+msgid "No institution found"
 msgstr ""
  
-#: plugins/gov_user/lib/institution_modal_helper.rb:55
-msgid "New Institution"
+#: plugins/gov_user/views/person_editor_extras.html.erb:30
+msgid "Should begin with a capital letter and no special characters"
 msgstr ""
  
-#: plugins/gov_user/lib/institutions_block.rb:4
-#: plugins/gov_user/views/person_editor_extras.html.erb:11
-msgid "Institutions"
+#: plugins/gov_user/views/person_editor_extras.html.erb:31
+msgid "Email should have the following format: name@host.br"
 msgstr ""
  
-#: plugins/gov_user/lib/institutions_block.rb:12
-msgid "{#} institution"
-msgid_plural "{#} institutions"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/gov_user/views/person_editor_extras.html.erb:32
+msgid "Site should have a valid format: http://name.hosts"
+msgstr ""
  
-#: plugins/gov_user/lib/institutions_block.rb:16
-msgid "This block displays the institutions in which the user is a member."
+#: plugins/gov_user/views/person_editor_extras.html.erb:33
+msgid "If you work in a public agency use your government e-Mail"
 msgstr ""
  
-#: plugins/gov_user/lib/institutions_block.rb:24
-#: plugins/gov_user/lib/institutions_block.rb:30
-msgid "institutions|View all"
+#: plugins/gov_user/views/ratings_extra_field.html.erb:2
+msgid "Organization name or Enterprise name"
+msgstr ""
+
+#: plugins/gov_user/views/ratings_extra_field.html.erb:7
+msgid "No organization or company found"
+msgstr ""
+
+#: plugins/gov_user/views/ratings_extra_field.html.erb:8
+msgid "Add"
+msgstr ""
+
+#: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:9
+msgid ""
+"This institution already has an accepted rating. Accepting it will "
+"automatically update the saved value."
 msgstr ""
  
 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:1
@@ -144,175 +190,94 @@ msgstr &quot;&quot;
 msgid "\"Can`t create new Institution: #{flash[:errors].length} errors\""
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:28
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:23
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11
+msgid "The highlighted fields are mandatory"
+msgstr ""
+
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:32
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:51
 msgid "Public Institution"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:33
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:37
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:44
 msgid "Private Institution"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:40
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:67
-msgid "Institution name already exists"
-msgstr ""
-
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:43
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62
 msgid "Corporate Name"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:45
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:69
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:71
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:119
+msgid "Fantasy name"
+msgstr ""
+
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:47
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79
 msgid "Country"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:53
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:51
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:88
 msgid "State"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:63
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:61
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:109
 msgid "CNPJ"
 msgstr ""
  
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:68
 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:70
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:72
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:118
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:120
 msgid "Acronym"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:71
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:71
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:119
-msgid "Fantasy name"
-msgstr ""
-
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:79
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:77
 #: plugins/gov_user/views/profile/_institution_tab.html.erb:17
 msgid "Governmental Sphere:"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:86
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:84
 #: plugins/gov_user/views/profile/_institution_tab.html.erb:16
 msgid "Governmental Power:"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:92
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:90
 #: plugins/gov_user/views/profile/_institution_tab.html.erb:18
 msgid "Juridical Nature:"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:99
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:97
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:164
 msgid "SISP?"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:101
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:99
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:169
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
 msgid "Yes"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:103
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:106
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:101
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:104
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:174
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
 msgid "No"
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:111
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:109
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:184
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:187
 msgid "Save"
 msgstr ""
  
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:3
-msgid "Institution Information"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:6
-msgid "Type:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:7
-msgid "CNPJ:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:8
-msgid "Last modification:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:9
-msgid "Country:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:10
-msgid "State:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:11
-msgid "City:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:13
-msgid "Fantasy Name:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:15
-msgid "Acronym:"
-msgstr ""
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
-msgid "SISP:"
-msgstr ""
-
-#: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:9
-msgid ""
-"This institution already has an accepted rating. Accepting it will "
-"automatically update the saved value."
-msgstr ""
-
-#: plugins/gov_user/views/ratings_extra_field.html.erb:2
-msgid "Organization name or Enterprise name"
-msgstr ""
-
-#: plugins/gov_user/views/ratings_extra_field.html.erb:7
-msgid "No organization or company found"
-msgstr ""
-
-#: plugins/gov_user/views/ratings_extra_field.html.erb:8
-msgid "Add"
-msgstr ""
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:2
-msgid "Secondary e-mail"
-msgstr ""
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:21
-msgid "No institution found"
-msgstr ""
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:38
-msgid "Should begin with a capital letter and no special characters"
-msgstr ""
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:39
-msgid "Email should have the following format: name@host.br"
-msgstr ""
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:40
-msgid "Site should have a valid format: http://name.hosts"
-msgstr ""
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:41
-msgid "If you work in a public agency use your government e-Mail"
-msgstr ""
-
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:5
 msgid ""
 "Note that the creation of institutions in this environment is restricted. "
@@ -321,14 +286,14 @@ msgid &quot;&quot;
 "and criteria."
 msgstr ""
  
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11
-msgid "The highlighted fields are mandatory"
-msgstr ""
-
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:23
 msgid "\"<b>#{key_name.capitalize}</b> #{value.join()}\""
 msgstr ""
  
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:67
+msgid "Institution name already exists"
+msgstr ""
+
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:83
 msgid "Select a country"
 msgstr ""
@@ -366,14 +331,42 @@ msgstr &quot;&quot;
 msgid "Type words about the %s you're looking for"
 msgstr ""
  
-#: plugins/gov_user/views/incomplete_registration.html.erb:3
-msgid "Complete Profile"
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:3
+msgid "Institution Information"
 msgstr ""
  
-#: plugins/gov_user/views/incomplete_registration.html.erb:6
-msgid "Complete your profile"
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:6
+msgid "Type:"
 msgstr ""
  
-#: plugins/gov_user/views/incomplete_registration.html.erb:7
-msgid "Hide"
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:7
+msgid "CNPJ:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:8
+msgid "Last modification:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:9
+msgid "Country:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:10
+msgid "State:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:11
+msgid "City:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:13
+msgid "Fantasy Name:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:15
+msgid "Acronym:"
+msgstr ""
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
+msgid "SISP:"
 msgstr ""
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.3.1-61-g25bc299\n"
-"POT-Creation-Date: 2016-01-07 13:00-0000\n"
+"Project-Id-Version: 1.3.1-64-g92ff843\n"
+"POT-Creation-Date: 2016-01-22 17:58-0000\n"
 "PO-Revision-Date: 2015-09-01 19:55-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,58 +16,47 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
  
-#: plugins/gov_user/test/unit/gov_user_person_test.rb:50
-#: plugins/gov_user/test/unit/gov_user_person_test.rb:56
-msgid "Name Should begin with a capital letter and no special characters"
-msgstr ""
-"Nome deve iniciar com letrar maiúscula e não deve conter carateres especiais"
-
-#: plugins/gov_user/controllers/gov_user_plugin_myprofile_controller.rb:28
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:181
+#: plugins/gov_user/controllers/gov_user_plugin_myprofile_controller.rb:30
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:183
 msgid "Could not find Governmental Power or Governmental Sphere"
 msgstr "Não foi possível encontrar o Poder ou Esfera Governamental"
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:137
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:80
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:139
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:78
 msgid "Select a Governmental Sphere"
 msgstr "Selecione uma Esfera Governamental"
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:142
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:87
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:144
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:85
 msgid "Select a Governmental Power"
 msgstr "Selecione um Poder Governamental"
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:147
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:93
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:149
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:91
 msgid "Select a Juridical Nature"
 msgstr "Seleciona uma Natureza Jurídica"
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:227
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:229
 msgid "Institution successful created!"
 msgstr "Instituição criada com sucesso!"
  
-#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:232
+#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:234
 msgid "Institution could not be created!"
 msgstr "Instituição não pode ser criada!"
  
-#: plugins/gov_user/lib/gov_user_plugin.rb:21
-msgid "Add features related to Brazilian government."
-msgstr "Adicionar funcionlidade relacionada com o governo brasileiro."
-
-#: plugins/gov_user/lib/gov_user_plugin.rb:134
-#: plugins/gov_user/lib/gov_user_plugin.rb:166
-msgid "Create Institution"
-msgstr "Criar Instituição"
+#: plugins/gov_user/test/unit/gov_user_person_test.rb:49
+#: plugins/gov_user/test/unit/gov_user_person_test.rb:55
+msgid "Name Should begin with a capital letter and no special characters"
+msgstr ""
+"Nome deve iniciar com letra maiúscula e não deve conter carateres especiais"
  
-#: plugins/gov_user/lib/gov_user_plugin.rb:306
-msgid "Institution Info"
-msgstr "Informações da Instituição"
+#: plugins/gov_user/lib/institution_modal_helper.rb:9
+msgid "Create new institution"
+msgstr "Criar nova instituição"
  
-#: plugins/gov_user/lib/gov_user_plugin.rb:331
-#: plugins/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb:4
-#: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:4
-msgid "Institution"
-msgstr "Instituição"
+#: plugins/gov_user/lib/institution_modal_helper.rb:55
+msgid "New Institution"
+msgstr "Nova Instituição"
  
 #: plugins/gov_user/lib/institution.rb:58
 msgid "invalid, only public and private institutions are allowed."
@@ -79,36 +68,8 @@ msgstr &quot;Inválido, somente instituições públicas e privadas são permitidas.&quot;
 msgid "can't be blank"
 msgstr "não pode ficar em branco"
  
-#: plugins/gov_user/lib/ext/user.rb:19
-msgid "Email must be different from secondary email."
-msgstr "Email deve ser diferente do email secundário"
-
-#: plugins/gov_user/lib/ext/user.rb:40
-msgid "E-mail or secondary e-mail already taken."
-msgstr "Email ou email secundário já estão sendo utilizados."
-
-#: plugins/gov_user/lib/ext/user.rb:50
-msgid "Invalid secondary email format."
-msgstr "Formato inválido do email sencundário"
-
-#: plugins/gov_user/lib/ext/search_controller.rb:17
-msgid "Institution Catalog"
-msgstr "Catálogo de Instituições"
-
-#: plugins/gov_user/lib/ext/organization_rating.rb:16
-msgid "institution not found"
-msgstr "Nenhuma instituição encontrada"
-
-#: plugins/gov_user/lib/institution_modal_helper.rb:9
-msgid "Create new institution"
-msgstr "Criar nova instituição"
-
-#: plugins/gov_user/lib/institution_modal_helper.rb:55
-msgid "New Institution"
-msgstr "Nova Instituição"
-
 #: plugins/gov_user/lib/institutions_block.rb:4
-#: plugins/gov_user/views/person_editor_extras.html.erb:11
+#: plugins/gov_user/views/person_editor_extras.html.erb:2
 msgid "Institutions"
 msgstr "Instituições"
  
@@ -127,6 +88,93 @@ msgstr &quot;Esse bloco mostra as instituições em que o usuário faz parte.&quot;
 msgid "institutions|View all"
 msgstr "instituições|Ver todas"
  
+#: plugins/gov_user/lib/gov_user_plugin.rb:21
+msgid "Add features related to Brazilian government."
+msgstr "Adicionar funcionalidade relacionada com o governo brasileiro."
+
+#: plugins/gov_user/lib/gov_user_plugin.rb:134
+#: plugins/gov_user/lib/gov_user_plugin.rb:166
+msgid "Create Institution"
+msgstr "Criar Instituição"
+
+#: plugins/gov_user/lib/gov_user_plugin.rb:306
+msgid "Institution Info"
+msgstr "Informações da Instituição"
+
+#: plugins/gov_user/lib/gov_user_plugin.rb:331
+#: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:4
+#: plugins/gov_user/views/organization_ratings_container_extra_fields_show_institution.html.erb:4
+msgid "Institution"
+msgstr "Instituição"
+
+#: plugins/gov_user/lib/ext/organization_rating.rb:16
+msgid "institution not found"
+msgstr "Nenhuma instituição encontrada"
+
+#: plugins/gov_user/lib/ext/search_controller.rb:6
+msgid "Communities Search"
+msgstr "Buscar Comunidades"
+
+#: plugins/gov_user/lib/ext/search_controller.rb:18
+msgid "Institutions Search"
+msgstr "Buscar Instituições"
+
+#: plugins/gov_user/views/incomplete_registration.html.erb:3
+msgid "Complete Profile"
+msgstr "Complete o Perfil"
+
+#: plugins/gov_user/views/incomplete_registration.html.erb:6
+msgid "Complete your profile"
+msgstr "Complete seu perfil"
+
+#: plugins/gov_user/views/incomplete_registration.html.erb:7
+msgid "Hide"
+msgstr "Ocultar"
+
+#: plugins/gov_user/views/person_editor_extras.html.erb:6
+msgid "Add institution"
+msgstr "Adicionar instituição"
+
+#: plugins/gov_user/views/person_editor_extras.html.erb:13
+msgid "No institution found"
+msgstr "Nenhuma instituição encontrada"
+
+#: plugins/gov_user/views/person_editor_extras.html.erb:30
+msgid "Should begin with a capital letter and no special characters"
+msgstr "Deve começar com letra maíscula e não conter caracteres especiais"
+
+#: plugins/gov_user/views/person_editor_extras.html.erb:31
+msgid "Email should have the following format: name@host.br"
+msgstr "Email deve ter o seguinte formato: name@host.br"
+
+#: plugins/gov_user/views/person_editor_extras.html.erb:32
+msgid "Site should have a valid format: http://name.hosts"
+msgstr "Site deve ter um formato válido: http://name.hosts"
+
+#: plugins/gov_user/views/person_editor_extras.html.erb:33
+msgid "If you work in a public agency use your government e-Mail"
+msgstr "Se você trabalha em uma agência pública use seu email governamental"
+
+#: plugins/gov_user/views/ratings_extra_field.html.erb:2
+msgid "Organization name or Enterprise name"
+msgstr "Nome da organização ou empresa"
+
+#: plugins/gov_user/views/ratings_extra_field.html.erb:7
+msgid "No organization or company found"
+msgstr "Nenhum orgão ou empresa encontrados"
+
+#: plugins/gov_user/views/ratings_extra_field.html.erb:8
+msgid "Add"
+msgstr "Adicionar"
+
+#: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:9
+msgid ""
+"This institution already has an accepted rating. Accepting it will "
+"automatically update the saved value."
+msgstr ""
+"* Você já aprovou uma avaliação desse órgão/empresa. Ao aceitar este relato, "
+"o novo valor será adicionado."
+
 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:1
 msgid "Edit Institution"
 msgstr "Editar Instituição"
@@ -149,177 +197,94 @@ msgid &quot;\&quot;Can`t create new Institution: #{flash[:errors].length} errors\&quot;&quot;
 msgstr ""
 "\"Não foi possível criar nova Instituição: #{flash[:errors].length} erros\""
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:28
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:23
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11
+msgid "The highlighted fields are mandatory"
+msgstr "Todos os campos com (*) são obrigatórios"
+
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:32
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:51
 msgid "Public Institution"
 msgstr "Instituição Pública"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:33
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:37
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:44
 msgid "Private Institution"
 msgstr "Instituição Privada"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:40
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:67
-msgid "Institution name already exists"
-msgstr "Nome de Instituição já existe"
-
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:43
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62
 msgid "Corporate Name"
 msgstr "Razão Social"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:45
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:69
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:71
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:119
+msgid "Fantasy name"
+msgstr "Nome Fantasia"
+
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:47
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79
 msgid "Country"
 msgstr "País"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:53
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:51
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:88
 msgid "State"
 msgstr "Estado"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:63
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:61
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:109
 msgid "CNPJ"
 msgstr "CNPJ"
  
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:68
 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:70
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:72
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:118
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:120
 msgid "Acronym"
 msgstr "Sigla"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:71
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:71
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:119
-msgid "Fantasy name"
-msgstr "Nome Fantasia"
-
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:79
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:77
 #: plugins/gov_user/views/profile/_institution_tab.html.erb:17
 msgid "Governmental Sphere:"
 msgstr "Esfera Governamental:"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:86
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:84
 #: plugins/gov_user/views/profile/_institution_tab.html.erb:16
 msgid "Governmental Power:"
 msgstr "Poder Governamental:"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:92
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:90
 #: plugins/gov_user/views/profile/_institution_tab.html.erb:18
 msgid "Juridical Nature:"
 msgstr "Natureza Jurídica:"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:99
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:97
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:164
 msgid "SISP?"
 msgstr "SISP?"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:101
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:99
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:169
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
 msgid "Yes"
 msgstr "Sim"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:103
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:106
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:101
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:104
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:174
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
 msgid "No"
 msgstr "Não"
  
-#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:111
+#: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:109
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:184
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:187
 msgid "Save"
 msgstr "Salvar"
  
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:3
-msgid "Institution Information"
-msgstr "Informação da Instituição"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:6
-msgid "Type:"
-msgstr "Tipo:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:7
-msgid "CNPJ:"
-msgstr "CNPJ:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:8
-msgid "Last modification:"
-msgstr "Última modificação:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:9
-msgid "Country:"
-msgstr "País:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:10
-msgid "State:"
-msgstr "Estado:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:11
-msgid "City:"
-msgstr "Cidade:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:13
-msgid "Fantasy Name:"
-msgstr "Nome Fantasia:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:15
-msgid "Acronym:"
-msgstr "Sigla:"
-
-#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
-msgid "SISP:"
-msgstr "SISP:"
-
-#: plugins/gov_user/views/organization_ratings_task_extra_fields_show_institution.html.erb:9
-msgid ""
-"This institution already has an accepted rating. Accepting it will "
-"automatically update the saved value."
-msgstr ""
-"* Você já aprovou uma avaliação desse órgão/empresa. Ao aceitar este relato, "
-"o novo valor será adicionado."
-
-#: plugins/gov_user/views/ratings_extra_field.html.erb:2
-msgid "Organization name or Enterprise name"
-msgstr "Nome da organização ou empresa"
-
-#: plugins/gov_user/views/ratings_extra_field.html.erb:7
-msgid "No organization or company found"
-msgstr "Nenhum orgão ou empresa encontrados"
-
-#: plugins/gov_user/views/ratings_extra_field.html.erb:8
-msgid "Add"
-msgstr "Adicionar"
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:2
-msgid "Secondary e-mail"
-msgstr "Email secundário"
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:21
-msgid "No institution found"
-msgstr "Nenhuma instituição encontrada"
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:38
-msgid "Should begin with a capital letter and no special characters"
-msgstr "Deve começar com letra maíscula e não conter caracteres especiais"
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:39
-msgid "Email should have the following format: name@host.br"
-msgstr "Email deve ter o seguinte formato: name@host.br"
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:40
-msgid "Site should have a valid format: http://name.hosts"
-msgstr "Site deve ter um formato válido: http://name.hosts"
-
-#: plugins/gov_user/views/person_editor_extras.html.erb:41
-msgid "If you work in a public agency use your government e-Mail"
-msgstr "Se você trabalha em uma agência pública use seu email governamental"
-
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:5
 msgid ""
 "Note that the creation of institutions in this environment is restricted. "
@@ -332,14 +297,14 @@ msgstr &quot;&quot;
 "%{environment} e será aprovada ou rejeitada de acordo com seus métodos e "
 "critérios."
  
-#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11
-msgid "The highlighted fields are mandatory"
-msgstr "Todos os campos com (*) são obrigatórios"
-
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:23
 msgid "\"<b>#{key_name.capitalize}</b> #{value.join()}\""
 msgstr "\"<b>#{key_name.capitalize}</b> #{value.join()}\""
  
+#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:67
+msgid "Institution name already exists"
+msgstr "Nome de Instituição já existe"
+
 #: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:83
 msgid "Select a country"
 msgstr "Selecione um Estado"
@@ -377,17 +342,60 @@ msgstr &quot;Criar instituição&quot;
 msgid "Type words about the %s you're looking for"
 msgstr "Escreve palavras sobre o %s que você está procurando"
  
-#: plugins/gov_user/views/incomplete_registration.html.erb:3
-msgid "Complete Profile"
-msgstr "Complete o Perfil"
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:3
+msgid "Institution Information"
+msgstr "Informação da Instituição"
  
-#: plugins/gov_user/views/incomplete_registration.html.erb:6
-msgid "Complete your profile"
-msgstr "Complete seu perfil"
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:6
+msgid "Type:"
+msgstr "Tipo:"
  
-#: plugins/gov_user/views/incomplete_registration.html.erb:7
-msgid "Hide"
-msgstr "Ocultar"
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:7
+msgid "CNPJ:"
+msgstr "CNPJ:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:8
+msgid "Last modification:"
+msgstr "Última modificação:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:9
+msgid "Country:"
+msgstr "País:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:10
+msgid "State:"
+msgstr "Estado:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:11
+msgid "City:"
+msgstr "Cidade:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:13
+msgid "Fantasy Name:"
+msgstr "Nome Fantasia:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:15
+msgid "Acronym:"
+msgstr "Sigla:"
+
+#: plugins/gov_user/views/profile/_institution_tab.html.erb:19
+msgid "SISP:"
+msgstr "SISP:"
+
+#~ msgid "Email must be different from secondary email."
+#~ msgstr "Email deve ser diferente do email secundário"
+
+#~ msgid "E-mail or secondary e-mail already taken."
+#~ msgstr "Email ou email secundário já estão sendo utilizados."
+
+#~ msgid "Invalid secondary email format."
+#~ msgstr "Formato inválido do email sencundário"
+
+#~ msgid "Institution Catalog"
+#~ msgstr "Catálogo de Instituições"
+
+#~ msgid "Secondary e-mail"
+#~ msgstr "Email secundário"
  
 #~ msgid "SISP ?"
 #~ msgstr "SISP ?"
@@ -401,9 +409,6 @@ msgstr &quot;Ocultar&quot;
 #~ msgid "not found"
 #~ msgstr "não encontrada"
  
-#~ msgid "Add new institution"
-#~ msgstr "Adicionar nova instituição"
-
 #~ msgid "A plugin that does this and that."
 #~ msgstr "Um plugin que faz isso e aquilo"
  
@@ -33,3 +33,7 @@
 #create_institution_link {
   margin-left: 8px;
 }
+
+#add_institution_link {
+  display: none;
+}
@@ -29,6 +29,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     $(".public-institutions-fields").hide();
     $("#institutions_governmental_power option").selected(0);
     $("#institutions_governmental_sphere option").selected(0);
+    $("#institutions_juridical_nature option").selected(0);
     $("#cnpj_required_field_mark").html("(*)");
   }
  
@@ -201,12 +202,13 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
         $.ajax({
           type: "GET",
           url: AJAX_URL.get_institutions,
-          data: {query: request.term},
+          data: {query: request.term, selected_institutions: get_selected_institutions()},
           success: function(result){
             response(result);
  
             if( result.length === 0 ) {
               $('#institution_empty_ajax_message').switchClass("hide-field", "show-field");
+              $('#add_institution_link').hide();
               toggle_extra_fields_style_status(true);
               $("#institution_modal").css({display: "none"});
             }
@@ -221,12 +223,22 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
  
       select : function (event, selected) {
         $('#institution_empty_ajax_message').switchClass("show-field", "hide-field");
-        //$("#create_institution_link").remove();
+        $('#add_institution_link').show();
         toggle_extra_fields_style_status(false);
         $("#institution_selected").val(selected.item.id).attr("data-name", selected.item.label);
       }
     });
   }
+
+  function get_selected_institutions() {
+    var selected_institutions = []
+    $('.institutions_added').find('li').each(function() {
+      selected_institutions.push($(this).attr('data-institution'));
+    });
+
+    return selected_institutions;
+  }
+
   function add_selected_institution_to_list(id, name) {
     var selected_institution = "<li data-institution='"+id+"'>"+name;
         selected_institution += "<a href='#' class='button without-text icon-remove remove-institution'></a></li>";
@@ -245,6 +257,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
  
       // Visualy add the selected institution to the list
       add_selected_institution_to_list(selected.val(), selected.attr("data-name"));
+      $(this).hide();
  
       // clean the institution flag
       selected.val("").attr("data-name", "");
@@ -270,25 +283,33 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
  
  
   function show_hide_cnpj_city(country) {
-    var cnpj = $("#institutions_cnpj").parent();
-    var city = $("#community_city").parent();
-    var state = $("#community_state").parent();
+    var cnpj = $("#institutions_cnpj").parent().parent();
+    var city = $("#community_city");
+    var city_label = $('label[for="community_city"]');
+    var state = $("#community_state");
+    var state_label = $('label[for="community_state"]');
     var inst_type = $("input[name='institutions[type]']:checked").val();
  
-    institution_type_actions(inst_type);
-
     if ( country === "-1" ) {
       $("#community_country").val("BR");
       country = "BR";
     }
  
+    institution_type_actions(inst_type);
+
     if ( country !== "BR" ) {
       cnpj.hide();
+      city.val('');
       city.hide();
+      city_label.hide();
+      state.val("");
       state.hide();
+      state_label.hide();
     } else {
       cnpj.show();
       city.show();
+      city_label.show();
+      state_label.show();
       state.show();
     }
   }
@@ -302,30 +323,6 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     }
   }
  
-
-  function set_form_count_custom_data() {
-    var divisor_option = SelectElement.generateOption("-1", "--------------------------------");
-    var default_option = SelectElement.generateOption("BR", "Brazil");
-
-
-    var inst_type = $("input[name='institutions[type]']:checked").val();
-    var country = $("#community_country").val();
-
-    institution_type_actions(inst_type);
-    show_hide_cnpj_city(country);
-
-    if( $('#community_country').find("option[value='']").length === 1 ) {
-      $('#community_country').find("option[value='']").remove();
-      $('#community_country').prepend(divisor_option);
-      $('#community_country').prepend(default_option);
-
-      if($("#edit_institution_page").val() === "false") {
-        $('#community_country').val("BR");
-        show_hide_cnpj_city($('#community_country').val());
-      }
-    }
-  }
-
   function autoCompleteCity() {
     var country_selected = $('#community_country').val();
  
@@ -368,14 +365,14 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function set_events() {
     $("input[name='institutions[type]']").click(function(){
       institution_type_actions(this.value);
-    }).trigger("click");
+    });
  
     $('#save_institution_button').click(save_institution);
     $('#cancel_institution_button').click(cancel_institution);
  
     $("#community_name").keyup(institution_already_exists);
  
-    $("#add_new_institution").click(add_new_institution);
+    $("#add_institution_link").click(add_new_institution);
  
     $(".remove-institution").click(remove_institution);
  
@@ -397,7 +394,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
  
  
   function init_module() {
-    set_form_count_custom_data();
+    show_hide_cnpj_city($('#community_country').val());
     set_events();
   }
  
@@ -2,11 +2,6 @@
  
 modulejs.define("NewCommunity", ['jquery'], function($) {
  
-  function replace_mandatory_message() {
-    $(".required-field").first()
-    .replaceWith("<span class='required-field'> Os campos em destaque<label class='pseudoformlabel'> (*)</label> são obrigatórios. </span>");
-  }
-
   function remove_image_builder_text() {
     $("label:contains('Image builder')").hide();
   }
@@ -22,7 +17,6 @@ modulejs.define(&quot;NewCommunity&quot;, [&#39;jquery&#39;], function($) {
     },
  
     init: function() {
-      replace_mandatory_message();
       remove_image_builder_text();
       hide_organization_template_fields();
     }
@@ -9,7 +9,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
   def setup
     @admin = create_user("adminuser").person
     @admin.stubs(:has_permission?).returns("true")
-    @controller.stubs(:current_user).returns(@admin.user)
+    login_as(@admin.user_login)
  
     @environment = Environment.default
     @environment.enabled_plugins = ['SoftwareCommunitiesPlugin']
@@ -26,7 +26,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       @juridical_nature,
       @gov_power,
@@ -37,7 +37,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
       "Tribunal Regional da Uniao",
       "TRU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       @juridical_nature,
       @gov_power,
@@ -68,8 +68,8 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
  
     json_response = ActiveSupport::JSON.decode(@response.body)
  
-    assert_equal "Ministerio Publico da Uniao", json_response[0]["value"]
-    assert_equal "Tribunal Regional da Uniao", json_response[1]["value"]
+    assert json_response.any?{|r| r["value"] == "Ministerio Publico da Uniao"}
+    assert json_response.any?{|r| r["value"] == "Tribunal Regional da Uniao"}
   end
  
   should "method create_institution return the html for modal" do
@@ -84,7 +84,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "foo bar",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "12.234.567/8900-10",
       "PublicInstitution"
@@ -100,13 +100,13 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     assert json_response["success"]
   end
  
-  should "create a institution without cnpj" do
+  should "not create a private institution without cnpj" do
     @controller.stubs(:verify_recaptcha).returns(true)
  
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "",
       "PrivateInstitution"
@@ -114,6 +114,28 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields[:institutions][:acronym] = "SPI"
  
     xhr :get, :new_institution, fields
+    json_response = ActiveSupport::JSON.decode(@response.body)
+
+    assert_equal false, json_response["success"]
+    assert_equal false, json_response["errors"].blank?
+  end
+
+  should "create public institution without cnpj" do
+    @controller.stubs(:verify_recaptcha).returns(true)
+
+    fields = InstitutionTestHelper.generate_form_fields(
+      "Some Private Institution",
+      "BR",
+      "Distrito Federal",
+      "Brasilia",
+      "56.366.790/0001-88",
+      "PublicInstitution"
+    )
+    fields[:institutions][:governmental_power] = @gov_power.id
+    fields[:institutions][:governmental_sphere] = @gov_sphere.id
+    fields[:institutions][:juridical_nature] = @juridical_nature.id
+
+    xhr :get, :new_institution, fields
  
     json_response = ActiveSupport::JSON.decode(@response.body)
  
@@ -144,7 +166,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "12.345.567/8900-10",
       "PrivateInstitution"
@@ -162,7 +184,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Some Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "56.366.790/0001-88",
       "PrivateInstitution"
@@ -221,7 +243,7 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     fields = InstitutionTestHelper.generate_form_fields(
       "Private Institution",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       "12.323.557/8900-10",
       "PrivateInstitution"
@@ -233,4 +255,28 @@ class GovUserPluginControllerTest &lt; ActionController::TestCase
     assert(Institution.last.community.is_admin?(admin2) )
   end
  
+  should "admin user can access action create_institution_admin" do
+    login_as(@admin.user_login)
+
+    post :create_institution_admin
+
+    assert_response 200
+  end
+
+  should "disconnected user can not access action create_institution_admin" do
+    logout
+
+    post :create_institution_admin
+
+    assert_response 403
+  end
+
+  should "regular user can not access action create_institution_admin" do
+    disconnected_user = create_user("another_admin").person
+    login_as(disconnected_user.user_login)
+
+    post :create_institution_admin
+
+    assert_response 403
+  end
 end
@@ -18,34 +18,35 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     @offer_1 = create_user('Ana de Souza')
     @offer_2 = create_user('Angelo Roberto')
  
-    login_as(@person.user_login)
-    @environment = Environment.default
-    @environment.enable_plugin('GovUserPlugin')
-    @environment.save!
-  end
-  should "user edit its community institution" do
-    govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
+    gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
     juridical_nature = JuridicalNature.create(:name => "Autarquia")
-
-    institution = InstitutionTestHelper.create_public_institution(
+    @institution = InstitutionTestHelper.create_public_institution(
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       juridical_nature,
-      govPower,
-      govSphere,
+      gov_power,
+      gov_sphere,
       "12.345.678/9012-45"
     )
  
-    identifier = institution.community.identifier
+    login_as(@person.user_login)
+    @environment = Environment.default
+    @environment.enable_plugin('GovUserPlugin')
+    @environment.save!
+  end
+
+  should "admin user edit an institution" do
+    @institution.community.add_admin @person
+    identifier = @institution.community.identifier
  
     fields = InstitutionTestHelper.generate_form_fields(
       "institution new name",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       "12.345.678/9012-45",
       "PrivateInstitution"
@@ -53,7 +54,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
  
     post(
       :edit_institution,
-      :profile=>institution.community.identifier,
+      :profile=>@institution.community.identifier,
       :community=>fields[:community],
       :institutions=>fields[:institutions]
     )
@@ -62,29 +63,35 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_not_equal "Ministerio Publico da Uniao", institution.community.name
   end
  
-  should "not user edit its community institution with wrong values" do
-    govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    juridical_nature = JuridicalNature.create(:name => "Autarquia")
-
-    institution = InstitutionTestHelper.create_public_institution(
-      "Ministerio Publico da Uniao",
-      "MPU",
+  should "regular user should not edit an institution" do
+    identifier = @institution.community.identifier
+    fields = InstitutionTestHelper.generate_form_fields(
+      "institution new name",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
-      juridical_nature,
-      govPower,
-      govSphere,
-      "12.345.678/9012-45"
+      "12.345.678/9012-45",
+      "PrivateInstitution"
+    )
+
+    post(
+      :edit_institution,
+      :profile=>@institution.community.identifier,
+      :community=>fields[:community],
+      :institutions=>fields[:institutions]
     )
  
-    identifier = institution.community.identifier
+    institution = Community[identifier].institution
+    assert_equal "Ministerio Publico da Uniao", institution.community.name
+    assert_response 403
+  end
  
+  should "not user edit its community institution with wrong values" do
+    identifier = @institution.community.identifier
     fields = InstitutionTestHelper.generate_form_fields(
       "",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       "6465465465",
       "PrivateInstitution"
@@ -92,7 +99,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
  
     post(
       :edit_institution,
-      :profile=>institution.community.identifier,
+      :profile=>@institution.community.identifier,
       :community=>fields[:community],
       :institutions=>fields[:institutions]
     )
@@ -38,7 +38,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Gama",
       @juridical_nature,
       @govPower,
@@ -50,7 +50,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
       "Tribunal Regional da Uniao",
       "TRU",
       "BR",
-      "DF",
+      "Distrito Federal",
       "Brasilia",
       @juridical_nature,
       @govPower,
@@ -14,7 +14,6 @@ class SoftwareCommunitiesPluginPersonTest &lt; ActiveSupport::TestCase
                 "My Name",
                 "user@email.com",
                 "123456",
-                "123456",
                 "user2@email.com",
                 "Any State",
                 "Some City"
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserPlugin::ApiTest < ActiveSupport::TestCase
+
+  include PluginTestHelper
+
+  def setup
+    login_api
+    environment = Environment.default
+    environment.enable_plugin(GovUserPlugin)
+    @gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
+    @gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    @juridical_nature = JuridicalNature.create(:name => "Autarquia")
+    @institution = create_public_institution(
+                      "Ministerio Publico da Uniao",
+                      "MPU",
+                      "BR",
+                      "Distrito Federal",
+                      "Gama",
+                      @juridical_nature,
+                      @gov_power,
+                      @gov_sphere,
+                      "11.222.333/4444-55")
+  end
+
+  should 'list all institutions' do
+    @institution1 = create_public_institution(
+                      "Instituicao bacana",
+                      "IB",
+                      "BR",
+                      "Distrito Federal",
+                      "Gama",
+                      @juridical_nature,
+                      @gov_power,
+                      @gov_sphere,
+                      "11.222.333/4444-56"
+                    )
+
+    get "/api/v1/gov_user/institutions?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equivalent [@institution.id, @institution1.id], json['institutions'].map {|c| c['id']}
+  end
+
+  should 'get institution by id' do
+    get "/api/v1/gov_user/institutions/#{@institution.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal @institution.id, json["institution"]["id"]
+  end
+
+end
@@ -12,7 +12,7 @@ class InstitutionTest &lt; ActiveSupport::TestCase
                       "Ministerio Publico da Uniao",
                       "MPU",
                       "BR",
-                      "DF",
+                      "Distrito Federal",
                       "Gama",
                       @juridical_nature,
                       @gov_power,
@@ -27,30 +27,31 @@ class InstitutionTest &lt; ActiveSupport::TestCase
     JuridicalNature.destroy_all
     @institution = nil
   end
+
   should "not save institutions without name" do
     @institution.name = nil
     assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("Name can't be blank")
+    assert_equal true, @institution.errors.messages.keys.include?(:name)
   end
  
   should "not save if institution has invalid type" do
     invalid_msg = "Type invalid, only public and private institutions are allowed."
     @institution.type = "Other type"
     assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?(invalid_msg)
+    assert_equal true, @institution.errors.messages.keys.include?(:type)
   end
  
   should "not save without country" do
     @institution.community.country = nil
     assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("Country can't be blank")
+    assert_equal true, @institution.errors.messages.keys.include?(:country)
   end
  
   should "not save without state" do
     @institution.community.state = nil
  
     assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("State can't be blank")
+    assert_equal true, @institution.errors.messages.keys.include?(:state)
   end
  
   should "not save without city" do
@@ -58,6 +59,18 @@ class InstitutionTest &lt; ActiveSupport::TestCase
     @institution.community.state = "DF"
  
     assert_equal false, @institution.save
-    assert_equal true, @institution.errors.full_messages.include?("City can't be blank")
+    assert_equal true, @institution.errors.messages.keys.include?(:city)
+  end
+
+  should "only return institutions of a specific environment" do
+    env1 = Environment.create(:name => "Environment One")
+    env2 = Environment.create(:name => "Environment Two")
+
+    env1.communities << @institution.community
+    search_result_env1 = Institution.search_institution("Ministerio", env1).collect{ |i| i.id }
+    search_result_env2 = Institution.search_institution("Ministerio", env2).collect{ |i| i.id }
+
+    assert_includes search_result_env1, @institution.id
+    assert_not_includes search_result_env2, @institution.id
   end
 end
@@ -10,21 +10,49 @@ class OrganizationRatingTest &lt; ActiveSupport::TestCase
     @environment.save
   end
  
-  should "validate institution if there is an institution_id" do
+  should "not validate organization rating if the institution is not saved" do
     person = fast_create(Person)
     community = fast_create(Community)
-    private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
  
+    private_institution = build_private_institution "Some Institution", "Some Inst Incorporated", "11.222.333/4444-55"
     community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
+
     assert_equal false, community_rating.valid?
+    assert_equal true, community_rating.errors.messages.keys.include?(:institution)
+  end
  
-    assert_equal true, community_rating.errors[:institution].include?("not found")
+  should "validate organization rating if the institution is saved" do
+    person = fast_create(Person)
+    community = fast_create(Community)
  
+    private_institution = build_private_institution "Some Institution", "Some Inst Incorporated", "11.222.333/4444-55"
+    community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => private_institution)
     private_institution.save
-    community_rating.institution = private_institution
  
     assert_equal true, community_rating.valid?
-    assert_equal false, community_rating.errors[:institution].include?("not found")
+    assert_equal false, community_rating.errors.messages.keys.include?(:institution)
+  end
+
+  should "not create organization rating with saved value and no institution" do
+    person = fast_create(Person)
+    community = fast_create(Community)
+
+    community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => nil)
+    community_rating.saved_value = "2000"
+
+    assert_equal false, community_rating.save
+    assert_equal true, community_rating.errors.messages.keys.include?(:institution)
+  end
+
+  should "not create organization rating with benefited people value and no institution" do
+    person = fast_create(Person)
+    community = fast_create(Community)
+
+    community_rating = OrganizationRating.new(:person => person, :value => 3, :organization => community, :institution => nil)
+    community_rating.people_benefited = "100"
+
+    assert_equal false, community_rating.save
+    assert_equal true, community_rating.errors.messages.keys.include?(:institution)
   end
  
   private
@@ -8,7 +8,7 @@ class PrivateInstitutionTest &lt; ActiveSupport::TestCase
                       "Simple Private Institution",
                       "SPI",
                       "BR",
-                      "DF",
+                      "Distrito Federal",
                       "Gama",
                       "00.000.000/0001-00"
                     )
@@ -12,7 +12,7 @@ class PublicInstitutionTest &lt; ActiveSupport::TestCase
                     "Ministerio Publico da Uniao",
                     "MPU",
                     "BR",
-                    "DF",
+                    "Distrito Federal",
                     "Gama",
                     @juridical_nature,
                     @gov_power,
@@ -13,43 +13,29 @@
 </div>
  
 <div class="spb-row spb-col spb-col-12">
-  <% unless flash[:errors].nil? %>
-  <div class="errorExplanation" id="errorExplanation">
-    <h2> <%= _("Can`t create new Institution: #{flash[:errors].length} errors") %> </h2>
-    <ul>
-    <% flash[:errors].each do |key, value| %>
-      <% key_name = key.to_s.gsub("_", " ") %>
-      <% if value.length > 0 %>
-        <li> <%= _("<b>#{key_name.capitalize}</b> #{value.join()}") %> </li>
+  <div class="errorExplanation" id="create_institution_errors">
+    <% unless flash[:errors].blank? %>
+      <h2><%= _("Can`t create new Institution: #{flash[:errors].length} errors") %></h2>
+      <ul>
+      <% flash[:errors].each do |error| %>
+        <li><%= error %></li>
       <% end %>
+      </ul>
     <% end %>
-    </ul>
   </div>
-  <% end %>
-</div>
-
-<div class="spb-row">
-  <div id='create_institution_errors' class='spb-col spb-col-12 errorExplanation hide-field'></div>
 </div>
  
-
 <%= form_for :community, :url => {:action=>"new_institution"}, :html => { :multipart => true, :id=>"institution_form" } do |f| %>
  
   <%= hidden_field_tag "edit_institution_page", false %>
   <%= fields_for :institutions do |inst| %>
     <div class="spb-row no-margin-top">
       <div class='spb-col spb-col-3'>
-        <label class="formlabel">
-          <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", true)%>
-          <%= _("Private Institution") %>
-        </label>
+        <%= labelled_radio_button _('Public Institution'), 'institutions[type]', 'PublicInstitution', true %>
       </div>
  
       <div class="spb-col spb-col-3">
-        <label class="formlabel">
-          <%= radio_button_tag("institutions[type]", "PublicInstitution") %>
-          <%= _("Public Institution") %>
-        </label>
+        <%= labelled_radio_button _('Private Institution'), 'institutions[type]', 'PrivateInstitution' %>
       </div>
  
       <div class="spb-col spb-col-3"></div>
@@ -80,7 +66,7 @@
           <span class="required-field">(*)</span>
         </label>
  
-        <%= select("community", "country", [[_('Select a country'), nil]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>
+        <%= select("community", "country", [[_('Select a country'), -1]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %>
       </div>
  
       <div class="spb-col spb-col-2">
@@ -89,7 +75,7 @@
           <span class="required-field">(*)</span>
         </label>
  
-        <%= f.select(:state, @state_options, {:selected => params[:community][:state]}, {:class => flash[:error_community_state]}) %>
+        <%= select("community", "state", [[_('Select a state'), '']] + @state_options,  {:class => "type-select #{flash[:error_community_state]}"}) %>
       </div>
  
       <div class="spb-col spb-col-5">
@@ -19,6 +19,10 @@
  
 <div id = 'create_institution_errors' class='errorExplanation hide-field'></div>
  
+<div class="spb-row spb-col spb-col-12 required-field">
+  <%= _("The highlighted fields are mandatory") %>
+</div>
+
 <div>
   <%= labelled_form_for :community,:html => { :multipart => true, :id=>"institution_form" } do |f| %>
     <%= hidden_field_tag "edit_institution_page", true %>
@@ -26,34 +30,25 @@
       <span class=''>
           <div class='formfield type-radio'>
             <label> <%= _("Public Institution") %>
-              <%= radio_button_tag("institutions[type]", "PublicInstitution", (@institution.type == "PublicInstitution" ? true : false)) %>
+              <%= radio_button_tag("institutions[type]", "PublicInstitution", (@institution.type == "PublicInstitution")) %>
             </label>
  
             <label>
               <%= _("Private Institution") %>
-              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", (@institution.type == "PrivateInstitution" ? true : false))%>
+              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", (@institution.type == "PrivateInstitution"))%>
             </label>
           </div>
         </span>
  
-      <%= required f.text_field(:name, :value => @institution.community.name) %>
-      <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %>
+      <%= required labelled_form_field(_('Corporate Name'), text_field_tag('community[name]', @institution.community.name)) %>
  
-      <span class='required-field'>
-        <div class="formfield type-text">
-          <%= inst.label "corporate_name", _("Corporate Name"), :class=>"formlabel" %>
-          <%= required inst.text_field(:corporate_name, :value => @institution.corporate_name) %>
-        </div>
-      </span>
+      <%= labelled_form_field(_('Fantasy name'), inst.text_field(:corporate_name, :value => @institution.corporate_name)) %>
  
-      <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}, :selected => @institution.community.country) %>
+      <%= required labelled_form_field(_('Country'), select("community", "country", [[_('Select a country'), -1]] + country_helper.countries,
+                                                            {:selected => @institution.community.country, :class => "type-select #{flash[:error_community_country]}"})) %>
  
-      <span class='required-field'>
-        <div class="formfield">
-          <label for="community_state" class="formlabel"><%= _("State") %></label>
-          <%= f.select(:state, @state_list.collect {|state| [state.name, state.name]}, :selected => @institution.community.state) %>
-        </div>
-      </span>
+      <%= required labelled_form_field(_('State'), select("community", "state", [[_('Select a state'), '']] + @state_list.collect {|state| [state.name, state.name]},
+                                                          {:selected => @institution.community.state, :class => "type-select #{flash[:error_community_state]}"})) %>
  
       <%= required f.text_field(:city, :value => @institution.community.city) %>
  
@@ -3,6 +3,7 @@
  
   <div class="institution_container">
     <%= text_field_tag(:institution, "", :id=>"input_institution") %>
+    <%= link_to(_("Add institution"), "#", :class=>'button with-text icon-add', :id => 'add_institution_link') %>
  
     <% context.profile.user.institutions.each do |institution| %>
     <%= hidden_field_tag("user[institution_ids][]", institution.id, :class => 'user_institutions') %>
@@ -114,7 +114,7 @@
   padding: 8px 8px 0;
 }
  
-/*** Features Settings ***/
+/* Features Settings */
  
 .controller-features #content form *{
   font-size: 15px;
@@ -233,6 +233,105 @@
   padding: 8px 8px 0;
 }
  
+/* Create Instituition */
+
+/*Temporary - Best fix html structure*/
+.action-gov_user_plugin-create_institution_admin #institution_form{
+  font-size: 12px;
+  font-family: Arial;
+}
+
+.action-gov_user_plugin-create_institution_admin input[type="text"],
+.action-gov_user_plugin-create_institution_admin select {
+  height: 30px;
+  border-radius: 5px;
+  border: solid 1px #ccc;
+  background-color: #fff;
+  padding: 0px 5px;
+}
+
+.action-gov_user_plugin-create_institution_admin select{
+  height: 32px;
+  font-size: 12px;
+  font-family: Arial;
+}
+
+.action-gov_user_plugin-create_institution_admin input[type="radio"] {
+  vertical-align: middle;
+  margin-right: 5px;
+}
+
+.action-gov_user_plugin-create_institution_admin label.formlabel {
+  margin: 10px 0px 3px 0px;
+}
+
+.action-gov_user_plugin-create_institution_admin .explanation {
+  color: #3F60C6;
+  font-size: 12px;
+  font-style: italic;
+  font-family: Arial, Helvetica, sans-serif;
+  margin-bottom: 25px;
+}
+
+.action-gov_user_plugin-create_institution_admin .required-field,
+.action-gov_user_plugin-create_institution_admin .errorExplanation {
+  color: #EA1C00;
+  font-size:12px;
+  margin-bottom: 20px;
+  font-family: Arial;
+}
+
+.action-gov_user_plugin-create_institution_admin .errorExplanation:empty {
+  margin-bottom: 10px;
+}
+
+.action-gov_user_plugin-create_institution_admin #community_name {
+  width: 200px;
+}
+
+.action-gov_user_plugin-create_institution_admin #institutions_corporate_name {
+  width: 310px;
+}
+
+.action-gov_user_plugin-create_institution_admin #community_country {
+  width: 213px;
+}
+
+.action-gov_user_plugin-create_institution_admin #community_state {
+  width: 81px;
+}
+
+.action-gov_user_plugin-create_institution_admin #community_city {
+  width: 222px;
+}
+
+.action-gov_user_plugin-create_institution_admin #institutions_cnpj,
+.action-gov_user_plugin-create_institution_admin #institutions_acronym {
+  text-indent: 5px;
+  width: 530px;
+}
+
+.action-gov_user_plugin-create_institution_admin .modal-form-actions {
+  margin-top: 20px;
+}
+
+.action-gov_user_plugin-create_institution_admin .sisp-fields {
+  margin-top: 15px;
+}
+
+.action-gov_user_plugin-create_institution_admin #content form input.button.with-text {
+  background-color: #3E67B1;
+  color: #fff;
+  font-size: 14px;
+  font-family: "open_sansregular", Arial;
+  height: 32px;
+  line-height: 17px;
+}
+
+.action-gov_user_plugin-create_institution_admin #content form a.button.with-text{
+  padding: 7px 15px;
+}
+
  
 /*** Community Admin pages ***/
 /* Homepage */
@@ -290,12 +389,288 @@
   vertical-align: bottom;
 }
  
+/* Categories */
+
+.action-categories-index #content .main-content > div{
+  padding: 0px 0px 20px;
+  border-bottom: 1px solid #EEE;
+  height: 30px;
+}
+
+.action-categories-index #content .main-content > div a{
+  border: 1px solid #3E67B1;
+  display: block;
+  padding: 7px;
+  width: 85px;
+  border-radius: 5px;
+  color: #3E67B1;
+}
+
+.action-categories-index .tree{
+  margin-top: 20px;
+}
+
+.action-categories-index .tree li{
+  margin-bottom: 20px;
+}
+
+.action-categories-index .tree li li{
+  margin-left: 30px;
+}
+
+.action-categories-index .tree li *{
+  border-bottom: none;
+  list-style-type: disc;
+}
+
+.action-categories-index .treeitem{
+  margin-bottom: 20px;
+}
+
+.action-categories-index .treeitem .color_marker{
+  border-bottom: 1px solid;
+}
+
+.action-categories-index .treeitem span{
+  font-weight: 600;
+  font-size: 14px;
+}
+
+.action-categories-index .treeitem div{
+  margin-top: 6px;
+}
+
+.action-categories-index .treeitem ul{
+  margin-left: 10px;
+}
+
+.action-categories-index .treeitem .button{
+  margin-left: 10px;
+}
+
+.action-categories-index #content .treeitem a,
+.action-categories-index #content .treeitem a:focus,
+.action-categories-index #content .treeitem a:visited,
+.action-categories-index #content .treeitem a:link{
+  margin-right: 10px;
+  color: #3E67B1;
+}
+
 /*Edition configuration profile */
  
+.action-profile_editor-edit #content .main-content #profile-data #profile-is-template{
+  background-color: #F0F1F1;
+  padding: 6px;
+  font-size: 14px;
+  font-family: 'open_sansregular';
+  margin-bottom: 10px;
+  max-width: 405px;
+}
+
+.action-profile_editor-edit div#errorExplanation{
+  margin-left: 0px;
+  color: #FF0366;
+}
+
+.action-profile_editor-edit div#errorExplanation ul li{
+  list-style-type: disc;
+  list-style-position: inside;
+  margin-bottom: 5px;
+  font-size: 13px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #profile-is-template input[type="checkbox"]{
+  margin: 0 10px 0 10px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data div{
+  margin: 5px 0 5px 0;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #profile_change_picture div{
+  margin-bottom: 0px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #institution_modal_container{
+  margin: 15px 0 11px 0;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #institution_modal_container a{
+  margin-left: 0px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .formlabel,
+.action-profile_editor-edit #content .main-content #profile-data .formfieldline label{
+  color: #231F20;
+  font-size: 14px;
+  font-weight: 300;
+  margin-bottom: 5px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data div span div div #email_public_message{
+  color: #888;
+  font-size: 12px;
+  font-weight: 300;
+  font-style: italic;
+  margin-bottom: 5px;
+}
+
+
+.action-profile_editor-edit #content .main-content #profile-data .formlabel::after{
+  color:#F00;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data p .required-field{
+  max-width: 374px;
+  padding: 15px 20px;
+  margin: 20px 0px 25px;
+  border-width: 1px 1px 1px 5px;
+  border-style: dotted dotted dotted solid;
+  border-color: #CCC #CCC #CCC #FF0366;
+  -moz-border-top-colors: none;
+  -moz-border-right-colors: none;
+  -moz-border-bottom-colors: none;
+  -moz-border-left-colors: none;
+  border-image: none;
+  border-radius: 3px;
+  display: block;
+  background: #FFF none repeat scroll 0% 0%;
+  line-height: 20px;
+  font-size: 13px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data input[type="text"]{
+  background: none;
+  display: block;
+  height: 19px;
+  padding: 6px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  width: 405px;
+  font-size: 15px;
+  font-family: Arial, helvetica;
+  color: #585858;
+}
+
+.action-profile_editor-edit #content #profile_change_picture div div div div div div input[type="file"]{
+  background: none;
+  color: #999;
+  padding: 0px;
+  text-indent: 0px;
+  border: 1px solid #bbb;
+  font-size: 14px;
+  border-radius: 4px;
+}
+
+.action-profile_editor-edit #content #profile_change_picture{
+  margin-top: 0px;
+}
+
+.action-profile_editor-edit #content .main-content form div input[type="radio"],
+.action-profile_editor-edit #content .main-content form input[type="checkbox"]{
+  margin-right: 5px;
+  vertical-align: middle;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .field-with-privacy-selector:hover{
+  background-color: #FFF;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .field-with-privacy-selector .field-privacy-selector{
+  position: relative;
+  top: 6px;
+  text-align: right;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .field-with-privacy-selector .field-privacy-selector div{
+  text-align: right;
+  top: 0px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .field-with-privacy-selector .field-privacy-selector label,
+.action-profile_editor-edit #content .main-content #profile-data #profile_change_picture_title span label{
+  font-size: 12px;
+  font-family: 'open_sansregular';
+}
+
+.action-profile_editor-edit #content .main-content #category-ajax-selector{
+  border-radius: 4px;
+  background: #F0F1F1;
+  border-color: #ccc;
+  margin-bottom: 10px;
+  max-width: 405px;
+}
+
+.action-profile_editor-edit #content .main-content #category-ajax-selector #select-categories .toplevel-categories hr{
+  border-color: #ccc;
+}
+
+.action-profile_editor-edit #content .main-content #category-ajax-selector #selected-categories .label,
+.action-profile_editor-edit #content .main-content #category-ajax-selector #select-categories div .category-helper-label{
+  font-size: 14px;
+}
+
+.action-profile_editor-edit #content .main-content #category-ajax-selector #select-categories div .category-helper-label{
+  color: #888;
+}
+
+.action-profile_editor-edit #content .main-content #category-ajax-selector #select-categories div a:hover{
+  cursor: move;
+  border: 1px solid #3E67B1;
+}
+
+.action-profile_editor-edit #content .main-content #category-ajax-selector #select-categories div a{
+  padding: 2px 5px;
+  margin: 2px 0;
+  background: #fff;
+  display: inline-block;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #image-builder-remove-checkbox{
+  float: left;
+  width: 100%;
+  position: relative;
+  margin-top: 0px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #image-builder-remove-checkbox div label{
+  position: absolute;
+  left: 20px;
+  padding-top: 0px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #image-builder-remove-checkbox div div {
+  margin-top: 0px;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .button-bar{
+  margin: 15px 0 30px 0;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data .button-bar .submit{
+  background-color: #3E67B1;
+  color: #FFF;
+  margin-right: 10px;
+}
+
 .action-profile_editor-edit #delete-profile{
   margin-top:0px;
 }
  
+.action-profile_editor-edit #content .main-content #profile-data #delete-profile a{
+  border-color: #df3e3e;
+  color: #df3e3e;
+}
+
+.action-profile_editor-edit #content .main-content #profile-data #delete-profile a:hover{
+  color: #FFF;
+  background: #df3e3e;
+}
+
+.action-profile_editor-edit .controller-profile_editor #profile-data{
+  display: block;
+}
+
 /*form Change Password */
 .action-account-change_password #content form input.button.with-text.icon-ok.submit{
   height: 32px;
@@ -303,13 +678,13 @@
 }
  
 .action-account-change_password input{
-padding: 6px;
-color: #585858;
-background: #FFF;
-border: 1px solid #ccc;
-border-radius: 4px;
-font-size: 15px;
-font-family: Arial, helvetica;
+  padding: 6px;
+  color: #585858;
+  background: #FFF;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  font-size: 15px;
+  font-family: Arial, helvetica;
 }
  
 /* Members management */
@@ -256,26 +256,28 @@
 /*** end of help page ***/
  
 /*** article lists ***/
-
-.article-body ul,
-.article-body ol{
-  margin-bottom: 20px;
+.article-body ul { 
+   list-style-type: disc; 
+   list-style-position: inside; 
 }
  
-.article-body li ul,
-.article-body li ol{
-  margin-bottom: 0px;
-  margin-left: 20px;
+.article-body ol { 
+   list-style-type: decimal; 
+   list-style-position: inside; 
 }
  
-.article-body ul li{
-  list-style-type: disc;
-  list-style-position: inside;
+.article-body ul ul, 
+.article-body ol ul { 
+   list-style-type: circle; 
+   list-style-position: inside; 
+   margin-left: 15px; 
 }
  
-.article-body ol li{
-  list-style-type: decimal;
-  list-style-position: inside;
+.article-body ol ol, 
+.article-body ul ol { 
+   list-style-type: lower-latin; 
+   list-style-position: inside; 
+   margin-left: 15px; 
 }
  
 /*** end of article numbered lists ***/
@@ -179,6 +179,7 @@
   margin:0px 45%;
   color:#FF0366;
 }
+
 #block-community-tabs .ui-tabs .ui-tabs-nav li.ui-tabs-active a{
   color: #FF0366;
   font-weight: 300;
@@ -485,12 +486,12 @@
 }
  
 #content #blog-tab .blog .blog-post.position-1 .post-pic {
-margin: 0 20px 5px 0px;
-border-radius: 4px;
-height: 210px;
-width: 100%;
-background: center/cover no-repeat;
-float: left;
+  margin: 0 20px 5px 0px;
+  border-radius: 4px;
+  height: 210px;
+  width: 100%;
+  background: center/cover no-repeat;
+  float: left;
 }
  
 /* Read more button*/
@@ -541,17 +542,17 @@ float: left;
  
 /* SISP Tab Data - about tab */
 #block-community-tabs .software-sisp {
-  margin-top: 46px;
+  margin-top: 40px;
 }
  
 #block-community-tabs .software-sisp p,
 #block-community-tabs .software-sisp h2 {
-  font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
+  font-family: Arial, Helvetica, sans-serif;
 }
  
 #block-community-tabs .software-sisp h2 {
   border-bottom: solid 2px #f7f8f9;
-  margin-bottom: 26px;
+  margin-bottom: 20px;
   padding-bottom: 8px;
   color: #172938;
   font-size: 18px;
@@ -563,9 +564,14 @@ float: left;
 }
  
 #block-community-tabs .software-sisp p {
+  margin-bottom: 10px;
   color: #172938;
 }
  
+#block-community-tabs .software-about p {
+  margin-bottom: 20px;
+}
+
 #block-community-tabs .software-sisp p span {
   color: #797979;
 }
@@ -275,15 +275,17 @@
   color: #585858;
 }
  
+.action-software_communities_plugin_myprofile-new_software #content .main-block form textarea{
+  border-radius: 4px;
+  font-size: 15px;
+  font-family: arial, helvetica;
+  padding: 10px;
+}
+
 .action-software_communities_plugin_myprofile-new_software #content .formfield input{
   background: none #FFFFFF;
-  border: 1px solid #DDDDDD;
-  color: #585858;
-  font-size: 16px;
-  width: 76%;
-  word-wrap: break-word;
-  border-radius: 4px;
 }
+
 .action-software_communities_plugin_myprofile-new_software #content .main-content form label.formlabel.mandatory{
   font-size: 14px;
   margin-bottom: 5px;
@@ -317,20 +319,16 @@
 }
  
 .action-software_communities_plugin_myprofile-new_software #software-name-field span #community-identifier{
-  width: auto;
+  width: 500px;
 }
  
 .action-software_communities_plugin_myprofile-new_software #content #software-hostname {
-  line-height: 22px;
-  padding: 0px;
-  color: #4A4A4A;
-  font-size: 20px;
-  text-transform: lowercase;
-  border-spacing: 20px;
+  position: absolute;
+  font-size: 15px;
+  padding: 5px 10px;
 }
  
 .action-software_communities_plugin_myprofile-new_software #content .main-block form #profile_change_picture {
-  padding: 0 15px 15px 15px;
   border: 1px dotted #ddd;
   margin-top: 10px;
 }
@@ -464,7 +462,6 @@ font-size: 10px;
   font-weight: 500;
 }
  
-
 .action-contact-new .formfield textarea{
   background: none #FFFFFF;
   border: 1px solid #DDDDDD;
@@ -503,7 +500,6 @@ font-size: 10px;
   display: none;
 }
  
-
 .action-tasks-index select{
   background: none;
   border: 1px solid #D3D6DE;
@@ -512,6 +508,7 @@ font-size: 10px;
   margin: 0px 0px 0px 10px;
   font-size: 14px;
 }
+
 .action-tasks-index #content .main-block form input[type="text"] {
   display: block;
   height: 19px;
@@ -544,7 +541,18 @@ font-size: 10px;
   line-height: 20px;
   position: absolute;
 }
+
 .action-tasks-index .task_decisions label{
   margin: 2px 0px 2px 30px;
   line-height: 22px;
 }
+
+#content .new-software-form .button-bar .button.with-text.icon-save.submit{
+  background: #3E67B1;
+  color: #FFF;
+}
+
+#content .new-software-form .button-bar .button.with-text.icon-save.submit:hover{
+  background: #FFF;
+  color: #3E67B1;
+}
@@ -66,8 +66,8 @@
   border-radius: 4px;
 }
  
-.controller-environment_design #content #catalogo-software-search h1,
-.action-home-index #content #catalogo-software-search h1{
+.controller-environment_design #content #catalogo-software-search h2,
+.action-home-index #content #catalogo-software-search h2 {
   margin: 0px 15px 10px 15px;
   border-bottom: none;
   padding: 10px 0px 0px 0px;
@@ -444,7 +444,6 @@
   border-radius: 0px 0px 8px 8px;
   height: 250px !important;
   background-color: #fff;
-  opacity: 1.0 !important;
 }
  
 .controller-environment_design #content .highlights-image-link img,
@@ -97,7 +97,7 @@
   border-radius: 4px;
   height: 80px;
   width: 20%;
-  background: center/cover no-repeat;
+  background: center/contain no-repeat;
   float: left;
 }
  
@@ -18,6 +18,14 @@
   margin: 0 0 15px 0;
 }
  
+.action-search-people #content form #search-header #search-filters,
+.action-search-communities #content form #search-header #search-filters,
+.action-search-institutions #content form #search-header #search-filters {
+	position: absolute;
+	top: 40px;
+	right: 18px; 
+}
+
 .action-search-people #content form #search-header #search-filters .sod_select,
 .action-search-communities #content form #search-header #search-filters .sod_select,
 .action-search-institutions #content form #search-header #search-filters .sod_select {
@@ -160,3 +168,6 @@
   text-align: center;
 }
  
+#search-subheader{
+	display: none;
+}
@@ -7,13 +7,13 @@
 }
  
 .action-search-software_infos .main-content,
-.action-search-sisp .main-content{
+.action-search-sisp .main-content {
+  padding: 10px 0;
   border: none;
   box-shadow: none;
 }
  
-.action-search-software_infos #content .main-content h2,
-.action-search-sisp #content .main-content h2{
+.action-search-software_infos #content .main-content h2 {
   color: #FF0366;
   font-size: 16px;
   font-family: "open_sansregular",Arial, Helvetica,sans-serif;
@@ -21,14 +21,21 @@
   text-transform: uppercase;
 }
  
-.action-search-software_infos #content .main-content h1,
-.action-search-sisp #content .main-content h1{
+.action-search-sisp #content .main-content h2 {
+  display: none;
+}
+
+.action-search-software_infos #content .main-content h1 {
   padding: 5px 0 10px 0;
   border-bottom: 1px solid #D3D6DE;
   font-family: Arial, Helvetica, sans-serif;
   font-size: 35px;
   font-variant: normal;
 }
+
+.action-search-sisp #content .main-content h1 {
+  display: none;
+}
 /*** end of title and subtitle ***/
  
 /*** Search Box ***/
@@ -176,7 +183,7 @@
 .controller-search #filter-catalog-software #filter-categories-option {
   border: none;
   height: 0;
-  max-height: 620px;
+  max-height: 100%;
   position: relative;
   overflow: hidden;
   padding: 0 15px;
@@ -64,7 +64,7 @@
 }
  
 #content #software-information-block-table #col-software-name b {
-  font: normal normal normal 15px/21px arial, 'open_sansregular', helvetica, sans-serif;
+  font: normal normal normal 16px/21px arial, 'open_sansregular', helvetica, sans-serif;
 }
  
 /*** end of Software Header ***/
@@ -143,6 +143,10 @@
   font-size: 14px;
 }
  
+#content .download-block label {
+  padding-right: 2px;
+}
+
 #content .download-block .download-info .min-requirements {
   font-size: 12px;
 }
@@ -205,25 +209,16 @@
   font-size: 15px;
 }
  
-.profile-homepage #article .article-body ul {
-  background-repeat: no-repeat;
-  list-style-position: inside;
-  list-style-type: disc;
-}
-
-.profile-homepage #article .article-body ul li {
-  line-height: 21px;
-  text-align: left;
-  font-size: 15px;
-  list-style: inherit;
-}
-
 /*** end of Software Homepage ***/
  
 /*** Categories and Tags block ***/
  
 #content .box-1  .categories-and-tags-block{
   border-top: 4px solid #2C4B6B;
+  margin-top: 26px;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #D3D6DE;
+  margin-bottom: 60px;
 }
  
 #content .box-1 .categories-and-tags-block .block-title{
@@ -232,7 +227,7 @@
   padding: 3px 0px;
   background: none;
   color: #5E82C6;
-  font-family: Arial;
+  font-family: Arial, verdana;
   font-size: 12px;
   font-weight: 300;
 }
@@ -240,18 +235,19 @@
 #content .box-1 .categories-and-tags-block .category_cloud{
   margin: 0px;
   position: relative;
-  top: 7px;
+  top: 9px;
 }
  
 #content .box-1 .categories-and-tags-block .category_cloud a{
   display: inline-block;
-  padding: 3px 10px;
+  padding: 1px 10px;
   margin: 5px;
   color: #3E67B1;
   background-color: #ECEDF1;
   border: 1px solid #D3D6DE;
   border-radius: 3px;
   font-size: 12px;
+  font-family: Arial, verdana;
 }
  
 #content .box-1 .categories-and-tags-block .category_cloud a:hover{
@@ -764,3 +760,125 @@
   font-weight: 800;
   padding-top: 30px;
 }
+
+/* software_communites new software page refactor */
+.new-software-form .optional-box{
+  margin-bottom: 20px;
+}
+
+.new-software-form div#errorExplanation{
+  margin-left: 0px;
+  color: #FF0366;
+}
+
+.new-software-form div#errorExplanation ul li{
+  list-style-type: disc;
+  list-style-position: inside;
+  margin-bottom: 5px;
+  font-size: 13px;
+}
+
+.new-software-form div#errorExplanation h2{
+  color: #000;
+  padding: 0px;
+  font-size: 16px;
+  background: none;
+  text-align: left;
+}
+
+.action-profile_editor-edit_software_community #content .main-block .step-explanation span {
+  font-size: 14px;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .highlight-error[type="text"],
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .highlight-error{
+  border: 1px solid #FF0366;
+  box-shadow: none;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form #software_info_finality{
+  width: 490px;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .obrigatory-field .highlight-error[type="text"],
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .optional-field input[type="text"],
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .obrigatory-field input[type="text"]{
+  width: 500px;
+}
+
+.action-software_communities_plugin_myprofile-new_software .new-software-form #software-name-field #community-identifier{
+  width: 277px;
+  padding-left: 228px;
+}
+
+.new-software-form .optional-field label.formlabel,
+.new-software-form .optional-box label {
+  font-family: "open_sansregular", Arial, Helvetica, sans-serif;
+  font-size: 14px;
+  color: #231f20;
+}
+
+.new-software-form #content .main-block form .optional-box #profile_change_picture.software-label-box{
+  width: 470px;
+  border-radius: 4px;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form #profile_change_picture{
+  border: none;
+}
+
+.new-software-form .formfieldline{
+  padding: 0px;
+}
+
+.new-software-form #community_image_builder_uploaded_data{
+  border: none;
+}
+
+.new-software-form #community_image_builder_label{
+  display: none !important;
+}
+
+.new-software-form .formfield input{
+  text-indent: 0px;
+  padding: 0px;
+  font-size: 14px;
+}
+
+/* end of software_communites new software page refactor */
+
+/* software_steps */
+.software-step-info{
+  padding-bottom: 30px;
+  display: block;
+}
+
+.software-step-info ul li{
+  float: left;
+  margin-right: 30px;
+  border-right: 1px solid #eee;
+  padding-right: 30px;
+  font-size: 14px;
+}
+
+.software-step-info ul li:last-child{
+  border: none;
+}
+
+.software-step-info ul li .current-step{
+  background: #FF0366;
+}
+
+.software-step-info ul li span{
+  display: inline-block;
+  height: 24px;
+  width: 24px;
+  border-radius: 50%;
+  color: #fff;
+  text-align: center;
+  margin-right: 6px;
+  background: #333;
+  padding: 1px 0 0 0;
+  font-weight: 700;
+}
+/* end of software_steps */
@@ -454,9 +454,8 @@
   border-bottom: 1px solid #D3D6DE;
   border-top: none;
   color: #172738;
-  font-size: 20px;
+  font-size: 22px;
   font-weight: 700;
-  letter-spacing: 1.8px;
   margin-bottom: 0px;
   padding: 0px 0px 12px 4px;
 }
@@ -90,7 +90,6 @@
 * {
   margin: 0;
   padding: 0;
-  list-style: none;
   vertical-align: baseline;
 }
  
-function alignBlocks(containerIndex){
-    //Needed to save the original reference to jQuery(this)
-    jt = jQuery(this);
-    longerBlock = 0;
-    jt.find(".block-outer").each(function () {
-        if(jQuery(this).height() > longerBlock)
-                longerBlock = jQuery(this).height();
-    });
+/* globals jQuery */
  
-    jt.find("#block-48504 .block-inner-2").height(492);
-    jt.find("#block-55304 .block-inner-2").height(378);
-
-    //Aligns the blocks in the most common situations
-    jt.find(".block-outer").height(longerBlock);
-    //Only used for blocks with video, since it uses the size of the iframe
-    if(jt.find("iframe").length > 0){
-        jt.find(".block-inner-1 .block-inner-2").each(function (idx) {
-            if(idx==2){
-                 jQuery(this).height(jt.find("iframe").height());
-             }
-        });
-    }
-}
+// Theme namespace
+var SPBNoosferoTheme = {};
  
-(function($) {
-  // Run code
-	if($.cookie("high_contrast") === 'true'){
-		$( "body" ).toggleClass( "contraste" );
-	}
-	$( "#siteaction-contraste a" ).click(function() {
-		$( "body" ).toggleClass( "contraste" );
-		if($('body').hasClass('contraste')){
-			$.cookie('high_contrast', 'true', {path: '/'});
-		} else {
-			$.cookie('high_contrast', null, { path: '/' });
-		}
-	});
-
-  $( ".profile-image" ).prepend( "<span class='helper'></span>" );
-  //insere a mensagem no bloco de trilhas na página inicial//
-  $( ".action-home-index #content .community-track-plugin_track-card-list-block .track_list" ).prepend( "<span class='msg_block'>Construa seu caminho de participação na elaboração de políticas públicas...</span>" );
-  //insere a mensagem no bloco de comunidades na página inicial//
-  $( ".action-home-index #content .communities-block .block-inner-2>div" ).prepend( "<span class='msg_block'>Participe dos dialogos entre governo e sociedade em comunidades temáticas...</span>" );
-  $( ".action-home-index #content .communities-block .block-inner-2>div.block-footer-content .msg_block" ).remove();
-  $('.container-block-plugin_container-block').each(alignBlocks);
-
-  $('#block-48500 > .block-inner-1 > .block-inner-2').append('<div class="more_button" style="position: absolute; top: 5px; left: 519px;"><div class="view_all"><a href="/portal/blog">Ler todas</a></div></div>');
+// Add in jQuery a method that executes a given function only if there is a filled query result
+jQuery.fn.doOnce = function( func ) {
+    this.length && func.apply( this );
+    return this;
+}
  
+// Animate Organization Ratings additional informations form
+SPBNoosferoTheme.OrganizationRatings = (function($) {
+  'use strict';
  
+  // Add a question mark next to each form field, so when user mouse over it,
+  // it displays some userfull information about the field
+  function setTooltipContent() {
+    $('span.star-tooltip').html('?');
+  }
  
-// Foco no botao de busca
+  // Given the current state of the form(hidden or in display)
+  // change the arrow image and animte its state change
+  function animateExtraFields(additionalFields, arrow) {
+    var innerHeight = additionalFields[0].offsetHeight;
+
+    // If in display, puts the down arrow and hide the form
+    if(additionalFields.height() !== 0) {
+      arrow.attr('class', 'comments-arrow-down');
+      additionalFields.animate({height: 0});
+    } else { // if the form is hidden, puts the up arrow and display the form
+      arrow.attr('class', 'comments-arrow-up');
+      additionalFields.animate({
+        height: additionalFields.get(0).scrollHeight
+      }, 1000 );
+    }
  
-$('#link-buscar').click(function(e) {
-    e.defaultPrevented();
-    window.location.hash = '#portal-searchbox';
-    $('.searchField').focus()
-})
+    // Fix for the arrow change on the additional informations, it prevents the institution modal
+    // from killing the entire page. When the form had their status changed, the institution modal
+    // tended to cover the page even if it was not in display
+    document.getElementById('institution_modal').style.display = 'none';
+  }
  
-})(jQuery);
+  // Set additional informations form up and down arrows click event
+  function setArrowDirection() {
+    var reportForm = $('div.star-comment-container');
+    var parent = reportForm.parent();
+    reportForm.detach(); // Remove form from the page DOM
+
+    // Apply arrows click event
+    var additionalDataBar = reportForm.find('div.comments-display-fields');
+    additionalDataBar.on('click', function() {
+      var arrow = additionalDataBar.find('span[class*="comments-arrow"]');
+      var additionalFields = reportForm.find('.comments-software-extra-fields');
+      animateExtraFields(additionalFields, arrow);
+    });
  
+    // Add the form back to the page
+    parent.append(reportForm);
+  }
  
-// Efeito Fade nos box de softwares
  
-(function($){
-  "use strict";// Make javascript less intolerant to errors
+  function initialize() {
+    $('div.star-rate-form').doOnce(function() {
+        setTooltipContent();
+        setArrowDirection();
+    });
+   }
  
-  var TRANSITION_TIME = 250;// milliseconds
+  return {
+    init: initialize
+  };
  
+}) (jQuery);
  
-  function show_finality() {
-    var finality = $(this).children(".software-block-finality");
+// Fade effect on software blocks of portal homepage
+SPBNoosferoTheme.HighlightedSoftwaresBlock = (function($) {
+  'use strict';
  
-    //finality.stop().fadeTo(TRANSITION_TIME,1);
+  function showFinality() {
+    var finality = $(this).children('div.software-block-finality');
     finality.stop().fadeTo('fast', 1);
-    //finality.stop().animate({"top" : "0%"}, TRANSITION_TIME);
   }
  
-  function hide_finality() {
-    var finality = $(this).children(".software-block-finality");
-
-    //finality.stop().fadeTo(TRANSITION_TIME,0);
+  function hideFinality() {
+    var finality = $(this).children('div.software-block-finality');
     finality.stop().fadeTo('fast', 0);
-    //finality.stop().animate({"top" : "100%"}, TRANSITION_TIME);
   }
  
-  function move_article_buttons(){
-    var article_actions = $('#article-actions').clone();
-    var report = $('.report-abuse-action').remove();
-    var suggest = $('.icon-suggest').remove();
-
+  // Set the mouse over and out event in each of the finality blocks in the page
+  function setFadeInOutFinality(){
+    $('#boxes div.software-block-finality').css({'opacity':0, 'top':0});
+    var softwaresBlocks = $('#boxes div.software-block');
  
-    $(article_actions).find('.icon-edit, .icon-new, .icon-delete, .icon-locale').remove();
-    $('.article-body').append(article_actions);
+    softwaresBlocks.mouseover(showFinality);
+    softwaresBlocks.mouseout(hideFinality);
   }
  
-  function add_link_to_article_div(){
-    var list = $('.display-content-block').find('li');
+  function initialize() {
+    $('#boxes .box-1 div.softwares-block').doOnce(function() {
+      setFadeInOutFinality();
+    });
+  }
  
-    list.each(function(){
-      var link = $(this).find('.title').find('a').attr('href');
-      var text = $(this).find('.lead').find('p').text();
+  return {
+    init: initialize
+  };
+}) (jQuery);
+
+
+SPBNoosferoTheme.NoosferoHTMLAdjusts = (function($) {
+  'use strict';
+
+  // Take each list item from the block and apply to its lead the same link as its title
+  // then wraps the list item inside a new div with class notice-item
+  function insertLinksAndWrapsOnHomeNews(){
+    var news = $('div.display-content-block').find('li');
+    var parent = news.parent();
+    news.detach();
+    news.each(function(){
+      //add link on lead
+      var link = $(this).find('div.title a').attr('href');
+      var lead = $(this).find('div.lead');
       var leadLink = $('<a></a>');
  
       leadLink.attr('href', link);
-      leadLink.text(text);
+      leadLink.text(lead.find('p').text());
+      lead.html(leadLink);
  
-      $(this).find('.lead').html(leadLink);
+      //add wraps to improve styling
+      $(this).find('div:gt(0)').wrapAll('<div class="notice-item"/>');
+      $(this).find('.notice-item div:gt(0)').wrapAll('<div class="notice-info"/>');
     });
+
+    parent.append(news);
   }
  
-  function insert_notice_div(){
-    var notice = $('.display-content-block').find('li');
-      notice.each(function(){
-        var $set = $(this).children();
-        for(var i=1, len = $set.length; i < len; i+=5){
-          $set.slice(i, i+5).wrapAll('<div class="notice-item"/>');
-        }
-        for(var i=2, len = $set.length; i < len; i+=3){
-          $set.slice(i, i+3).wrapAll('<div class="notice-info"/>');
+  // Add a toggle tooltip to all span with title attribute
+  function addTooltips(){
+    $('#content span[title]').doOnce(function(){
+      this.attr('data-toggle', 'tooltip');
+      this.tooltip();
+    });
+  }
+
+  // Make the link next to a popover span show the popover when it is clicked
+  function addPopovers() {
+    var span = $('span[data-toggle="popover"]');
+    var place = span.attr('data-placement');
+    var elementClass = span.attr('data-class');
+
+    span.doOnce(function(){
+      var popover =  this.popover({
+        html:true,
+        placement: place,
+        content: function() {
+          return $(this).next().html();
         }
-      //$('<div class="notice-item"></div>').wrap($(this).find( '.image', '.title', '.lead', '.read_more'));
+      })
+      .data('bs.popover');
+
+      if(popover) {
+        popover.tip()
+        .addClass(elementClass);
+
+        // Make the link show the span popover when it is clicked
+        $('a.toggle-popover').on('click',function() {
+          span.trigger('click');
+        });
+      }
     });
+  }
  
+  function moveBreadcrumbs() {
+    $('div.breadcrumbs-plugin_content-breadcrumbs-block').doOnce(function() {
+      this.insertBefore('#content-inner');
+      $('<span id="breadcrumbs-you-are-here">Você está aqui:</span>').insertBefore(this.find('div.block-inner-2').children().first());
+    });
   }
  
-  //toggle filter options in catalog page
-  function setFilterCategoriesOptionClass() {
-    var filterOptions = $("#filter-categories-option");
-    filterOptions.addClass("animated slideInDown");
+  function removeButtons(){
+    $('#article-actions').doOnce(function() {
+      $(this).children('.icon-spread, .icon-locale, .report-abuse-action, .icon-clone').remove();
+    });
+
+    $('div.page-members-header').doOnce(function() {
+      $(this).find('.report-abuse-action').remove();
+    });
   }
  
+  // Put the focus on the search form when user click on the "go to search link"
+  function searchLinkApplyFocusToItsForm() {
+    $('#link-buscar').click(function(e) {
+      e.defaultPrevented();
+      $('.searchField').focus();
+    });
+  }
+
+  function initialize() {
+    insertLinksAndWrapsOnHomeNews();
+    addTooltips();
+    addPopovers();
+    moveBreadcrumbs();
+    searchLinkApplyFocusToItsForm();
+    removeButtons();
+  }
+
+  return {
+    init: initialize
+  };
+
+}) (jQuery);
+
+// Software catalog category filter toggle functionality
+SPBNoosferoTheme.SoftwareCatalog = (function($) {
+  'use strict';
+
+  // Apply the toggle animation on the category filter based on its current status
   function toggleFilterOptions(){
-    var filterOptions = $("#filter-categories-option");
-    var filterHeight = filterOptions[0].scrollHeight;
-    var showOptions = $("#filter-option-catalog-software");
-    var hideOptions = $("#filter-option-catalog-close");
-    if(hideOptions.is(":visible")){
-      //filterOptions.slideUp(function() {
-        showOptions.show();
-        hideOptions.hide();
-      //});
+    var filter = document.getElementById('filter-catalog-software');
+    var filterOptions = $(filter.children[0]); // filter categories
+    var filterHeight = filterOptions[0].scrollHeight; // filter categories height to be used when displaying it
+    var showOptions = $(filter.children[1]); // Show categories div, has a click event
+    var hideOptions = $(filter.children[2]); // Hide categories div, has a click event
+
+    // If the hide categories div is visible and it is clicked,
+    // hide the categories and display the show categories div
+    if(hideOptions.is(':visible')){
+      showOptions.show();
+      hideOptions.hide();
+
       filterOptions.animate({
         height: 0
       },500);
-    }
-    else {
+    } else { // The user clicked on the show categories div, then show the categories and the "hide categories div"
       showOptions.hide();
       hideOptions.show();
+
       filterOptions.animate({
         height: filterHeight
       },500);
     }
   }
  
-  function setEvents(){
-    // Fade css
-    $('.software-block-finality').css('opacity', 0);
-    $('.software-block-finality').css('top', 0);
-    // End Fade CSS
-    $(".software-block").mouseover(show_finality);
-    $(".software-block").mouseout(hide_finality);
-
-    var showOptions = $("#filter-option-catalog-software");
-    var hideOptions = $("#filter-option-catalog-close");
-    showOptions.click(toggleFilterOptions);
-    hideOptions.click(toggleFilterOptions);
+// If there is a software catalog on the page, add its category filter toggle animation
+  function initialize() {
+    var filter = document.getElementById('filter-catalog-software');
+    if (filter) {
+      //toggle filter options in catalog page
+      filter.children[0].setAttribute('class', 'animated slideInDown');
+      $(filter.children[1]).click(toggleFilterOptions);
+      $(filter.children[2]).click(toggleFilterOptions);
+    }
+  }
+
+  return {
+    init: initialize
+  };
+}) (jQuery);
+
+SPBNoosferoTheme.NoosferoFoldersContent = (function($) {
+  'use strict';
+
+  /* Splits a file name from its extension. Example: example.pdf becomes example - PDF */
+  function split_file_extension(element) {
+    var tokens = element.innerHTML.split('.');
+
+    if(tokens.length > 1) {
+      var fileExtension = tokens.pop().toUpperCase();
+      var fileName = tokens.join('.');
+      element.innerHTML = fileName + ' - ' + fileExtension;
+    }
   }
  
   /* Finds all uploaded files from manuals page and sets its names on the right format */
@@ -173,7 +279,7 @@ $(&#39;#link-buscar&#39;).click(function(e) {
       var folderList = article.getElementsByClassName('folder-content')[0];
       var folderItens = folderList.getElementsByClassName('item-description');
  
-      for(var i = 0; i < folderItens.length; i++) {
+      for(var i = 0, loop_length = folderItens.length; i < loop_length; i++) {
         split_file_extension(folderItens[i].getElementsByTagName('a')[0]);
       }
     } catch(e) {
@@ -181,110 +287,26 @@ $(&#39;#link-buscar&#39;).click(function(e) {
     }
   }
  
-  /* Splits a file name from its extension. Example: example.pdf becomes example - PDF */
-  function split_file_extension(element) {
-    var tokens = element.innerHTML.split('.');
-    if(tokens.length == 2) {
-      var fileName = tokens[0];
-      var fileExtension = tokens[1].toUpperCase();
-      element.innerHTML = fileName + " - " + fileExtension;
-    }
-  }
-
-  function set_tooltip_content() {
-    $('.star-tooltip').html("?");
-  }
-
-
-  function set_arrow_direction() {
-    var additional_data_bar = $('.comments-display-fields');
-
-    additional_data_bar.on('click', function() {
-      var arrow = additional_data_bar.find('span[class*="comments-arrow"]');
-      var additional_fields = $('.comments-software-extra-fields');
-
-      if (additional_fields) {
-        animateExtraFields(additional_fields, arrow);
-      }
-    });
-  }
-
-
-  function animateExtraFields(additional_fields, arrow) {
-    var innerHeight = additional_fields[0].offsetHeight;
-
-    if(additional_fields.height() !== 0) {
-      arrow.attr('class', "comments-arrow-down");
-      additional_fields.animate({height: 0});
-    } else {
-      arrow.attr('class', "comments-arrow-up");
-      additional_fields.animate({height: additional_fields.get(0).scrollHeight}, 1000 );
-    }
-
-    // Fix for the arrow change on modal display to block, killing the entire page
-    $("#institution_modal").css({'display':'none'});
-  }
-
-
-  function set_use_report_content() {
-    $('.profile-homepage .organization-average-rating-container .rate-this-organization a').html('Avalie este software');
-    $('.make-report-block .make-report-container .button-bar a span').html('Avalie este software');
-    $('.star-rate-data .star-rate-form.rating-cooldown .button-bar a span').html('Avalie este software');
-    $('.make-report-block .make-report-container .make-report-message').html('Relate sua experiência ou do órgão/empresa com relação ao software.');
-    $('.ratings-list .see-more a.icon-arrow-right-p').html('veja todos os relatos');
-    $('.main-content .star-rate-data .star-rate-form .star-comment-container .button-bar input').attr('value', 'Enviar');
-    $('.main-content .star-rate-data .star-rate-form .star-rate-text').html('Avalie este software');
-    $('.main-content .star-rate-data .star-rate-form .star-comment-container .formlabel').html('Depoimento sobre o software');
-    $('.star-rate-form .star-comment-container .comments-display-fields span#comments-additional-information').html('Dados adicionais (órgãos e empresas)');
-    $('.star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments label').html('Nome do órgão ou empresa');
-    $('.star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-people-benefited label').html('Número de beneficiados');
-    $('.star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values label').html('Recursos economizados');
-  }
-
-  function add_tooltips(){
-    $('#content span[title]').attr("data-toggle","tooltip");
-
-    $('[data-toggle="tooltip"]').tooltip();
-  }
-
-  function add_popovers() {
-    var span = $('span[data-toggle="popover"]');
-    var place = span.attr("data-placement");
-    var elementClass = span.attr("data-class");
-    if(span){
-      var popover =  span.popover({
-        html:true,
-        placement: place,
-        content: function() {
-          return $(this).next().html();
-        }
-      })
-      .data('bs.popover');
-    }
-    if(popover) {
-      popover.tip()
-      .addClass(elementClass);
-      $('a.toggle-popover').on("click",function() {
-        span.trigger("click");
-      });
-    }
-  }
-
-  function move_breadcrumbs() {
-    $('.breadcrumbs-plugin_content-breadcrumbs-block').prependTo('#wrap-2');
-    $('<span id="breadcrumbs-you-are-here">Você está aqui:</span>').insertBefore($('.breadcrumbs-plugin_content-breadcrumbs-block .block-inner-2').children().first());
+  function initialize() {
+    set_uploaded_files_names();
   }
  
-  $(document).ready(function(){
-    add_tooltips();
-    add_popovers();
-    move_article_buttons();
-    move_breadcrumbs();
-    insert_notice_div();
-    set_uploaded_files_names();
-    set_tooltip_content();
-    set_arrow_direction();
-    set_use_report_content();
-    setEvents();
-    });
-})(jQuery);
+  return {
+    init: initialize
+  };
+
+}) (jQuery);
+
+// Theme javascript bootstrap
+(function(jQuery) {
+  'use strict';
+
+  // Initialize everything
+  $(document).ready(function() {
+    SPBNoosferoTheme.OrganizationRatings.init();
+    SPBNoosferoTheme.HighlightedSoftwaresBlock.init();
+    SPBNoosferoTheme.NoosferoHTMLAdjusts.init();
+    SPBNoosferoTheme.SoftwareCatalog.init();
+    SPBNoosferoTheme.NoosferoFoldersContent.init();
+  });
+}) (jQuery);
@@ -5,8 +5,8 @@ class SoftwareCommunitiesPluginController &lt; ApplicationController
   def get_license_data
     return render :json=>{} if !request.xhr? || params[:query].nil?
  
-    data = LicenseHelper.find_licenses(params[:query]) if params[:query]
-    data ||= LicenseInfo.all
+    data = LicenseHelper.find_licenses(params[:query]) unless params[:query].blank?
+    data ||= LicenseHelper.all
  
     render :json=> data.collect { |license|
       {:id=>license.id, :label=>license.version}
@@ -0,0 +1,9 @@
+class AddLicenseToSoftwaresWithNone < ActiveRecord::Migration
+  def up
+    execute("UPDATE software_infos SET license_info_id=(SELECT id FROM license_infos WHERE version='Another') WHERE license_info_id IS NULL;")
+  end
+
+  def down
+    say "This migration can't be reverted"
+  end
+end
@@ -0,0 +1,13 @@
+class AddTimestampsToSoftwareInfo < ActiveRecord::Migration
+  def up
+    change_table :software_infos do |t|
+      t.datetime :created_at, :null => false, :default => Time.zone.now
+      t.datetime :updated_at, :null => false, :default => Time.zone.now
+    end
+  end
+
+  def down
+    remove_column :software_infos, :created_at
+    remove_column :software_infos, :updated_at
+  end
+end
@@ -0,0 +1,34 @@
+Feature: go to software search when click on category
+  As a user
+  I want to select a category
+  to see the softwares with the selected category
+
+  Background:
+    Given "SoftwareCommunitiesPlugin" plugin is enabled
+    And I am logged in as mpog_admin
+    And I go to /admin/plugins
+    And I check "SoftwareCommunitiesPlugin"
+    And I press "Save changes"
+    And the following categories
+      | name     | display_in_menu |
+      | Software | true            |
+    And the following categories
+      | parent   | name        | display_in_menu |
+      | Software | Health      | true            |
+      | Software | Education   | true            |
+    And the following softwares
+      | name           | public_software | categories        | finality      |
+      | Software One   | true            | Health            | some finality |
+      | Software Two   | true            | Health, Education | some finality |
+      | Software Three | false           | Education         | some finality |
+    And the following blocks
+      | owner       | type                    |
+      | environment | CategoriesSoftwareBlock |
+
+  Scenario: Search softwares by education category
+    Given I go to /
+    When I follow "Education"
+    Then I should see "Software Two"
+    And I should see "Software Three"
+    And I should not see "Software One"
+
...	...	@@ -41,7 +41,8 @@ if $SPB_ENV == 'lxc'
41	41	end
42	42
43	43	File.open('config/lxc/iptables-filter-rules', 'w') do \|f\|
44		- lxc_host_bridge_ip = '192.168.122.1' # FIXME don't hardcode
	44	+ lxc_host_bridge_name = `awk '{ if ($1 == "lxc.network.link") { print($3) } }' /etc/lxc/default.conf`.strip
	45	+ lxc_host_bridge_ip = ` /sbin/ifconfig #{lxc_host_bridge_name} \| grep 'inet addr:' \| cut -d: -f2 \| awk '{ print $1 }' `.strip
45	46	f.puts "-A INPUT -s #{lxc_host_bridge_ip} -p tcp -m state --state NEW --dport 22 -j ACCEPT"
46	47	f.puts "-A INPUT -s #{lxc_host_bridge_ip} -p tcp -m state --state NEW --dport 5555 -j ACCEPT"
47	48	end
...	...
...	...	@@ -13,3 +13,5 @@ relay_hostname: relay.spb.cdtc.unb.br
13	13	relay_ip: 164.41.9.48
14	14	alt_ssh_port: 55555
15	15	from_address: noreply@spb.cdtc.unb.br
	16	+dev_backup_frequency: true
	17	+disable_send_emails: true
...	...
...	...	@@ -19,3 +19,5 @@ alt_ssh_port: 55555
19	19	external_outgoing_mail_domain: serpro.gov.br
20	20	raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
21	21	google_analytics_id: 'UA-64206731-2'
	22	+dev_backup_frequency: true
	23	+disable_send_emails: true
...	...
...	...	@@ -20,3 +20,5 @@ external_outgoing_mail_relay: 189.9.150.53
20	20	external_outgoing_mail_domain: serpro.gov.br
21	21	raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
22	22	google_analytics_id: 'UA-64206731-3'
	23	+dev_backup_frequency: true
	24	+disable_send_emails: true
...	...
...	...	@@ -3,14 +3,16 @@ admins:
3	3	site_url: https://softwarepublico.lappis
4	4	external_hostname: softwarepublico.lappis
5	5	sisp_external_hostname: sisp.lappis
6		-external_ip: 10.0.0.11
	6	+external_ip: 10.0.0.54
7	7	colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
8	8	server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
9	9	email_subject_prefix: '[spb]'
10	10	lists_hostname: listas.softwarepublico.lappis
11	11	lists_admin: paulo@softwarelivre.org
12	12	relay_hostname: relay.softwarepublico.lappis
13		-relay_ip: 10.0.0.15
	13	+relay_ip: 10.0.0.51
14	14	alt_ssh_port: 5555
15	15	from_address: noreply@softwarepublico.lappis
16		-
	16	+# define less frequent backup for dev envs
	17	+dev_backup_frequency: true
	18	+disable_send_emails: true
...	...
1		-reverseproxy: 10.0.0.11
2		-database: 10.0.0.13
3		-social: 10.0.0.14
4		-email: 10.0.0.15
5		-integration: 10.0.0.12
	1	+reverseproxy: 10.0.0.54
	2	+database: 10.0.0.55
	3	+social: 10.0.0.53
	4	+email: 10.0.0.51
	5	+integration: 10.0.0.52
...	...
...	...	@@ -2,28 +2,28 @@ Host *
2	2	ForwardAgent yes
3	3
4	4	Host reverseproxy.unconfigured
5		- Hostname 10.0.0.11
	5	+ Hostname 10.0.0.54
6	6
7	7	Host reverseproxy
8		- Hostname 10.0.0.11
	8	+ Hostname 10.0.0.54
9	9	Port 5555
10		- ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p
	10	+ ProxyCommand ssh 10.0.0.54 -p 22 nc %h %p
11	11
12	12	Host database
13		- Hostname 10.0.0.13
	13	+ Hostname 10.0.0.55
14	14	# connect via reverseproxy host
15		- ProxyCommand ssh 10.0.0.11 nc %h %p
	15	+ ProxyCommand ssh 10.0.0.54 nc %h %p
16	16
17	17	Host social
18		- Hostname 10.0.0.14
	18	+ Hostname 10.0.0.53
19	19	# connect via reverseproxy host
20		- ProxyCommand ssh 10.0.0.11 nc %h %p
	20	+ ProxyCommand ssh 10.0.0.54 nc %h %p
21	21
22	22	Host email
23		- Hostname 10.0.0.15
	23	+ Hostname 10.0.0.51
24	24	# connect via reverseproxy host
25		- ProxyCommand ssh 10.0.0.11 nc %h %p
	25	+ ProxyCommand ssh 10.0.0.54 nc %h %p
26	26
27	27	Host integration
28		- Hostname 10.0.0.11
29		- # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand
	28	+ Hostname 10.0.0.54
	29	+ # Porta 22 de 10.0.0.54 cai aqui entao nao precisa de ProxyCommand
...	...
...	...	@@ -19,3 +19,5 @@ alt_ssh_port: 5555
19	19	from_address: noreply@softwarepublico.dev
20	20	raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
21	21	colab_http_workers: 1
	22	+dev_backup_frequency: true
	23	+disable_send_emails: true
...	...
...	...	@@ -13,7 +13,7 @@ cookbook_file '/usr/local/bin/backup_spb.sh' do
13	13	mode 0755
14	14	end
15	15
16		-cookbook_file '/etc/cron.d/rsnapshot-spb' do
	16	+template '/etc/cron.d/rsnapshot-spb' do
17	17	owner 'root'
18	18	group 'root'
19	19	mode 0644
...	...
...	...	@@ -0,0 +1,8 @@
	1	+<%if node['config']['dev_backup_frequency']%>
	2	+20 23 1 * * root rsnapshot monthly
	3	+<%else%>
	4	+0 /6 * * root rsnapshot hourly
	5	+59 23 * * * root rsnapshot daily
	6	+40 23 * * 7 root rsnapshot weekly
	7	+20 23 1 * * root rsnapshot monthly
	8	+<%end%>
...	...