Fix css/html in institution modal

Thiago Ribeiro
2 parents dce5c218 ca88bc8c
Showing 88 changed files with 1470 additions and 382 deletions Show diff stats
Makefile
README.chef.md
README.md
VERSION
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/gitlab.py.erb
cookbooks/colab/templates/noosfero.py.erb
cookbooks/noosfero/files/noosfero-create-api-user
cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
docs/apoio.rst.in
src/Makefile
src/colab-spb-plugin/.gitignore
src/colab-spb-plugin/MANIFEST.in
src/colab-spb-plugin/VERSION
src/colab-spb-plugin/setup.py
src/colab-spb-plugin/src/colab_spb/apps.py
src/colab-spb-plugin/tests/plugins.d/gitlab.py
src/colab-spb-plugin/tests/plugins.d/noosfero.py
src/colab-spb-plugin/tests/plugins.d/spb.py
src/colab-spb-theme-plugin/Makefile
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C src/ $@
@@ -0,0 +1,96 @@
+# Software Público - configuration management
+
+## Requirements
+
+* [chake](https://rubygems.org/gems/chake)
+* rake
+
+For development
+
+* vagrant
+* shunit2
+* moreutils
+* redir
+
+## Configuration parameters
+
+All configuration parameters are defined in `nodes.yaml`, with exception of IP
+addresses, which are defined in different files:
+
+- for local development, the IP addresses of the Vagrant VMs are defined in
+  config/local/ips.yaml.
+
+- for production, you need to create a new file called
+  `config/production/ips.yaml`
+
+You will probably not need to change nodes.yaml unless you are developing the
+deployment process.
+
+## Deploy
+
+### Development
+
+First you have to bring up the development virtual machines:
+
+```bash
+$ vagrant up
+$ rake preconfig
+$ rake bootstrap_common
+```
+
+Right now there are 5 VM's, so this might take a while. The basic commands for
+deployment:
+
+```bash
+$ rake                                  # deploys all servers
+$ rake nodes                            # lists all servers
+$ rake converge:$server                 # deploys only $server
+```
+
+### Production
+
+* TODO: document adding the SSL key and certificate
+* TODO: document creation of `prod.yaml`.
+* TODO: document SSH configuration
+
+The very first step is
+
+```
+$ rake preconfig SPB_ENV=production
+```
+
+This will perform some initial configuration to the system that is required
+before doing the actual deployment.
+
+After that:
+
+```bash
+$ rake SPB_ENV=production                   # deploys all servers
+$ rake nodes SPB_ENV=production             # lists all servers
+$ rake converge:$server SPB_ENV=production  # deploys only $server
+```
+
+You can also do `export SPB_ENV=production` in your shell and omit it in the
+`rake` calls.
+
+See the output of `rake -T` for other tasks.
+
+## Viewing the running site when developping locally
+
+Run:
+
+```bash
+./server
+```
+
+Follow the on-screen instructions an browse to
+[http://softwarepublico.dev/](http://softwarepublico.dev/).
+
+Note: this requires that your system will resolve `\*.dev` to `localhost`.
+Google DNS servers will do that automatically, otherwise you might add the following entries to `/etc/hosts`:
+
+```
+127.0.53.53 softwarepublico.dev
+127.0.53.53 listas.softwarepublico.dev
+```
+
-# Software Público - configuration management
+# Software Público Brasileiro - desenvolvimento
  
-## Requirements
+## Organização
  
-* [chake](https://rubygems.org/gems/chake)
-* rake
+Este repositório contém tanto o código fonte desenvolvimento especificamente
+para o SPB, quando o código de gestão de configuração necessário para implantar
+o ambiente do SPB.
  
-For development
+O código fonte dos componentes e pacotes desenvolvidos está no diretório
+`src/`.  Os demais diretórios contém código de gestão de configuração,
+documentação, utilitários etc.
  
-* vagrant
-* shunit2
-* moreutils
-* redir
+## Fazendo um release
  
-## Configuration parameters
+* Atualize o número de versão no arquivo VERSION
+* Execute `make release`.
  
-All configuration parameters are defined in `nodes.yaml`, with exception of IP
-addresses, which are defined in different files:
-
-- for local development, the IP addresses of the Vagrant VMs are defined in
-  config/local/ips.yaml.
-
-- for production, you need to create a new file called
-  `config/production/ips.yaml`
-
-You will probably not need to change nodes.yaml unless you are developing the
-deployment process.
-
-## Deploy
-
-### Development
-
-First you have to bring up the development virtual machines:
-
-```bash
-$ vagrant up
-$ rake preconfig
-$ rake bootstrap_common
-```
-
-Right now there are 5 VM's, so this might take a while. The basic commands for
-deployment:
-
-```bash
-$ rake                                  # deploys all servers
-$ rake nodes                            # lists all servers
-$ rake converge:$server                 # deploys only $server
-```
-
-### Production
-
-* TODO: document adding the SSL key and certificate
-* TODO: document creation of `prod.yaml`.
-* TODO: document SSH configuration
-
-The very first step is
-
-```
-$ rake preconfig SPB_ENV=production
-```
-
-This will perform some initial configuration to the system that is required
-before doing the actual deployment.
-
-After that:
-
-```bash
-$ rake SPB_ENV=production                   # deploys all servers
-$ rake nodes SPB_ENV=production             # lists all servers
-$ rake converge:$server SPB_ENV=production  # deploys only $server
-```
-
-You can also do `export SPB_ENV=production` in your shell and omit it in the
-`rake` calls.
-
-See the output of `rake -T` for other tasks.
-
-## Viewing the running site when developping locally
-
-Run:
-
-```bash
-./server
-```
-
-Follow the on-screen instructions an browse to
-[http://softwarepublico.dev/](http://softwarepublico.dev/).
-
-Note: this requires that your system will resolve `\*.dev` to `localhost`.
-Google DNS servers will do that automatically, otherwise you might add the following entries to `/etc/hosts`:
-
-```
-127.0.53.53 softwarepublico.dev
-127.0.53.53 listas.softwarepublico.dev
-```
+## Implantação
  
+Veja as instruções em README.chef.md.
@@ -0,0 +1 @@
+5.0a0
@@ -21,6 +21,11 @@ package &#39;colab-spb-theme&#39; do
   notifies :restart, 'service[colab]'
 end
  
+package 'colab-spb-theme' do
+  action :upgrade
+  notifies :restart, 'service[colab]'
+end
+
 directory '/etc/colab' do
   owner  'root'
   group  'root'
@@ -9,6 +9,7 @@ verbose_name = &#39;Gitlab Plugin&#39;
 upstream = 'http://<%= node['peers']['integration'] %>:81/gitlab/'
  
 private_token = '<%= @get_private_token.call %>'
+verify_ssl = False
  
 urls = {
     'include': 'colab_gitlab.urls',
@@ -27,6 +27,8 @@ menu_urls = (
         kwargs={'path': 'search/people'}, auth=False),
     url(display=_('Communities'), viewname='noosfero',
         kwargs={'path': 'search/communities'}, auth=False),
+    url(display=_('Institutions'), viewname='noosfero',
+        kwargs={'path': 'search/institutions'}, auth=False),
     url(display=_('Profile'), viewname='noosfero',
         kwargs={'path': 'profile/~/'}, auth=True),
     url(display=_('Control Panel'), viewname='noosfero',
@@ -5,13 +5,19 @@ email = ARGV[1]
 password = SecureRandom.random_number.to_s
  
 user = User.find_by_login(login)
-exit(0) if user
-
-user = User.create!(
-  login: login,
-  email: email,
-  password: password,
-  password_confirmation: password
-)
-user.activate
-user.generate_private_token!
+if user
+  if user.private_token_expired?
+    user.generate_private_token!
+  else
+    exit(0)
+  end
+else
+  user = User.create!(
+    login: login,
+    email: email,
+    password: password,
+    password_confirmation: password
+  )
+  user.activate
+  user.generate_private_token!
+end
@@ -42,7 +42,7 @@ server {
     proxy_set_header        REMOTE_USER '';
   }
  
-  location /doc/ {
+  location /doc {
     root /srv;
   }
  
@@ -65,6 +65,42 @@ Caso os ambientes já tenham sido convergidos anteriormente, não será possíve
  
 O output do comando acima é a sua chave pública, ela deverá ser copiada e colada, manualmente, em ``~/.ssh/authorized_keys`` do usuário desejado. Esse procedimento deve ser repetido em todas as máquinas listadas em ``config/@@SPB_ENV@@/ips.yaml``.
  
+Git push com HTTPS
+-----------------
+
+Para a utilização do git com protocolo HTTPS é necessário configurar a senha do perfil do seu usuário na ferramenta Gitlab, pois a senha do seu usuário do portal não é configurada no Gitlab já que a autenticação é feita via REMOTE_USER (cabeçalho HTTP). Para configurar a sua senha no Gitlab é necessário que já exista um usuário válido no portal e o mesmo esteja logado, em seguida, siga os passos a seguir:
+
+1- No menu, clique no botão "Desenvolvimento" para que apareça novas opções
+2- Nas opções apresentadas, clique em "Perfil" para ser direcionado para o seu perfil do Gitlab
+3- No seu perfil será apresentado um novo menu abaixo do menu do portal, nesse menu clique na aba "Password"
+4- Na aba "Password", indique que você esqueceu a sua senha clicando no link "Forgot your password?"
+5- Um email será enviado para o seu endereço de email configurado no seu usuário do portal
+6- Abra o email recebido e clique no link "Change my password", que irá redirecionar para uma página de configuração de uma nova senha
+7- Na página de configuração de uma nova senha digite a sua senha e a confirme (sugere-se que use a mesma senha do portal), finalizando a operação de configuração da senha do seu perfil no Gitlab
+
+Com a senha do seu perfil do Gitlab configurada pode-se utlizar normalmente o git com protocolo HTTPS, onde será solcitado o seu usuário e senha durante as operações. Lembrando que o usuário será o seu usuário do portal e a senha será a que foi configurada com o processo descrito anteriormente.
+
+No Portal do Software Público Brasileiro, assim como em outros portais do governo, temos problemas com o certificado digital. Para o git conseguir realizar as operções usando HTTPS é necessário ignorar o certificado, para isso, abra o terminal (com o git instalado) e execute o seguinte comando::
+
+  $ cd <caminho-do-diretório-do-projeto>
+  $ git config http.sslVerify "false"
+
+
+Integração manual entre repositórios
+---------------------------------
+
+Para empurrar modificações para mais de um repositório, por exemplo os repositórios do Portal do Software Público Brasileiro e Github, é necessário fazer algumas modificações nas configurações no git localmente (lado do cliente). Para isso, vamos configurar um apelido (alias) que aponte para as URLs dos nossos repositórios, e quando o comando ``git push <alias> <branch>`` for executado, as modificações serão empurradas para todos os nossos repositórios previamente configurados. Ou seja, apenas um comando será executado e todos os repositórios serão atualizados.
+
+Para realizar essa configuração é necessário que tenha o git instalado com um bash(terminal) e o repositório do seu projeto clonado localmente. Tendo isso, abra o bash e execute os comandos a seguir::
+
+  $ cd <caminho-do-diretório-do-projeto>
+  $ git remote set-url --add --push <apelido> <URL-repo1>
+  $ git remote set-url --add --push <apelido> <URL-repo2>
+  $ git remote set-url --add --push <apelido> <URL-repo3>
+
+Lembrando que o <apelido> de todos deve ser o mesmo, usualmente é usado o apelido "origin". Com isso, ao empurrar as suas modificações todos os repositórios configurados serão atualizados.
+
+
 Gerenciando listas de email
 ---------------------------
 O Mailman fornece alguns scripts para administração das listas de email, tais programas podem ser encontrados na máquina ``integration`` em ``/usr/lib/mailman/bin``.
@@ -0,0 +1,49 @@
+VERSION = $(shell cat ../VERSION)
+subdirs = colab-spb-plugin colab-spb-theme-plugin noosfero-spb
+
+dist_all = $(patsubst %, %-dist, $(subdirs))
+dist: $(dist_all)
+$(dist_all): %-dist : %
+	if [ -f $*/Makefile ]; then make -C $* dist; fi
+	if [ -f $*/setup.py ]; then (cd $* && python setup.py sdist); fi
+
+clean_all = $(patsubst %, %-clean, $(subdirs))
+clean: $(clean_all)
+	$(MAKE) -C pkg-rpm/ clean
+
+$(clean_all): %-clean : %
+	if [ -f $*/Makefile ]; then make -C $* clean; fi
+	if [ -f $*/setup.py ]; then rm -rf $*/dist; fi
+
+release:
+	@if git tag | grep -q '^v$(VERSION)$$'; then \
+		echo "E: version $(VERSION) already tagged. You need a new version number"; \
+		false; \
+	fi
+	echo '$(VERSION)' > colab-spb-plugin/VERSION
+	echo '$(VERSION)' > colab-spb-theme-plugin/VERSION
+	echo '$(VERSION)' > noosfero-spb/VERSION
+	$(MAKE) dist
+	cp noosfero-spb/dist/*.tar.* pkg-rpm/noosfero-spb/
+	cp colab-spb-theme-plugin/dist/*.tar.* pkg-rpm/colab-spb-theme/
+	cp colab-spb-plugin/dist/*.tar.* pkg-rpm/colab-spb-plugin/
+	sed -i -e 's/^\(Version:\s*\).*/\1$(VERSION)/' \
+		pkg-rpm/colab-spb-theme/colab-spb-theme.spec \
+		pkg-rpm/colab-spb-plugin/colab-spb-plugin.spec \
+		pkg-rpm/noosfero-spb/noosfero-spb.spec
+	git diff
+	@printf "Confirm release? [y/N]"; \
+		read confirm; \
+		if [ "$$confirm" = 'y' -o "$$confirm" = 'Y' ]; then \
+			echo "SPB release $(VERSION)" > .commit_template; \
+			git commit * --file .commit_template; \
+			rm -f .commit_template; \
+		else \
+			echo 'Aborting at your request!'; \
+			git checkout -- colab-spb-theme-plugin/VERSION noosfero-spb/VERSION colab-spb-plugin/VERSION  ; \
+			git checkout -- pkg-rpm/colab-spb-theme/ pkg-rpm/noosfero-spb/ pkg-rpm/colab-spb-plugin/  ; \
+			false; \
+		fi
+	# TODO add pkg-rpm/colab-spb-plugin to the git checkout all above
+	$(MAKE) -C pkg-rpm/ noosfero-spb-upload colab-spb-theme-upload colab-spb-plugin-upload
+	git tag $(VERSION) -s -m 'SPB Release $(VERSION)'
@@ -2,3 +2,4 @@
 *.pyc
 *.sw[po]
 *~
+dist/
 include README.rst
 include MANIFEST.in
+include VERSION
 recursive-include src/colab_spb/static *
 recursive-include src/colab_spb/locale *
 recursive-include src/colab_spb/templates *
@@ -0,0 +1 @@
+5.0a0
@@ -11,9 +11,11 @@ install_requires = [&#39;colab&#39;, &#39;colab_noosfero&#39;, &#39;colab_gitlab&#39;]
  
 tests_require = [ ]
  
+version = open('VERSION').read().strip()
+
 setup(
-    name='colab-spb',
-    version='0.1.0',
+    name='colab-spb-plugin',
+    version=version,
     author='Macartur Sousa',
     author_email='macartur.sc@gmail.com',
     url='https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-plugin/',
@@ -5,3 +5,4 @@ from django.apps import AppConfig
 class SpbAppConfig(AppConfig):
     name = 'colab_spb'
     verbose_name = 'SPB'
+    namespace = 'spb'
@@ -14,7 +14,6 @@ upstream = &#39;localhost&#39;
  
 urls = {
     'include': 'colab_gitlab.urls',
-    'namespace': 'gitlab',  # TODO: do not allow to change namespace
     'prefix': 'gitlab',
 }
  
@@ -14,7 +14,6 @@ upstream = &#39;localhost&#39;
  
 urls = {
     'include': 'colab_noosfero.urls',
-    'namespace': 'noosfero',  # TODO: do not allow to change namespace
     'prefix': 'social',
 }
  
@@ -6,7 +6,6 @@ verbose_name = &quot;SPB Plugin&quot;
 middlewares = ['colab_spb.middleware.ForceLangMiddleware']
  
 urls = {"include": "colab_spb.urls",
-        "prefix": '^spb/',
-        "namespace": "colab_spb"}
+        "prefix": '^spb/',}
  
 url = colab_url_factory('colab_spb')
 PACKAGE = colab-spb-theme
-VERSION = 0.2.0
+VERSION = $(shell cat VERSION)
 DISTDIR = dist
 PACKAGE_NAME = $(PACKAGE)-$(VERSION)
 TARBALL = $(PACKAGE_NAME).tar.gz
@@ -10,10 +10,10 @@ all:
 colab_dir=/usr/lib/colab
  
 dist: clean
-	mkdir -p $(DISTDIR)/$(PACKAGE_NAME) 
-	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR)/$(PACKAGE_NAME) && tar xzf -)
+	mkdir -p $(DISTDIR)/$(PACKAGE_NAME)
+	tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR)/$(PACKAGE_NAME) && tar xf -)
 	cd $(DISTDIR) &&  tar -czf $(TARBALL) $(PACKAGE_NAME)
-	rm -r $(DISTDIR)/$(PACKAGE_NAME) 
+	rm -r $(DISTDIR)/$(PACKAGE_NAME)
 clean:
 	$(RM) $(TARBALL)
 	$(RM) -r $(DISTDIR)
@@ -0,0 +1 @@
+5.0a0
-*.tar.gz
-/noosfero-spb-*
+dist/
 PACKAGE = noosfero-spb
-VERSION = 4.2.1
+VERSION = $(shell cat VERSION)
 DISTDIR = $(PACKAGE)-$(VERSION)
 TARBALL = $(DISTDIR).tar.gz
  
@@ -11,13 +11,13 @@ 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 dist/$(DISTDIR)
  
 clean:
-	$(RM) $(TARBALL)
-	$(RM) -r $(DISTDIR)
+	$(RM) -r dist/
  
 install:
 	install -d -m 0755 $(DESTDIR)/$(plugins_dir)/software_communities
@@ -0,0 +1 @@
+5.0a0
@@ -9,6 +9,10 @@ class GovUserPlugin &lt; Noosfero::Plugin
   include ActionDispatch::Routing
   include Rails.application.routes.url_helpers
  
+  def self.api_mount_points
+    [GovUserPlugin::API]
+  end
+
   def self.plugin_name
     "GovUserPlugin"
   end
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../../../../lib/noosfero/api/helpers'
+require_relative 'api_entities'
+
+class GovUserPlugin::API < Grape::API
+
+  include Noosfero::API::APIHelpers
+
+  resource :gov_user do
+    get 'institutions' do
+      authenticate!
+      institutions = select_filtered_collection_of(environment,'communities',params).joins(:institution)
+      present institutions.map{|o|o.institution}, :with => Entities::Institution
+    end
+
+    get 'institutions/:id' do
+      authenticate!
+      institution = Institution.find_by_id(params[:id])
+      present institution, :with => Entities::Institution
+    end
+
+  end
+end
+
@@ -0,0 +1,13 @@
+module Entities
+  class Institution < Noosfero::API::Entity
+    root 'institutions', 'institution'
+    expose :name, :acronym, :unit_code, :parent_code, :unit_type,
+                  :sub_juridical_nature, :normalization_level,
+                  :version, :cnpj, :type, :governmental_power,
+                  :governmental_sphere, :sisp, :juridical_nature,
+                  :corporate_name, :siorg_code, :id
+    expose :community_id do |institution,options|
+      institution.community.id
+    end
+  end
+end
@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class GovUserApiTest < 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",
+                      "DF",
+                      "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",
+                      "DF",
+                      "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
@@ -3,4 +3,154 @@ PSB Theme for Noosfero
  
 Noosfero theme for the _Portal do Software Público_ project.
  
-Install on /public/designs/themes/noosfero-spb-theme
 \ No newline at end of file
+Install on /public/designs/themes/noosfero-spb-theme
+
+================================
+
+# Passos para configurar o tema a partir do spb/spb
+
+## Considerando que o clone do noosfero está na pasta home
+
+```bash
+rm -r ~/noosfero/public/design/theme/noosfero-spb-theme
+cd ~
+git clone git@softwarepublico.gov.br:softwarepublico/softwarepublico.git
+cd softwarepublico/src/noosfero-spb/
+ln -sr noosfero-spb-theme/ ~/noosfero/public/designs/themes/
+ln -sr software_communities ~/noosfero/plugins/
+ln -sr gov_user ~/noosfero/plugins/
+git remote add theme git@softwarepublico.gov.br:softwarepublico/noosfero-spb-theme.git
+```
+
+# Para instalar o Colab
+
+```bash
+cd ~
+git clone https://github.com/colab/colab
+```
+
+## Configuração
+
+Seguir [tutorial](https://github.com/colab/colab/blob/master/README.rst) do próprio Colab
+
+## Arquivos de configuração Colab
+
+Estando com o ambiente do vagrant levantado `(vagrant up && vagrant ssh)`,
+e "trabalhando" com o colab `(workon colab)`:
+
+## Clone os repositórios:
+
+```bash
+cd ~
+git clone git@softwarepublico.gov.br:softwarepublico/softwarepublico.git
+git clone https://github.com/colab/colab-gitlab-plugin
+git clone https://github.com/colab/colab-noosfero-plugin
+```
+
+## Criando diretórios - Plugins do Colab
+
+```bash
+mkdir /etc/colab/plugins.d/
+cd plugins.d
+```
+
+## Crie os arquivos
+
+### gitlab.py
+
+```bash
+vim gitlab.py
+```
+
+#### Conteúdo do gitlab.py
+
+```python
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+name = "colab_gitlab"
+verbose_name = "Gitlab"
+
+upstream = ''
+private_token = ''
+
+urls = {
+         "include":"colab_gitlab.urls",
+         "prefix": 'gitlab/',
+         "namespace":"gitlab"
+       }
+
+url = colab_url_factory('gitlab')
+```
+
+### noosfero.py
+
+```bash
+vim noosfero.py
+```
+
+#### Conteúdo do noosfero.py
+
+```python
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+name = "colab_noosfero"
+verbose_name = "Noosfero"
+private_token = ""
+
+upstream = 'http://<IP DA SUA MÁQUINA AQUI>:8080/social'
+
+urls = {
+         "include":"colab_noosfero.urls",
+         "prefix": '^social/',
+         "namespace":"social"
+       }
+
+url = colab_url_factory('social')
+```
+
+### spb.py
+
+```bash
+vim spb.py
+```
+
+#### Conteúdo do spb.py
+
+```python
+from django.utils.translation import ugettext_lazy as _
+from colab.plugins.utils.menu import colab_url_factory
+
+name = "colab_spb"
+verbose_name = "SPB Plugin"
+urls = {
+         "include":"colab_spb.urls",
+         "prefix": '^spb/',
+         "namespace":"colab_spb"
+       }
+
+url = colab_url_factory('colab_spb')
+```
+### Execuntando scripts de instalação
+
+```bash
+cd ~/softwarepublico/config/
+pip install -e .
+cd ~/softwarepublico/src/colab-spb-plugin/
+pip install -e .
+colab-admin migrate
+colab-admin migrate colab_spb
+cd ~/colab-gitlab-plugin/
+pip install -e .
+cd ~/softwarepublico/src/colab-spb-plugin/
+pip install -e .
+colab-admin migrate
+```
+
+## Finalizando
+
+Execute o noosfero seja no ambiente local, ou schroot,
+com o comando `RAILS_RELATIVE_URL_ROOT=/social unicorn`
+
+No vagrant, execute `colab-admin runserver 0.0.0.0:8000`
@@ -409,18 +409,19 @@
 }
  
 #content #blog-tab .blog .blog-post h1{
-  margin: 0px 0px 10px 0px;
+  margin: 0px 0px 4px 0px;
   padding: 0px 0px 0px 0px;
-  max-width: 555px;
+  max-width: 100%;
   max-height: 40px;
   border: none;
   font: normal normal bold 16px/20px Arial;
   overflow: hidden;
-  display: inline-block;
+  display: block;
+  text-align: left;
 }
  
 #content #blog-tab .blog .blog-post .post-pic{
-  margin:0 20px 5px 0px;
+  margin:0 20px 25px 0px;
   border-radius: 4px;
   height: 62px;
   width: 19%;
@@ -477,6 +478,7 @@
   color: #172738;
   padding-left:0px;
   text-align: left;
+  display: inline-block;
 }
 #content #blog-tab .blog .blog-post.position-1 .date{
   padding-left:0px;
@@ -492,6 +494,10 @@ float: left;
 }
  
 /* Read more button*/
+#content #blog-tab .blog .blog-post .read-more{
+  display: none;
+}
+
 #content #blog-tab .blog .read-more{
   text-align: right;
   display: block;
@@ -541,6 +547,31 @@ float: left;
 }
  
 /*Block with Community information - Need to develop solution - Only display on profile page */
+#agenda-toolbar a.button{
+  opacity: 1.0;
+}
+
+#content .software-events-block{
+  display: none;
+}
+
+.action-profile_design-index #content .software-events-block,
+.profile-type-is-community .action-profile-index #content .software-events-block{
+  display: block;
+}
+
+/*** Right bar ***/
+
+.template-default.profile-type-is-community .action-profile-index #content .box-3 .software-events-block,
+.template-lefttopright.profile-type-is-community .action-profile-index #content .box-2 .software-events-block{
+  display: none;
+}
+
+.template-lefttopright.profile-type-is-community .action-content_viewer-view_page #content .box-2 .software-events-block{
+  display: block;
+}
+
+/*Block with Community information - Need to develop solution - Only display on profile page */
  
 .profile-type-is-community .block.community-block{
   display: none;
@@ -1151,7 +1182,7 @@ float: left;
   overflow: hidden;
 }
  
-/*** Events ***/
+/*** Events internal page ***/
  
 #content .article-body-event .event-card{
   border-top: 1px dotted #D3D6D3;
@@ -1189,7 +1220,7 @@ float: left;
   letter-spacing: 0.48px;
 }
  
-#content .article-body-event .event-link a{
+#content .box-1 .article-body-event .event-link a{
   text-decoration: underline;
 }
  
@@ -1206,3 +1237,77 @@ float: left;
   font-family: Arial;
   line-height: 22px;
 }
+
+/*software-events-block box-1*/
+
+.box-1 .software-events-block ul.software-community-events-list {
+  border: 1px solid #D3D6DE;
+  border-radius: 8px;
+  width: 100%;
+}
+
+.box-1 .software-events-block li.software-events-list-item {
+  border-bottom: 1px dotted #D3D6DE;
+  font-size: 14px;
+  padding: 7px 0px;
+  padding-left: 16px;
+}
+
+.box-1 .software-events-block li.software-events-list-item:last-child{
+  border:none;
+}
+
+.box-1 .software-events-block .software-events-list-item-calendar {
+  background-image: url("../images/calendar-icon.png");
+  background-repeat: no-repeat;
+  width: 14px;
+  height: 14px;
+  float: left;
+  margin-top: 2px;
+}
+
+.box-1 .software-events-block .software-events-list-item-date {
+  padding-left: 5px;
+  font-weight: 700;
+}
+
+.box-1 .software-events-block .software-events-list-item-title {
+  padding-left: 1px;
+}
+
+/*software-events-block - sidebar - box2*/
+
+#content .box-2 .software-events-block .software-community-events-block{
+  border:1px solid #C0C1C1;
+  border-radius:4px;
+  background-color:#ECEDF1;
+}
+
+#content .box-2 .software-events-block .software-events-list-item{
+  padding:10px 15px;
+  border-bottom:1px dotted #C0C1C1;
+  color:#2C4B6B;
+  font-size: 15px;
+  font-weight: 500;
+}
+
+#content .box-2 .software-events-block .software-events-list-item-date{
+  font-weight: 800;
+}
+
+#content .box-2 .software-events-block .software-events-list-item-title a,
+#content .box-2 .software-events-block .software-events-list-item-title a:visited{
+  color:#2C4B6B;
+}
+
+#content .box-2 .software-events-block .software-events-list-item:first-child{
+  color:#172738;
+  font-weight: 800;
+  text-transform: uppercase;
+  border-bottom: 1px solid #C0C1C1;
+  padding:10px 15px;
+}
+
+#content .box-2 .software-events-block .software-events-list-item:last-child{
+  border:none;
+}
@@ -283,9 +283,9 @@
 .action-home-index #content .display-content-block .image{
   padding-right: 25px;
   padding: 0px 25px 0px 0px;
-  border: 0px solid #c0c1c1;
-  width: 150px;
+  max-width: 150px;
   display: table-cell;
+  vertical-align: top;
 }
  
 .controller-environment_design #content .display-content-block .image a,
@@ -298,7 +298,6 @@
  
 .controller-environment_design #content .display-content-block .image img,
 .action-home-index #content .display-content-block .image img{
-  border: 0px solid #c0c1c1;
   max-width: 150px;
 }
  
@@ -57,13 +57,14 @@
  
 #content .blog .blog-post h1.title {
   margin: 0px 0px 10px 0px;
-  padding: 0px 0px 0px 0px;
-  max-width: 555px;
+  padding: 0px;
+  max-width: 100%;
   max-height: 40px;
   border: none;
   font: normal normal bold 16px/20px arial;
   overflow: hidden;
-  display: inline-block;
+  display: block;
+  white-space: normal;
 }
  
 #content .blog .blog-post h1.title a {
@@ -148,15 +149,24 @@
  
  
 /** Secondary News' Block **/
+
+#content .blog .page-1 .position-1 .title,
+#content .blog .page-1 .position-2 .title,
+#content .blog .page-1 .position-3 .title,
+#content .blog .page-1 .position-4 .title {
+  display: inline-block;
+}
+
 #content .blog .page-1 .position-2,
 #content .blog .page-1 .position-3,
 #content .blog .page-1 .position-4 {
-  margin: 0px 0px 0px 0px;
-  padding: 20px  21px 45px 0px;
-  height: 235px;
+  margin: 0px;
+  padding: 20px 4.2% 5px 0px;
+  height: auto;
   width: 30.5%;
   display: block;
   float: left;
+  border-bottom: none;
 }
  
 #content .blog .page-1 .position-2 p,
@@ -173,7 +183,7 @@
 #content .blog .page-1 .position-2 .post-pic,
 #content .blog .page-1 .position-3 .post-pic,
 #content .blog .page-1 .position-4 .post-pic {
-  margin-top: 12px;
+  margin-bottom: 12px;
   top: 10px;
   height: 120px;
   width: 100%;
@@ -200,6 +210,10 @@
 /* This rule serves to maintain the element in position-5 clear the
  *   configurations of float.
  */
+#content .blog .page-1 .blog-post.position-5{
+  border-top:1px solid #ccc;
+}
+
 #content .blog .blog-post.position-5 {
   clear: both;
 }
@@ -51,13 +51,14 @@
   color: #8a6d3b;
 }
  
-.environment-notification-plugin-notification-bar .warningnotification p a,
-.environment-notification-plugin-notification-notification-modal .warningnotification p a{
+#content .environment-notification-plugin-notification-bar .warningnotification p a,
+#content .environment-notification-plugin-notification-bar .warningnotification p a:visited,
+#content .environment-notification-plugin-notification-notification-modal .warningnotification p a
+#content .environment-notification-plugin-notification-notification-modal .warningnotification p a:visited{
   font-weight: bold;
   color: #8a6d3b;
 }
  
-
 .environment-notification-plugin-notification-bar .informationnotification,
 .environment-notification-plugin-notification-notification-modal .informationnotification{
   background: #d9edf7;
@@ -2,7 +2,8 @@
  
 .action-search-index #content form #search-header,
 .action-search-people #content form #search-header,
-.action-search-communities #content form #search-header {
+.action-search-communities #content form #search-header,
+.action-search-institutions #content form #search-header {
   float: right;
   border: none;
 }
@@ -12,12 +13,14 @@
 }
  
 .action-search-people #content form #search-header,
-.action-search-communities #content form #search-header {
-  margin: 0 0 15px 0 ;
+.action-search-communities #content form #search-header,
+.action-search-institutions #content form #search-header {
+  margin: 0 0 15px 0;
 }
  
 .action-search-people #content form #search-header #search-filters .sod_select,
-.action-search-communities #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 {
   color: #3E67B1;
   border: 1px solid #3E67B1;
   border-radius: 4px;
@@ -28,7 +31,8 @@
 }
  
 .action-search-people #content form #search-header #search-filters .sod_select .sod_list,
-.action-search-communities #content form #search-header #search-filters .sod_select .sod_list {
+.action-search-communities #content form #search-header #search-filters .sod_select .sod_list,
+.action-search-institutions #content form #search-header #search-filters .sod_select .sod_list {
   margin: -2px 0 0 -1px;
   color: #3E67B1;
   border: 1px solid #3E67B1;
@@ -40,34 +44,41 @@
 }
  
 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .active,
-.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active {
+.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active,
+.action-search-institutions #content form #search-header #search-filters .sod_select .sod_list .active {
   border-radius: 0px 0px 4px 4px;
 }
  
 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .selected,
-.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected {
+.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected,
+.action-search-institutions #content form #search-header #search-filters .sod_select .sod_list .selected {
   padding-right: 21px;
 }
  
 .action-search-people #content form #search-subheader .sod_select,
-.action-search-communities #content form #search-subheader .sod_select {
+.action-search-communities #content form #search-subheader .sod_select,
+.action-search-institutions #content form #search-subheader .sod_select {
   line-height: 15px;
 }
  
 .action-search-index #content form .search-field,
 .action-search-people #content form .search-field,
-.action-search-communities #content form .search-field{
+.action-search-communities #content form .search-field,
+.action-search-institutions #content form .search-field {
   margin-bottom: 30px;
 }
  
 .action-search-index #content form .search-field .formfield,
 .action-search-people #content form .search-field .formfield,
-.action-search-communities #content form .search-field .formfield{
+.action-search-communities #content form .search-field .formfield,
+.action-search-institutions #content form .search-field .formfield {
   width: 99%;
 }
+
 .action-search-index #content form .search-field .formfield input,
 .action-search-people #content form .search-field .formfield input,
-.action-search-communities #content form .search-field .formfield input {
+.action-search-communities #content form .search-field .formfield input,
+.action-search-institutions #content form .search-field .formfield input {
   margin-top: 0px;
   padding: 6px;
   height: 19px;
@@ -81,7 +92,8 @@
  
 .action-search-index #content form input.button.submit,
 .action-search-people #content form input.button.submit,
-.action-search-communities #content form input.button.submit {
+.action-search-communities #content form input.button.submit,
+.action-search-institutions #content form input.button.submit {
   background: #3E67B1;
   color: #FFF;
   border-radius: 4px;
@@ -94,12 +106,14 @@
  
 .action-search-index #content form input.button.submit:hover,
 .action-search-people #content form input.button.submit:hover,
-.action-search-communities #content form input.button.submit:hover {
+.action-search-communities #content form input.button.submit:hover,
+.action-search-institutions #content form input.button.submit:hover {
   background: #5E82C6;
 }
  
 .action-search-people #search-results .search-results-type-people,
-.action-search-communities #search-results .search-results-type-community {
+.action-search-communities #search-results .search-results-type-community,
+.action-search-institutions #search-results .search-results-type-institution {
   background: none;
   border: 1px solid #ccc;
   border-radius: 10px;
@@ -119,3 +133,31 @@
   background: none;
   border: 1px solid #ccc;
 }
+
+.search-software-item .search-software-content-block .search-content-result a {
+  color: #172738 !important;
+}
+
+.action-search-institutions .common-profile-list-block .vcard a.profile_link, .comment-actions .vcard a.profile_link{
+  height: 108px;
+  max-height: 108px;
+}
+
+.action-search-institutions #content .search-results-box .vcard{
+  margin: 8.5px
+}
+
+.action-search-institutions .menu-submenu-content{
+  height: auto;
+}
+
+.action-search-institutions #content .menu-submenu h4{
+  text-align: center;
+}
+
+.action-search-institutions #content .menu-submenu-content ul a{
+  padding-left: 0;
+  text-align: center;
+}
+
+
@@ -53,7 +53,7 @@
     margin: 0 0 0 15px;
 }
  
- It's TEMPORARY 
+ It's TEMPORARY
 .action-search-software_infos #content .search-form .doubts-catalog-software {
     display: none;
 }*/
@@ -65,7 +65,7 @@
   line-height: 20px;
   position:absolute;
 }
-.action-search-software_infos .search-form label, 
+.action-search-software_infos .search-form label,
 .action-search-software_infos .search-form label{
   margin:0px 3px 4px 32px;
   line-height: 22px;
@@ -310,9 +310,9 @@
  
 /* Column left */
  
-.action-search-software_infos #search-results .search-software-item-column-left{
-  width: 130px;
-  height: 130px;
+.action-search-software_infos #search-results .search-software-item-column-left {
+  width: 140px;
+  height: 140px;
   float: left;
   border-right: 1px dotted  #ccc;
 }
@@ -359,7 +359,7 @@
 }
  
 .action-search-software_infos #search-results .search-software-item-column-left .extra_info {
-  width: 130px;
+  width: 140px;
   padding-right: 20px;
   top: 0px;
   position: absolute;
@@ -370,18 +370,32 @@
   opacity: inherit;
 }
  
-.action-search-software_infos #search-results .search-software-item-column-left .extra_info::before{
+.action-search-software_infos #search-results .search-software-item-column-left .software-date {
+  margin-top: 20px;
+  width: 130px;
+}
+
+.action-search-software_infos #search-results .search-software-item-column-left .software-date::before{
   content: url("../images/ic-calendar.png");
-  margin: 6px 10px 20px 0;
+  margin: 0px 7px 20px 0;
   float: left;
 }
  
+.action-search-software_infos #search-results .search-software-item-column-left .star-container.catalog_rating_block {
+  width: 140px;
+  margin-left: 0px;
+}
+
+.action-search-software_infos #search-results .search-software-item-column-left .software-date-value {
+  margin-left: 23px;
+}
+
 /* Column Right */
  
 .action-search-software_infos #search-results .search-software-item-column-right {
-  width: 70%;
+  width: 65%;
   float: left;
-  margin-left: 130px;
+  margin-left: 140px;
   padding: 0 0 0 8px;
   font-size: 15px;
   font-family: Arial;
@@ -439,3 +453,5 @@
   font-size: 13px;
   text-decoration: underline;
 }
+
+
@@ -89,14 +89,15 @@
   display: block;
 }
  
-#content .download-block .download-button #download-size {
-  border: 1px solid #1a397d;
-  border-radius: 0px 0px 8px 8px;
-  background-color: #1a397d;
-  color: #ffffff;
-  font-size: 12px;
+#content .download-block .download-button .download-size {
   text-align: center;
-  display: none;
+  display: block;
+  background: rgb(0, 40, 140) none repeat scroll 0% 0%;
+  color: rgb(255, 255, 255);
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
+  margin-top: -15px;
+  line-height: 20px;
 }
  
 #content .download-block .download-info {
@@ -208,9 +209,7 @@
 }
  
 #content .box-1 .categories-and-tags-block .category_cloud{
-  display: inline-flex;
   margin: 13px 0 10px 0;
-  max-width: 87%;
 }
  
 #content .box-1 .categories-and-tags-block .category_cloud a{
@@ -590,7 +589,7 @@
   padding: 45px 40px 4px 10px;
   border: 1px solid #2C66CE;
   border-radius: 4px;
-  background: #2C66CE url("../images/download-mini_icon.png") center center no-repeat;
+  background: #2C66CE url("../images/history-mini_icon.png") center center no-repeat;
   display: block;
   float: left;
 }
@@ -322,8 +322,12 @@
   padding-right: 6px;
 }
  
+/*FIX_ME - tmp css solution for development tmp solution, remove when fixed on plugin*/
+
 #content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_people_benefited,
-#content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_saved_value {
+#content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_saved_value,
+#content .star-rate-form .star-comment-container .comments-software-extra-fields #people_benefited_tmp,
+#content .star-rate-form .star-comment-container .comments-software-extra-fields #saved_value_tmp {
   display: block;
   height: 19px;
   width: 155px;
@@ -344,13 +348,17 @@
 #content .star-rate-form .star-comment-container .star-tooltip {
   cursor: default;
   content: '?';
-  border-radius: 90%;
-  font-size: 12px;
-  font-weight: 700;
-  background: #3867b7;
-  color: #fff;
-  margin-left: 4px;
-  padding: 0px 6px;
+  padding-top: 2px;
+  background-color: #3867b7;
+  color: #ffffff;
+  font-weight: bold;
+  cursor: pointer;
+  height: 15px;
+  font-family: arial;
+  width: 17px;
+  display: inline-block;
+  text-align: center;
+  border-radius: 50%
 }
  
 .ratings-list {
@@ -268,10 +268,15 @@ $(&#39;#link-buscar&#39;).click(function(e) {
     }
   }
  
+  function move_breadcrumbs() {
+    $('.breadcrumbs-plugin_content-breadcrumbs-block').prependTo('#wrap-2');
+  }
+
   $(document).ready(function(){
     add_tooltips();
     add_popovers();
     move_article_buttons();
+    move_breadcrumbs();
     insert_notice_div();
     set_uploaded_files_names();
     set_tooltip_content();
@@ -5,11 +5,9 @@ class SoftwareCommunitiesPluginController &lt; ApplicationController
   def get_license_data
     return render :json=>{} if !request.xhr? || params[:query].nil?
  
-    data = if params[:query].empty?
-             LicenseInfo.all
-           else
-             LicenseInfo.where("version ILIKE ?", "%#{params[:query]}%").select("id, version")
-           end
+    data = LicenseHelper.find_licenses(params[:query]) if params[:query]
+    data ||= LicenseInfo.all
+
     render :json=> data.collect { |license|
       {:id=>license.id, :label=>license.version}
     }
@@ -44,11 +42,7 @@ class SoftwareCommunitiesPluginController &lt; ApplicationController
   protected
  
   def get_model_by_params_field
-    case params[:field]
-    when "software_language"
-      return ProgrammingLanguage
-    else
-      return DatabaseDescription
-    end
+    return DatabaseDescription unless params[:field] == "software_language"
+    return ProgrammingLanguage
   end
 end
@@ -9,13 +9,13 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
  
     @community = Community.new(params[:community])
     @community.environment = environment
-    @software_info = SoftwareInfo.new(params[:software_info])
  
-    @license_info = if params[:license].blank? or params[:license][:license_infos_id].blank?
-      LicenseInfo.new
-    else
-      LicenseInfo.find(params[:license][:license_infos_id])
-    end
+    @license_info = LicenseInfo.find_by_id(params[:license][:license_infos_id]) if params[:license]
+    @license_info ||= LicenseInfo.new
+
+    @software_info = SoftwareInfo.new(params[:software_info])
+    @software_info.community = @community
+    @software_info.license_info = @license_info
  
     control_software_creation
     update_new_software_errors
@@ -26,14 +26,15 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
  
     return unless request.post?
  
-    @software_info = constroy_software
+    @software_info = create_software
     software_info_insert_models.call(@list_libraries, 'libraries')
     software_info_insert_models.call(@list_languages, 'software_languages')
     software_info_insert_models.call(@list_databases, 'software_databases')
     software_info_insert_models.call(@list_operating_systems, 'operating_systems')
  
     begin
-      @software_info.save!
+      raise NotAdminException unless can_change_public_software?
+      @software_info.update_attributes!(params[:software])
  
       @community = @software_info.community
       @community.update_attributes!(params[:community])
@@ -44,31 +45,50 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
         redirect_to :controller => 'profile_editor', :action => 'index'
         session[:notice] = _('Software updated successfully')
       end
-    rescue ActiveRecord::RecordInvalid => invalid
+    rescue NotAdminException, ActiveRecord::RecordInvalid => invalid
       update_new_software_errors
       session[:notice] = _('Could not update software')
     end
   end
  
-  def disabled_public_software_field
-    !environment.admins.include?(current_user.person)
-  end
-
   private
  
+  def can_change_public_software?
+    if !user.is_admin?(environment)
+      if params[:software][:public_software]
+        @software_info.errors.add(:public_software, _("You don't have permission to change public software status"))
+        return false
+      end
+
+      if params[:software].keys.any?{|key| ["e_ping","e_mag","icp_brasil","e_arq","intern"].include?(key)}
+        @software_info.errors.add(:base, _("You don't have permission to change public software attributes"))
+        return false
+      end
+    end
+    return true
+  end
+
   def add_software_erros
       @errors = []
-      @errors |= @community.errors.full_messages if @community
+      if @community
+        error = @community.errors.delete(:identifier)
+        @errors |= [_("Domain %s") % error.first ] if error
+        @errors |= @community.errors.full_messages
+      end
       @errors |= @software_info.errors.full_messages if @software_info
       @errors |= @license_info.errors.full_messages if @license_info
   end
  
   def control_software_creation
-    valid_models = request.post? && (@community.valid? && @software_info.valid? && @license_info.valid?)
-    if valid_models
-      send_software_to_moderation
-    else
-      add_software_erros
+    if request.post?
+      valid_models = @community.valid?
+      valid_models &= @software_info.valid?
+      valid_models &= @license_info.valid?
+      if valid_models
+        send_software_to_moderation
+      else
+        add_software_erros
+      end
     end
   end
  
@@ -79,16 +99,14 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     }
   end
  
-  def constroy_software
+  def create_software
     @software_info = @profile.software_info
-    params[:software][:public_software] ||= false unless @software_info.public_software?
-    @license = LicenseInfo.find(params[:license][:license_infos_id])
-    @software_info.license_info = @license
-    @software_info.update_attributes(params[:software])
-
     another_license_version = nil
     another_license_link = nil
     if params[:license]
+      @license = LicenseInfo.find(params[:license][:license_infos_id])
+      @software_info.license_info = @license
+
       another_license_version = params[:license][:version]
       another_license_link = params[:license][:link]
     end
@@ -126,7 +144,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
  
     add_admin_to_community
  
-    if  !environment.admins.include?(current_user.person)
+    if !environment.admins.include?(current_user.person)
       session[:notice] = _('Your new software request will be evaluated by an'\
                            'administrator. You will be notified.')
       redirect_to user.admin_url
@@ -143,7 +161,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     @list_databases = @software_info.software_databases
     @list_languages = @software_info.software_languages
     @list_operating_systems = @software_info.operating_systems
-    @disabled_public_software_field = disabled_public_software_field
+    @non_admin_status = 'disabled' unless user.is_admin?(environment)
  
     @license_version = @software_info.license_info.version
     @license_id = @software_info.license_info.id
@@ -184,7 +202,6 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
       add_software_erros
     end
  
-
     @error_community_name = @community.errors.include?(:name) ? "highlight-error" : "" if @community
     @error_software_acronym = @software_info.errors.include?(:acronym) ? "highlight-error" : "" if @software_info
     @error_software_domain = @community.errors.include?(:identifier) ? "highlight-error" : "" if @community
@@ -192,3 +209,5 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     @error_software_license = @license_info.errors.include?(:version) ? "highlight-error" : "" if @license_info
   end
 end
+
+class NotAdminException < Exception; end
@@ -80,3 +80,33 @@ Feature: Search software
     Then I should see "Software One"
     And I should see "Software Two"
     And I should see "Software Three"
+
+  @selenium
+  Scenario: See software rating on catalog
+    Given plugin "OrganizationRatings" is enabled on environment
+    And I am logged in as mpog_admin
+    And I go to /admin/plugins
+    And I check "Organization Ratings"
+    And I press "Save changes"
+    And I go to /admin/admin_panel/site_info
+    And I select "Software Público" from "environment_theme"
+    And I press "Save"
+    And I go to /account/logout
+    Given the following user
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following blocks
+      | owner         | type                      |
+      | software-two  | AverageRatingBlock        |
+      | software-two  | OrganizationRatingsBlock  |
+    And the environment domain is "localhost"
+    And I am logged in as "joaosilva"
+    And I go to /profile/software-two/plugin/organization_ratings/new_rating
+    And I press "Enviar"
+    And I go to /search/software_infos
+    When I select "Favorites" from "sort"
+    And I sleep for 3 seconds
+    Then I should see "Software Two" before "Software One"
+    And there should be 1 div with class "small-star-positive"
+    And there should be 4 divs with class "small-star-negative"
+
@@ -194,7 +194,7 @@ Given /^the user &quot;([^&quot;]*)&quot; has &quot;([^&quot;]*)&quot; as secondary e\-mail$/ do |login, email
 end
  
 Given /^I click on anything with selector "([^"]*)"$/ do |selector|
-  evaluate_script "jQuery('#{selector}').trigger('click') && true"
+  page.evaluate_script("jQuery('##{selector}').click();")
 end
  
 Given /^I should see "([^"]*)" of this selector "([^"]*)"$/ do |quantity, selector|
@@ -243,3 +243,7 @@ Given /^I keyup on selector &quot;([^&quot;]*)&quot;$/ do |selector|
   selector_founded = evaluate_script("jQuery('#{selector}').trigger('keyup').length != 0")
   selector_founded.should be_true
 end
+
+Then /^there should be (\d+) divs? with class "([^"]*)"$/ do |count, klass|
+  should have_selector("div.#{klass}", :count => count)
+end
@@ -0,0 +1,56 @@
+Feature: Use report
+  As a user
+  I want to make a use report of a software
+  to give my feedback about a software.
+
+  Background:
+    Given "SoftwareCommunitiesPlugin" plugin is enabled
+    Given "OrganizationRatings" 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 softwares
+      | name      | public_software | finality      |
+      | Noosfero  | true            | some finality |
+
+  Scenario: Add Organization Ratings Block
+    Given I go to Noosfero's control panel
+    And I follow "Edit sideboxes"
+    When I follow "Add a block"
+    And I choose "Organization Ratings"
+    And I press "Add"
+    Then I should see "Report your experiences"
+  
+  Scenario: Add Average Rating Block
+    Given I go to Noosfero's control panel
+    And I follow "Edit sideboxes"
+    When I follow "Add a block"
+    And I choose "Organization Average Rating"
+    And I press "Add"
+    Then I should see "Be the first to rate!"
+
+  @selenium
+  Scenario: Test Additional Fields JavaScript
+    Given I go to /profile/noosfero/plugin/organization_ratings/new_rating
+    Then I should not see "Number of Beneficiaries"
+    And I should not see "Saved Resources"
+    When I click on anything with selector "comments-additional-information"
+    Then I should see "Number of Beneficiaries"
+    And I should see "Saved Resources"
+
+   @selenium
+   Scenario: Validate Use Report fields format
+    Given I go to Noosfero's control panel
+    Given I follow "Edit sideboxes"
+    When I follow "Add a block"
+    And I choose "Organization Ratings"
+    And I press "Add"
+    And I am on Noosfero's homepage
+    And I follow "Rate Community"
+    When I click on anything with selector "comments-additional-information"
+    And I fill in "organization_rating_people_benefited" with "123123"
+    And I fill in "organization_rating_saved_value" with "7654321"
+    And I press "Save"
+    Then I should see "Benefited People: 123.123"
+    And I should see "Saved Resources: $ 76,543.21"
@@ -5,12 +5,14 @@ class CreateSoftware &lt; Task
   validates_presence_of :name
  
   attr_accessible :name, :finality, :repository_link, :requestor, :environment,
-                  :reject_explanation, :license_info
+                  :reject_explanation, :license_info, :identifier, :another_license_version,
+                  :another_license_link
  
   alias :environment :target
   alias :environment= :target=
  
-  DATA_FIELDS = ['name', 'finality', 'license_info', 'repository_link']
+  DATA_FIELDS = ['name', 'identifier', 'finality', 'license_info', 'repository_link',
+                 'another_license_version', 'another_license_link']
   DATA_FIELDS.each do |field|
     settings_items field.to_sym
   end
@@ -21,15 +23,21 @@ class CreateSoftware &lt; Task
       template_id = software_template.id
     end
  
+    identifier = self.identifier
+    identifier ||= self.name.to_slug
+
     community = Community.create!(:name => self.name,
+                                  :identifier => identifier,
                                   :template_id => template_id)
  
     community.environment = self.environment
     community.add_admin(self.requestor)
  
-    software = SoftwareInfo.create!(:finality => self.finality,
+    software = SoftwareInfo.new(:finality => self.finality,
     :repository_link => self.repository_link, :community_id => community.id,
     :license_info => self.license_info)
+    software.verify_license_info(self.another_license_version, self.another_license_link)
+    software.save!
   end
  
   def title
@@ -34,12 +34,7 @@ class DatabaseHelper &lt; DynamicTableHelper
  
   def self.valid_list_database? list_databases
     return false if list_databases.nil? or list_databases.length == 0
-
-    list_databases.each do |database|
-      return false unless database.valid?
-    end
-
-    true
+    return !list_databases.any?{|database| !database.valid?}
   end
  
   def self.database_as_tables(list_databases, disabled=false)
@@ -51,14 +46,10 @@ class DatabaseHelper &lt; DynamicTableHelper
  
   def self.database_html_structure(database_data, disabled)
     database_id = database_data[:database_description_id]
-    database_name = if database_data[:database_description_id].blank?
-      ""
-    else
-      DatabaseDescription.find(
+    database_name = database_id.blank? ? "" : DatabaseDescription.find(
         database_data[:database_description_id],
         :select=>"name"
       ).name
-    end
  
     data = {
       model_name: MODEL_NAME,
@@ -83,4 +74,4 @@ class DatabaseHelper &lt; DynamicTableHelper
   def self.add_dynamic_table
     database_as_tables(nil).first.call
   end
-end
 \ No newline at end of file
+end
@@ -105,6 +105,8 @@ class SearchController
       communities_list.reverse!
     elsif params[:sort] && params[:sort] == "relevance"
       communities_list = sort_by_relevance(communities_list, params[:query]){ |community| [community.software_info.finality, community.name] }
+    elsif params[:sort] && params[:sort] == "rating"
+      communities_list = sort_by_average_rating(communities_list)
     end
     communities_list
   end
@@ -30,4 +30,16 @@ module SearchHelper
     list
   end
  
+  def sort_by_average_rating list
+    list.sort! do |a, b|
+      rating_a = OrganizationRating.average_rating(a.id)
+      rating_a = 0 if rating_a.nil?
+      rating_b = OrganizationRating.average_rating(b.id)
+      rating_b = 0 if rating_b.nil?
+      rating_a - rating_b
+    end
+
+    list.reverse!
+  end
+
 end
@@ -20,12 +20,7 @@ class LibraryHelper &lt; DynamicTableHelper
  
   def self.valid_list_library? list_libraries
     return true if list_libraries.nil? or list_libraries.length == 0
-
-    list_libraries.each do |library|
-      return false unless library.valid?
-    end
-
-    true
+    return !list_libraries.any?{|library| !library.valid?}
   end
  
   def self.libraries_as_tables list_libraries, disabled=false
@@ -59,4 +54,4 @@ class LibraryHelper &lt; DynamicTableHelper
   def self.add_dynamic_table
     libraries_as_tables(nil).first.call
   end
-end
 \ No newline at end of file
+end
 module LicenseHelper
-  def self.getListLicenses
-    LicenseInfo.all
+  def self.find_licenses query
+    licenses = LicenseInfo.where("version ILIKE ?", "%#{query}%").select("id, version")
+    licenses.reject!{|license| license.version == "Another"}
+    license_another = LicenseInfo.find_by_version("Another")
+    licenses << license_another if license_another
+    licenses
   end
-end
 \ No newline at end of file
+end
@@ -25,12 +25,8 @@ class OperatingSystemHelper &lt; DynamicTableHelper
   end
  
   def self.valid_list_operating_system? list_operating_system
-    return !(list_operating_system.nil? || list_operating_system.length == 0)
-
-    list_operating_system.each do |operating_system|
-      return false unless operating_system.valid?
-    end
-    true
+    return false if (list_operating_system.nil? || list_operating_system.length == 0)
+    return !list_operating_system.any?{|os| !os.valid?}
   end
  
   def self.operating_system_as_tables(list_operating_system, disabled=false)
@@ -17,9 +17,13 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
     _('Add Public Software and MPOG features.')
   end
  
+  def self.api_mount_points
+    [SoftwareCommunitiesPlugin::API]
+  end
+
   def profile_tabs
-    if context.profile.community?
-      return profile_tabs_software if context.profile.software?
+    if context.profile.community? && context.profile.software?
+      return profile_tabs_software
     end
   end
  
@@ -43,7 +47,8 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
       SoftwareHighlightsBlock => { :type => [Environment] },
       SoftwareTabDataBlock => {:type => [Community], :position => 1},
       WikiBlock => {:type => [Community]},
-      StatisticBlock => { :type => [Community] }
+      StatisticBlock => { :type => [Community] },
+      SoftwareEventsBlock => { :type => [Community] }
     }
   end
  
@@ -102,7 +107,6 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
         is_admin ||= user_rating.organization.admins.include?(current_user.person)
  
         if is_admin and profile.software?
-
             render :file => 'organization_ratings_extra_fields_show_data',
                    :locals => {:user_rating => user_rating}
         end
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../../../../lib/noosfero/api/helpers'
+require_relative 'api_entities'
+
+class SoftwareCommunitiesPlugin::API < Grape::API
+
+  include Noosfero::API::APIHelpers
+
+  resource :software_communities do
+    get do
+      authenticate!
+      softwares = select_filtered_collection_of(environment,'communities',params).joins(:software_info)
+      present softwares.map{|o|o.software_info}, :with => Entities::SoftwareInfo
+    end
+
+    get ':id' do
+      authenticate!
+      software = SoftwareInfo.find_by_id(params[:id])
+      present software, :with => Entities::SoftwareInfo
+    end
+
+  end
+end
+
@@ -0,0 +1,10 @@
+module Entities
+  class SoftwareInfo < Noosfero::API::Entity
+    root 'software_infos', 'software_info'
+    expose :id, :finality, :repository_link, :public_software, :acronym, :objectives,
+                :features,:license_info, :software_languages, :software_databases, :operating_system_names
+    expose :community_id do |software_info,options|
+      software_info.community.id
+    end
+  end
+end
@@ -0,0 +1,44 @@
+class SoftwareEventsBlock < Block
+
+  def self.description
+    _('Software community events')
+  end
+
+  def help
+    _('This block displays the software community events in a list.')
+  end
+
+  def content(args={})
+    block = self
+
+    lambda do |object|
+      render(
+        :file => 'blocks/software_events',
+        :locals => { :block => block }
+      )
+    end
+  end
+
+  def cacheable?
+    false
+  end
+
+  def get_events
+    today = DateTime.now.beginning_of_day
+    self.owner.events.where("end_date >= ?", today).order(:start_date)
+  end
+
+  def get_events_except event_slug=""
+    event_slug = "" if event_slug.nil?
+
+    get_events.where("slug NOT IN (?)", event_slug)
+  end
+
+  def has_events_to_display?
+    not get_events.empty?
+  end
+
+  def should_display_title?
+    self.box.position != 1
+  end
+end
@@ -23,22 +23,6 @@ module SoftwareHelper
   end
  
   def self.all_table_is_empty? table, ignored_fields=[]
-    filled_fields = []
-
-    table.each do |key, value|
-      unless ignored_fields.include? key
-        filled_fields << if value.empty?
-          false
-        else
-          true
-        end
-      end
-    end
-
-    if filled_fields.include? true
-      false
-    else
-      true
-    end
+    return !table.keys.any?{|key| ignored_fields.include?(key) ? false : !table[key].empty?}
   end
 end
@@ -84,19 +84,19 @@ class SoftwareInfo &lt; ActiveRecord::Base
   validates_length_of :finality, :maximum => 120
   validates_length_of :objectives, :maximum => 4000
   validates_length_of :features, :maximum => 4000
-  validates_presence_of :finality
+  validates_presence_of :finality, :community
  
   validate :validate_acronym
  
   settings_items :another_license_version, :another_license_link
  
   # used on find_by_contents
-  scope :like_search, lambda{ |name|
+  def self.like_search name
     joins(:community).where(
       "name ILIKE ? OR acronym ILIKE ? OR finality ILIKE ?",
       "%#{name}%", "%#{name}%", "%#{name}%"
     )
-  }
+  end
  
   scope :search, lambda { |name="", database_description_id = "",
     programming_language_id = "", operating_system_name_id = "",
@@ -166,13 +166,16 @@ class SoftwareInfo &lt; ActiveRecord::Base
     another_license_link = attributes.delete(:another_license_link)
  
     software_info = SoftwareInfo.new(attributes)
-    if !environment.admins.include? requestor
+    unless environment.admins.include? requestor
       CreateSoftware.create!(
         attributes.merge(
           :requestor => requestor,
           :environment => environment,
           :name => name,
-          :license_info => license_info
+          :identifier => identifier,
+          :license_info => license_info,
+          :another_license_version => another_license_version,
+          :another_license_link => another_license_link
         )
       )
     else
@@ -189,15 +192,15 @@ class SoftwareInfo &lt; ActiveRecord::Base
         community.template_id = software_template.id
       end
  
-      software_info.license_info = license_info
-      software_info.save
-      community.software_info = software_info
       community.save!
       community.add_admin(requestor)
+
+      software_info.community = community
+      software_info.license_info = license_info
+      software_info.verify_license_info(another_license_version, another_license_link)
+      software_info.save!
     end
  
-    software_info.verify_license_info(another_license_version, another_license_link)
-    software_info.save!
     software_info
   end
  
@@ -50,10 +50,9 @@ class SoftwareLanguageHelper &lt; DynamicTableHelper
  
   def self.language_html_structure(language_data, disabled)
     language_id = language_data[:programming_language_id]
-    language_name = if language_data[:programming_language_id].blank?
-      ""
-    else
-      ProgrammingLanguage.find(
+    language_name = ""
+    unless language_data[:programming_language_id].blank?
+      language_name = ProgrammingLanguage.find(
         language_data[:programming_language_id],
         :select=>"name"
       ).name
@@ -114,3 +114,6 @@
   overflow: auto;
 }
  
+.catalog_rating_block {
+  margin-top: 5px;
+}
-/*
-	Masked Input plugin for jQuery
-	Copyright (c) 2007-2013 Josh Bush (digitalbush.com)
-	Licensed under the MIT license (http://digitalbush.com/projects/masked-input-plugin/#license)
-	Version: 1.3.1
-*/
-(function(e){function t(){var e=document.createElement("input"),t="onpaste";return e.setAttribute(t,""),"function"==typeof e[t]?"paste":"input"}var n,a=t()+".mask",r=navigator.userAgent,i=/iphone/i.test(r),o=/android/i.test(r);e.mask={definitions:{9:"[0-9]",a:"[A-Za-z]","*":"[A-Za-z0-9]"},dataName:"rawMaskFn",placeholder:"_"},e.fn.extend({caret:function(e,t){var n;if(0!==this.length&&!this.is(":hidden"))return"number"==typeof e?(t="number"==typeof t?t:e,this.each(function(){this.setSelectionRange?this.setSelectionRange(e,t):this.createTextRange&&(n=this.createTextRange(),n.collapse(!0),n.moveEnd("character",t),n.moveStart("character",e),n.select())})):(this[0].setSelectionRange?(e=this[0].selectionStart,t=this[0].selectionEnd):document.selection&&document.selection.createRange&&(n=document.selection.createRange(),e=0-n.duplicate().moveStart("character",-1e5),t=e+n.text.length),{begin:e,end:t})},unmask:function(){return this.trigger("unmask")},mask:function(t,r){var c,l,s,u,f,h;return!t&&this.length>0?(c=e(this[0]),c.data(e.mask.dataName)()):(r=e.extend({placeholder:e.mask.placeholder,completed:null},r),l=e.mask.definitions,s=[],u=h=t.length,f=null,e.each(t.split(""),function(e,t){"?"==t?(h--,u=e):l[t]?(s.push(RegExp(l[t])),null===f&&(f=s.length-1)):s.push(null)}),this.trigger("unmask").each(function(){function c(e){for(;h>++e&&!s[e];);return e}function d(e){for(;--e>=0&&!s[e];);return e}function m(e,t){var n,a;if(!(0>e)){for(n=e,a=c(t);h>n;n++)if(s[n]){if(!(h>a&&s[n].test(R[a])))break;R[n]=R[a],R[a]=r.placeholder,a=c(a)}b(),x.caret(Math.max(f,e))}}function p(e){var t,n,a,i;for(t=e,n=r.placeholder;h>t;t++)if(s[t]){if(a=c(t),i=R[t],R[t]=n,!(h>a&&s[a].test(i)))break;n=i}}function g(e){var t,n,a,r=e.which;8===r||46===r||i&&127===r?(t=x.caret(),n=t.begin,a=t.end,0===a-n&&(n=46!==r?d(n):a=c(n-1),a=46===r?c(a):a),k(n,a),m(n,a-1),e.preventDefault()):27==r&&(x.val(S),x.caret(0,y()),e.preventDefault())}function v(t){var n,a,i,l=t.which,u=x.caret();t.ctrlKey||t.altKey||t.metaKey||32>l||l&&(0!==u.end-u.begin&&(k(u.begin,u.end),m(u.begin,u.end-1)),n=c(u.begin-1),h>n&&(a=String.fromCharCode(l),s[n].test(a)&&(p(n),R[n]=a,b(),i=c(n),o?setTimeout(e.proxy(e.fn.caret,x,i),0):x.caret(i),r.completed&&i>=h&&r.completed.call(x))),t.preventDefault())}function k(e,t){var n;for(n=e;t>n&&h>n;n++)s[n]&&(R[n]=r.placeholder)}function b(){x.val(R.join(""))}function y(e){var t,n,a=x.val(),i=-1;for(t=0,pos=0;h>t;t++)if(s[t]){for(R[t]=r.placeholder;pos++<a.length;)if(n=a.charAt(pos-1),s[t].test(n)){R[t]=n,i=t;break}if(pos>a.length)break}else R[t]===a.charAt(pos)&&t!==u&&(pos++,i=t);return e?b():u>i+1?(x.val(""),k(0,h)):(b(),x.val(x.val().substring(0,i+1))),u?t:f}var x=e(this),R=e.map(t.split(""),function(e){return"?"!=e?l[e]?r.placeholder:e:void 0}),S=x.val();x.data(e.mask.dataName,function(){return e.map(R,function(e,t){return s[t]&&e!=r.placeholder?e:null}).join("")}),x.attr("readonly")||x.one("unmask",function(){x.unbind(".mask").removeData(e.mask.dataName)}).bind("focus.mask",function(){clearTimeout(n);var e;S=x.val(),e=y(),n=setTimeout(function(){b(),e==t.length?x.caret(0,e):x.caret(e)},10)}).bind("blur.mask",function(){y(),x.val()!=S&&x.change()}).bind("keydown.mask",g).bind("keypress.mask",v).bind(a,function(){setTimeout(function(){var e=y(!0);x.caret(e),r.completed&&e==x.val().length&&r.completed.call(x)},0)}),y()}))}})})(jQuery);
 \ No newline at end of file
+// jQuery Mask Plugin v1.13.4
+// github.com/igorescobar/jQuery-Mask-Plugin
+(function(b){"function"===typeof define&&define.amd?define(["jquery"],b):"object"===typeof exports?module.exports=b(require("jquery")):b(jQuery||Zepto)})(function(b){var y=function(a,c,d){a=b(a);var g=this,k=a.val(),l;c="function"===typeof c?c(a.val(),void 0,a,d):c;var e={invalid:[],getCaret:function(){try{var q,b=0,e=a.get(0),f=document.selection,c=e.selectionStart;if(f&&-1===navigator.appVersion.indexOf("MSIE 10"))q=f.createRange(),q.moveStart("character",a.is("input")?-a.val().length:-a.text().length),
+b=q.text.length;else if(c||"0"===c)b=c;return b}catch(d){}},setCaret:function(q){try{if(a.is(":focus")){var b,c=a.get(0);c.setSelectionRange?c.setSelectionRange(q,q):c.createTextRange&&(b=c.createTextRange(),b.collapse(!0),b.moveEnd("character",q),b.moveStart("character",q),b.select())}}catch(f){}},events:function(){a.on("input.mask keyup.mask",e.behaviour).on("paste.mask drop.mask",function(){setTimeout(function(){a.keydown().keyup()},100)}).on("change.mask",function(){a.data("changed",!0)}).on("blur.mask",
+function(){k===a.val()||a.data("changed")||a.triggerHandler("change");a.data("changed",!1)}).on("blur.mask",function(){k=a.val()}).on("focus.mask",function(a){!0===d.selectOnFocus&&b(a.target).select()}).on("focusout.mask",function(){d.clearIfNotMatch&&!l.test(e.val())&&e.val("")})},getRegexMask:function(){for(var a=[],b,e,f,d,h=0;h<c.length;h++)(b=g.translation[c.charAt(h)])?(e=b.pattern.toString().replace(/.{1}$|^.{1}/g,""),f=b.optional,(b=b.recursive)?(a.push(c.charAt(h)),d={digit:c.charAt(h),
+pattern:e}):a.push(f||b?e+"?":e)):a.push(c.charAt(h).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&"));a=a.join("");d&&(a=a.replace(new RegExp("("+d.digit+"(.*"+d.digit+")?)"),"($1)?").replace(new RegExp(d.digit,"g"),d.pattern));return new RegExp(a)},destroyEvents:function(){a.off("input keydown keyup paste drop blur focusout ".split(" ").join(".mask "))},val:function(b){var c=a.is("input")?"val":"text";if(0<arguments.length){if(a[c]()!==b)a[c](b);c=a}else c=a[c]();return c},getMCharsBeforeCount:function(a,
+b){for(var e=0,f=0,d=c.length;f<d&&f<a;f++)g.translation[c.charAt(f)]||(a=b?a+1:a,e++);return e},caretPos:function(a,b,d,f){return g.translation[c.charAt(Math.min(a-1,c.length-1))]?Math.min(a+d-b-f,d):e.caretPos(a+1,b,d,f)},behaviour:function(a){a=a||window.event;e.invalid=[];var c=a.keyCode||a.which;if(-1===b.inArray(c,g.byPassKeys)){var d=e.getCaret(),f=e.val().length,n=d<f,h=e.getMasked(),k=h.length,m=e.getMCharsBeforeCount(k-1)-e.getMCharsBeforeCount(f-1);e.val(h);!n||65===c&&a.ctrlKey||(8!==
+c&&46!==c&&(d=e.caretPos(d,f,k,m)),e.setCaret(d));return e.callbacks(a)}},getMasked:function(a){var b=[],k=e.val(),f=0,n=c.length,h=0,l=k.length,m=1,p="push",u=-1,t,w;d.reverse?(p="unshift",m=-1,t=0,f=n-1,h=l-1,w=function(){return-1<f&&-1<h}):(t=n-1,w=function(){return f<n&&h<l});for(;w();){var x=c.charAt(f),v=k.charAt(h),r=g.translation[x];if(r)v.match(r.pattern)?(b[p](v),r.recursive&&(-1===u?u=f:f===t&&(f=u-m),t===u&&(f-=m)),f+=m):r.optional?(f+=m,h-=m):r.fallback?(b[p](r.fallback),f+=m,h-=m):e.invalid.push({p:h,
+v:v,e:r.pattern}),h+=m;else{if(!a)b[p](x);v===x&&(h+=m);f+=m}}a=c.charAt(t);n!==l+1||g.translation[a]||b.push(a);return b.join("")},callbacks:function(b){var g=e.val(),l=g!==k,f=[g,b,a,d],n=function(a,b,c){"function"===typeof d[a]&&b&&d[a].apply(this,c)};n("onChange",!0===l,f);n("onKeyPress",!0===l,f);n("onComplete",g.length===c.length,f);n("onInvalid",0<e.invalid.length,[g,b,a,e.invalid,d])}};g.mask=c;g.options=d;g.remove=function(){var b=e.getCaret();e.destroyEvents();e.val(g.getCleanVal());e.setCaret(b-
+e.getMCharsBeforeCount(b));return a};g.getCleanVal=function(){return e.getMasked(!0)};g.init=function(c){c=c||!1;d=d||{};g.byPassKeys=b.jMaskGlobals.byPassKeys;g.translation=b.jMaskGlobals.translation;g.translation=b.extend({},g.translation,d.translation);g=b.extend(!0,{},g,d);l=e.getRegexMask();!1===c?(d.placeholder&&a.attr("placeholder",d.placeholder),b("input").length&&!1==="oninput"in b("input")[0]&&"on"===a.attr("autocomplete")&&a.attr("autocomplete","off"),e.destroyEvents(),e.events(),c=e.getCaret(),
+e.val(e.getMasked()),e.setCaret(c+e.getMCharsBeforeCount(c,!0))):(e.events(),e.val(e.getMasked()))};g.init(!a.is("input"))};b.maskWatchers={};var A=function(){var a=b(this),c={},d=a.attr("data-mask");a.attr("data-mask-reverse")&&(c.reverse=!0);a.attr("data-mask-clearifnotmatch")&&(c.clearIfNotMatch=!0);"true"===a.attr("data-mask-selectonfocus")&&(c.selectOnFocus=!0);if(z(a,d,c))return a.data("mask",new y(this,d,c))},z=function(a,c,d){d=d||{};var g=b(a).data("mask"),k=JSON.stringify;a=b(a).val()||
+b(a).text();try{return"function"===typeof c&&(c=c(a)),"object"!==typeof g||k(g.options)!==k(d)||g.mask!==c}catch(l){}};b.fn.mask=function(a,c){c=c||{};var d=this.selector,g=b.jMaskGlobals,k=b.jMaskGlobals.watchInterval,l=function(){if(z(this,a,c))return b(this).data("mask",new y(this,a,c))};b(this).each(l);d&&""!==d&&g.watchInputs&&(clearInterval(b.maskWatchers[d]),b.maskWatchers[d]=setInterval(function(){b(document).find(d).each(l)},k));return this};b.fn.unmask=function(){clearInterval(b.maskWatchers[this.selector]);
+delete b.maskWatchers[this.selector];return this.each(function(){var a=b(this).data("mask");a&&a.remove().removeData("mask")})};b.fn.cleanVal=function(){return this.data("mask").getCleanVal()};b.applyDataMask=function(a){a=a||b.jMaskGlobals.maskElements;(a instanceof b?a:b(a)).filter(b.jMaskGlobals.dataMaskAttr).each(A)};var p={maskElements:"input,td,span,div",dataMaskAttr:"*[data-mask]",dataMask:!0,watchInterval:300,watchInputs:!0,watchDataMask:!1,byPassKeys:[9,16,17,18,36,37,38,39,40,91],translation:{0:{pattern:/\d/},
+9:{pattern:/\d/,optional:!0},"#":{pattern:/\d/,recursive:!0},A:{pattern:/[a-zA-Z0-9]/},S:{pattern:/[a-zA-Z]/}}};b.jMaskGlobals=b.jMaskGlobals||{};p=b.jMaskGlobals=b.extend(!0,{},p,b.jMaskGlobals);p.dataMask&&b.applyDataMask();setInterval(function(){b.jMaskGlobals.watchDataMask&&b.applyDataMask()},p.watchInterval)});
+
@@ -15,6 +15,24 @@ modulejs.define(&#39;CommentsSoftwareExtraFields&#39;, [&#39;jquery&#39;], function($) {
         $(".comments-software-extra-fields div").hide();
       }
     });
+    var organization_rating_saved_value = $("#organization_rating_saved_value");
+    var organization_rating_people_benefited = $("#organization_rating_people_benefited");
+    var people_benefited_tmp = $("#people_benefited_tmp");
+    var saved_value_tmp = $("#saved_value_tmp");
+
+    saved_value_tmp.mask("#.##0,00", {reverse: true});
+    people_benefited_tmp.mask("000.000.000", {reverse: true});
+
+    organization_rating_saved_value.closest("form").submit(function( event ) {
+        var unformated_saved_value = saved_value_tmp.val();
+        unformated_saved_value = unformated_saved_value.split(".").join("");
+        unformated_saved_value = unformated_saved_value.replace(",",".");
+        organization_rating_saved_value.val(unformated_saved_value);
+
+        var unformated_people_benefited = people_benefited_tmp.val();
+        unformated_people_benefited = unformated_people_benefited.split(".").join("");
+        organization_rating_people_benefited.val(unformated_people_benefited);
+    });
   }
  
   return {
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../helpers/software_test_helper'
-require(
-  File.dirname(__FILE__) +
-  '/../../controllers/software_communities_plugin_myprofile_controller'
+require 'test_helper'
+require_relative '../helpers/software_test_helper'
+require_relative(
+  '../../controllers/software_communities_plugin_myprofile_controller'
 )
  
 class SoftwareCommunitiesPluginMyprofileController; def rescue_action(e) raise e end;
@@ -93,7 +92,11 @@ class SoftwareCommunitiesPluginMyprofileControllerTest &lt; ActionController::TestC
     assert_equal SoftwareInfo.last.acronym, "test"
   end
  
-  should 'upgrade a generic software to a public software' do
+  should 'only admin upgrade a generic software to a public software' do
+    admin_person = create_user('admin').person
+    @environment.add_admin(admin_person)
+
+    login_as(admin_person.user_login)
     fields_software = software_fields
     fields = software_edit_specific_fields
  
@@ -103,15 +106,69 @@ class SoftwareCommunitiesPluginMyprofileControllerTest &lt; ActionController::TestC
     post(
       :edit_software,
       :profile => software.community.identifier,
-      :library => fields[0],
-      :language => fields[1],
-      :database => fields[2],
       :operating_system => fields[3],
       :software => fields[4],
-      :license => fields[5]
     )
  
-    assert_equal true, SoftwareInfo.last.public_software?
+    assert SoftwareInfo.last.public_software?
+  end
+
+  should 'not upgrade a generic software to a public software if user is not an admin' do
+    fields_software = software_fields
+    fields = software_edit_specific_fields
+
+    fields[4]['public_software'] = true
+    software = create_software fields_software
+
+    post(
+      :edit_software,
+      :profile => software.community.identifier,
+      :software => fields[4]
+    )
+
+    refute SoftwareInfo.last.public_software?
+  end
+
+  ["e_ping","e_mag","icp_brasil","e_arq","intern"].map do |attr|
+    define_method "test_should_#{attr}_not_be_changed_by_not_admin" do
+      fields_software = software_fields
+      fields = software_edit_specific_fields
+
+      fields[4][attr]=true
+
+      software = create_software fields_software
+
+      post(
+        :edit_software,
+        :profile => software.community.identifier,
+        :software => fields[4]
+      )
+
+      refute SoftwareInfo.last.send(attr)
+    end
+  end
+
+  ["e_ping","e_mag","icp_brasil","e_arq","intern"].map do |attr|
+    define_method "test_should_#{attr}_be_changed_by_admin" do
+      admin_person = create_user('admin').person
+      @environment.add_admin(admin_person)
+      login_as(admin_person.user_login)
+
+      fields_software = software_fields
+      fields = software_edit_specific_fields
+
+      fields[4][attr]=true
+
+      software = create_software fields_software
+
+      post(
+        :edit_software,
+        :profile => software.community.identifier,
+        :software => fields[4]
+      )
+
+      assert SoftwareInfo.last.send(attr)
+    end
   end
  
   should "create software_info with existing license_info" do
@@ -146,9 +203,100 @@ class SoftwareCommunitiesPluginMyprofileControllerTest &lt; ActionController::TestC
       :profile => @person.identifier
     )
  
-    assert_equal SoftwareInfo.last.license_info_id, license_another.id
-    assert_equal SoftwareInfo.last.license_info.id, nil
-    assert_equal SoftwareInfo.last.license_info.version, another_license_version
-    assert_equal SoftwareInfo.last.license_info.link, another_license_link
+    assert_equal license_another.id, SoftwareInfo.last.license_info_id
+    assert_equal nil, SoftwareInfo.last.license_info.id
+    assert_equal another_license_version, SoftwareInfo.last.license_info.version
+    assert_equal another_license_link, SoftwareInfo.last.license_info.link
+  end
+
+  should "create software_info after finish task with 'Another' license_info" do
+    license_another = LicenseInfo.create(:version => "Another", :link => "#")
+
+    another_license_version = "Different License"
+    another_license_link = "http://diferent.link"
+
+    post(
+      :new_software,
+      :community => { :name => "New Software", :identifier => "new-software" },
+      :software_info => { :finality => "something", :repository_link => "" },
+      :license => { :license_infos_id => license_another.id,
+        :version => another_license_version,
+        :link=> another_license_link
+      },
+      :profile => @person.identifier
+    )
+
+    @environment.add_admin(@person)
+    Task.last.send('finish', @person)
+
+    assert_equal license_another.id, SoftwareInfo.last.license_info_id
+    assert_equal nil, SoftwareInfo.last.license_info.id
+    assert_equal another_license_version, SoftwareInfo.last.license_info.version
+    assert_equal another_license_link, SoftwareInfo.last.license_info.link
+  end
+
+  should "show error messages on create software_info" do
+    post(
+      :new_software,
+      :community => {},
+      :software_info => {},
+      :license => {},
+      :profile => @person.identifier
+    )
+    assert_includes @response.body, "Domain can't be blank"
+    assert_includes @response.body, "Name can't be blank"
+    assert_includes @response.body, "Finality can't be blank"
+    assert_includes @response.body, "Version can't be blank"
   end
+
+  should "show domain not available error" do
+    @environment.add_admin(@person)
+
+    post(
+      :new_software,
+      :community => {:name =>"New Software", :identifier => "new-software"},
+      :software_info => {:finality => "something", :repository_link => ""},
+      :license =>{:license_infos_id => LicenseInfo.last.id},
+      :profile => @person.identifier
+    )
+    post(
+      :new_software,
+      :community => {:name =>"New Software", :identifier => "new-software"},
+      :software_info => {:finality => "something", :repository_link => ""},
+      :license =>{:license_infos_id => LicenseInfo.last.id},
+      :profile => @person.identifier
+    )
+
+    assert_includes @response.body, "Domain is not available"
+  end
+
+  should "create software with admin moderation" do
+    @environment.enable('admin_must_approve_new_communities')
+
+    post(
+      :new_software,
+      :community => {:name =>"New Software", :identifier => "new-software"},
+      :software_info => {:finality => "something", :repository_link => ""},
+      :license =>{:license_infos_id => LicenseInfo.last.id},
+      :profile => @person.identifier
+    )
+
+    @environment.add_admin(@person)
+    Task.last.send('finish', @person)
+
+    assert_equal "New Software", Task.last.data[:name]
+    assert_equal "New Software", SoftwareInfo.last.community.name
+  end
+
+  should "dont create software without accept task" do
+    assert_no_difference 'SoftwareInfo.count' do
+      post(
+        :new_software,
+        :community => {:name =>"New Software", :identifier => "new-software"},
+        :software_info => {:finality => "something", :repository_link => ""},
+        :license =>{:license_infos_id => LicenseInfo.last.id},
+        :profile => @person.identifier
+      )
+    end
+ end
 end
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../../test/unit/api/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class SoftwareCommunitiesApiTest < ActiveSupport::TestCase
+
+  include PluginTestHelper
+
+  def setup
+    login_api
+    environment = Environment.default
+    environment.enable_plugin(SoftwareCommunitiesPlugin)
+  end
+
+  should 'list all softwares' do
+    @software_info = create_software_info("software_test")
+    @software_info2 = create_software_info("software_test2")
+
+    get "/api/v1/software_communities?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equivalent [@software_info.id, @software_info2.id], json['software_infos'].map {|c| c['id']}
+  end
+
+  should 'get software by id' do
+    @software_info = create_software_info("software_test")
+    get "/api/v1/software_communities/#{@software_info.id}?#{params.to_query}"
+
+    json = JSON.parse(last_response.body)
+    assert_equal @software_info.id, json["software_info"]["id"]
+  end
+
+end
@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class SoftwareEventsBlockTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  def setup
+    @community = create_community("A new community")
+    @software_events_block = SoftwareEventsBlock.new
+
+    box = Box.new
+    box.position = 1
+    box.owner = @community
+    box.blocks << @software_events_block
+    box.save!
+
+    @e1 = Event.new :name=>"Event 1", :body=>"Event 1 body",
+                   :start_date=>DateTime.now, :end_date=>(DateTime.now + 1.month)
+
+    @e2 = Event.new :name=>"Event 2", :body=>"Event 2 body",
+                  :start_date=>(DateTime.now - 10.days), :end_date=>(DateTime.now + 10.days)
+
+    @e3 = Event.new :name=>"Event 3", :body=>"Event 3 body",
+                  :start_date=>(DateTime.now - 20.days), :end_date=>(DateTime.now - 10.days)
+
+    @community.events << @e1
+    @community.events << @e2
+    @community.events << @e3
+    @community.save!
+  end
+
+  should "give community events that have not yet finished ordered by start date" do
+    events = @software_events_block.get_events
+
+    assert_equal false, events.include?(@e3)
+    assert_equal @e2, events.first
+    assert_equal @e1, events.last
+  end
+
+  should "give community events except by a event with a given slug" do
+    events = @software_events_block.get_events_except(@e1.slug)
+
+    assert_equal false, events.include?(@e1)
+  end
+
+  should "tell if there are events to be displayed" do
+    assert_equal true, @software_events_block.has_events_to_display?
+
+    @community.events.update_all :start_date => (DateTime.now - 2.days),
+                                 :end_date => (DateTime.now - 1.day)
+
+    assert_equal false, @software_events_block.has_events_to_display?
+  end
+
+  should "tell that the block must show the title in other areas that are no the main area" do
+    assert_equal false, @software_events_block.should_display_title?
+
+    @software_events_block.box.position = 3
+    @software_events_block.save!
+
+    assert_equal true, @software_events_block.should_display_title?
+  end
+end
@@ -49,6 +49,7 @@ class SoftwareInfoValidationTest &lt; ActiveSupport::TestCase
  
     @software_info.features = "Do a lot of things"
     @software_info.objectives = "All tests should pass !"
+    @software_info.community = @community
   end
  
   def teardown
@@ -1,32 +0,0 @@
-<h2><%= _('Software Information') %></h2>
-
-<%= label_tag("name", _('Name'), {:class => 'formlabel'}) %>
-
-<div id='software-name-field' class='formfield'>
-  <span id='software-hostname'><%= context.profile.environment.default_hostname %>/</span>
-  <%= text_field_tag(:name, context.profile.software_info.community.name) %>
-</div>
-
-<h3> <%= _("Finality") %> </h3>
-<div id="finality">
-  <%= text_field_tag(:finality, context.profile.software_info.finality) %>
-</div>
-
-<h3> <%= _("Licenses") %> </h3>
-<div id='licenses'>
-  <%= select_tag(:id, options_for_select(LicenseHelper.getListLicenses.collect{|l| [l.version, l.id]}, :selected => context.profile.software_info.license_info.id), :onchange => "get_license_link('version')") %>
-  <br />
-
-  <h4> <%= _("License link") %> </h4>
-  <% LicenseHelper.getListLicenses.each do | license |  %>
-    <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
-  <% end %>
-
-  <a id = "version_link" href="<%= context.profile.software_info.license_info.link %>" target="BLANK"> <%= context.profile.software_info.license_info.link %> </a>
-</div>
-
-<div class="formfieldline formfield type-text">
-  <%= label_tag "repository_url", _("Link to Repository: ") %>
-  <%= text_field_tag(:reository_url) %>
-</div>
-
@@ -0,0 +1,9 @@
+<div class="software-events-list-item-calendar"></div>
+
+<span class="software-events-list-item-date">
+  <%= event.start_date.strftime "%d/%m - " %>
+</span>
+
+<span class="software-events-list-item-title">
+  <%= link_to event.title, event.url %>
+</span>
@@ -0,0 +1,22 @@
+<div class="software-community-events-block">
+  <% if block.has_events_to_display? %>
+    <ul class="software-community-events-list">
+
+      <% if block.should_display_title? %>
+        <li class="software-events-list-item">
+          <span class="software-events-list-item-title">
+            <%= block.title %>
+          </span>
+        </li>
+      <% end %>
+
+      <% block.get_events_except(params[:page]).each do |event| %>
+        <li class="software-events-list-item">
+          <%= render :partial=>"blocks/software_events_list_item",
+                     :locals => {:event => event} %>
+        </li>
+      <% end %>
+
+    </ul>
+  <% end %>
+</div>
@@ -7,7 +7,6 @@
 </div>
  
 <div class="comments-software-extra-fields">
-
   <div class="extra-fields-container">
     <div class="comments-software-people-benefited">
       <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%>
 <div class="aditional-informations">
   <div class="comments-people-benefited">
-    <span><%=_("Benefited People")%> :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
+    <span><%=_("Benefited People")%>:</span> <%= number_with_delimiter(user_rating.people_benefited, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter) unless user_rating.nil? %>
   </div>
  
   <div class="comments-saved-value">
-    <span><%=_("Saved Resources")%> :</span> <%= user_rating.saved_value unless user_rating.nil? %>
+    <span><%=_("Saved Resources")%>:</span> <%= float_to_currency(user_rating.saved_value) unless user_rating.nil? %>
   </div>
 </div>
  
 <% software = community.software_info %>
 <li class="search-software-item">
+  <% organization_average_rating = '' %>
+  <% unless community.organization_ratings.empty?%>
+    <% organization_average_rating = render :partial => 'shared/organization_average_rating_block', :locals => {:community => community}%>
+  <% end %>
+
+  <% software_publish_date = render :partial => 'shared/software_publish_date', :locals => {:community => community, :order => @order} %>
+
   <div class="search-software-item-column-left">
-    <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %>
+    <%= profile_image_link community, :portrait, 'div', organization_average_rating + software_publish_date %>
   </div>
  
   <div class="search-software-item-column-right">
@@ -51,7 +51,8 @@
             [
               [_("Name A-Z"), 'asc'],
               [_("Name Z-A"), 'desc'],
-              [_("Relevance"), 'relevance']
+              [_("Relevance"), 'relevance'],
+              [_("Favorites"), 'rating']
               ], :selected=>params[:sort])
               ) %>
       </div>
@@ -0,0 +1,9 @@
+<div class="star-container catalog_rating_block">
+  <% (1..5).each do |rate_number| %>
+    <% if rate_number <= OrganizationRating.average_rating(community.id) %>
+      <div class="medium-star-positive"></div>
+    <% else %>
+      <div class="medium-star-negative"></div>
+    <% end %>
+  <% end %>
+</div>
@@ -0,0 +1,5 @@
+<span class="software-date">
+  <div class="software-date-label"><%= community.send(order + '_label') %></div>
+  <div class="software-date-value"><%= show_date(community.created_at) %></div>
+</span>
+
-<% LicenseHelper.getListLicenses.each do | license |  %>
-  <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
-<% end %>
-
 <%= text_field_tag "license_info[version]", license_version, :id=>"license_info_version", :class=>"license_info_version", :placeholder=>_('Autocomplete field, type some license') %>
 <%= hidden_field_tag "license[license_infos_id]", license_id, :id=>"license_info_id", :class=>"license_info_id", :data => {:label=>license_version} %>
  
@@ -5,7 +5,7 @@
 </div>
  
 <div class= <%= @error_software_acronym %> >
-  <%= label_tag("software[acronym]", _('Short Name'), {:class => 'formlabel mandatory'}) %>
+  <%= label_tag("software[acronym]", _('Short Name'), {:class => 'formlabel'}) %>
   <%= text_field_tag("software[acronym]", @profile.software_info.acronym, :id => 'software_acronym_id', :maxlength=>"10") %>
 </div>
  
 <div id = "public_software">
-  <% if @disabled_public_software_field == true %>
-    <%= check_box_tag("software[public_software]", "true", @software_info.public_software?, :disabled => "disabled") %>
-    <%= label_tag _("Public Software"), _("Public software"), :class => "public_software_disabled" %>
-  <% else %>
-    <%= check_box_tag("software[public_software]", "true", @software_info.public_software?) %>
-    <%= label_tag _("Public Software"), _("Public software"), :class => "public_software_enabled" %>
-  <% end %>
+  <%= check_box_tag("software[public_software]", "true", @software_info.public_software?, :disabled => @non_admin_status) %>
+  <%= label_tag _("Public Software"), _("Public software") %>
   <div class="public-software-fields">
     <h4> <%= _("Public Software") %> </h4>
     <div class="formfieldline">
       <%= label_tag _("Adherent to e-PING ?") %>
  
       <%= label_tag "e_ping_true", "Yes" %>
-      <%= radio_button_tag("software[e_ping]", true, @software_info.e_ping)%>
+      <%= radio_button_tag("software[e_ping]", true, @software_info.e_ping, :disabled => @non_admin_status) %>
       <%= label_tag "e_ping_false", "No"%>
-      <%= radio_button_tag("software[e_ping]", false, !@software_info.e_ping)%>
+      <%= radio_button_tag("software[e_ping]", false, !@software_info.e_ping, :disabled => @non_admin_status) %>
     </div>
  
     <div class="formfieldline">
       <%= label_tag _("Adherent to e-MAG ?") %>
  
       <%= label_tag "e_mag_true", "Yes"%>
-      <%= radio_button_tag("software[e_mag]", true, @software_info.e_mag)%>
+      <%= radio_button_tag("software[e_mag]", true, @software_info.e_mag, :disabled => @non_admin_status) %>
       <%= label_tag "e_mag_false", "No"%>
-      <%= radio_button_tag("software[e_mag]", false, !@software_info.e_mag)%>
+      <%= radio_button_tag("software[e_mag]", false, !@software_info.e_mag, :disabled => @non_admin_status) %>
     </div>
  
     <div class="formfieldline">
       <%= label_tag _("Adherent to ICP-Brasil ?") %>
  
       <%= label_tag "icp_brasil_true", "Yes"%>
-      <%= radio_button_tag("software[icp_brasil]", true, @software_info.icp_brasil)%>
+      <%= radio_button_tag("software[icp_brasil]", true, @software_info.icp_brasil, :disabled => @non_admin_status) %>
       <%= label_tag "icp_brasil_false", "No"%>
-      <%= radio_button_tag("software[icp_brasil]", false, !@software_info.icp_brasil)%>
+      <%= radio_button_tag("software[icp_brasil]", false, !@software_info.icp_brasil, :disabled => @non_admin_status) %>
     </div>
  
     <div class="formfieldline">
       <%= label_tag _("Adherent to e-ARQ ?") %>
  
       <%= label_tag "e_arq_true", "Yes"%>
-      <%= radio_button_tag("software[e_arq]", true, @software_info.e_arq)%>
+      <%= radio_button_tag("software[e_arq]", true, @software_info.e_arq, :disabled => @non_admin_status) %>
       <%= label_tag "e_arq_false", "No"%>
-      <%= radio_button_tag("software[e_arq]", false, !@software_info.e_arq)%>
+      <%= radio_button_tag("software[e_arq]", false, !@software_info.e_arq, :disabled => @non_admin_status) %>
     </div>
  
     <div class="formfieldline">
       <%= label_tag _("Internacionalizable ?") %>
  
       <%= label_tag "intern_true", "Yes" %>
-      <%= radio_button_tag("software[intern]", true, @software_info.intern)%>
+      <%= radio_button_tag("software[intern]", true, @software_info.intern, :disabled => @non_admin_status) %>
       <%= label_tag "intern_false", "No"%>
-      <%= radio_button_tag("software[intern]", false, !@software_info.intern)%>
+      <%= radio_button_tag("software[intern]", false, !@software_info.intern, :disabled => @non_admin_status) %>
     </div>
   </div>
 </div>
@@ -0,0 +1,9 @@
+class RemoveSoftwaresWithoutCommunity < ActiveRecord::Migration
+  def up
+    execute('DELETE FROM software_infos where community_id NOT IN (SELECT id FROM profiles)')
+  end
+
+  def down
+    say "This migration can't be reverted!"
+  end
+end
 /.obs
 /.config.mk
+*/*.tar.*
+/.virtualenv
 OBSPROJECT = isv:spb:devel
 COPR_PROJECT = softwarepublico/v5
-LOCAL_BUILD_DIR = $(PWD)/build
+LOCAL_BUILD_DIR = $(CURDIR)/build
  
 # Vagrant environment does not accept links from/to shared folder
-ifeq "$(PWD)" "/vagrant"
+ifeq "/vagrant" "$(shell ls -1d /vagrant 2>/dev/null)"
 LOCAL_BUILD_DIR = /home/vagrant/rpmbuild
 endif
  
@@ -57,7 +57,7 @@ checkout_packages_obs = $(patsubst %, %-checkout-obs, $(packages))
 upload_packages_obs = $(patsubst %, %-upload-obs, $(packages))
 diff_packages_obs = $(patsubst %, %-diff-obs, $(packages))
  
-.PHONY: $(build_packages) $(checkout_packages_obs) $(upload_packages_obs) $(diff_packages_obs)
+.PHONY: $(build_packages) $(checkout_packages_obs) $(upload_packages_obs) $(diff_packages_obs) copr-cli
  
 ### Targets
  
@@ -76,8 +76,14 @@ $(build_src_packages): %-build-src : %
 	rm -f $(LOCAL_BUILD_DIR)/SRPMS/$*-*.src.rpm
 	cd $* && $(BUILD_PREFIX) rpmbuild --define "_topdir $(LOCAL_BUILD_DIR)" -bs $*.spec --nodeps
  
-$(upload_packages): %-upload : %-build-src %
-	copr-cli build $(COPR_PROJECT) $(LOCAL_BUILD_DIR)/SRPMS/$*-*.src.rpm --nowait
+$(upload_packages): %-upload : %-build-src % copr-cli
+	.virtualenv/bin/copr-cli build $(COPR_PROJECT) $(LOCAL_BUILD_DIR)/SRPMS/$*-*.src.rpm --nowait
+
+copr-cli: .virtualenv/bin/copr-cli
+
+.virtualenv/bin/copr-cli:
+	virtualenv .virtualenv
+	.virtualenv/bin/pip install copr-cli
  
 ### OBS targets (deprecated)
  
@@ -102,3 +108,8 @@ diff-obs: $(diff_packages_obs)
  
 status-obs st-obs:
 	@$(MAKE) diff | diffstat -C
+
+clean:
+	rm -rf */*.tar.*
+	rm -rf build/
+	rm -rf .virtualenv/
 Summary: Collaboration platform for communities (Python dependencies)
 Name:    colab-deps
-Version: 1.11.3
-Release: 25.1
+Version: 1.11.6
+Release: 1
 Source0: colab-deps-%{version}.tar.gz
 License: Various
 Group: Development/Tools
@@ -0,0 +1,45 @@
+Name:           colab-spb-plugin
+Version:        5.0a0
+Release:        1
+Summary:        SPB-specific Colab plugin
+License:        GPL-3.0
+Group:          Applications/Publishing
+Url:            https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico
+Source0:        %{name}-%{version}.tar.gz
+Requires:       colab >= 1.11
+BuildArch:      noarch
+BuildRequires:  colab, colab-deps >= 1.11.4, python-virtualenv
+
+%description
+This package contains Colab plugin for the Software Público Brasileiro platform.
+
+%prep
+%setup -q
+
+%build
+# install colab and colab-des into virtualenv
+rm -rf virtualenv
+cp -r /usr/lib/colab virtualenv
+PATH=$(pwd)/virtualenv/bin:$PATH pip install --use-wheel --no-index .
+virtualenv --relocatable virtualenv
+
+rpm -ql colab-deps colab | sed '/^\/usr\/lib\/colab\// !d; s#/usr/lib/colab/##' > cleanup.list
+while read f; do
+  if [ -f "virtualenv/$f" ]; then
+    rm -f "virtualenv/$f"
+  fi
+done < cleanup.list
+rm -f cleanup.list
+find virtualenv -type d -empty -delete
+rm -rf virtualenv/bin
+rm -rf virtualenv/include
+
+%install
+
+install -d -m 0755 %{buildroot}/usr/lib
+rm -rf %{buildroot}/usr/lib/colab
+cp -r virtualenv %{buildroot}/usr/lib/colab
+
+%files
+%defattr(-,root,root)
+/usr/lib/colab
  
 Name:           colab-spb-theme
-Version:        0.2.0
+Version:        5.0a0
 Release:        9.1
 Summary:        SPB-specific Colab theme
 License:        GPL-3.0
 %define name colab
-%define version 1.11.3
-%define default_release 0
-%{!?release: %define release %{default_release}}
+%define version 1.11.4
 %define buildvenv /var/tmp/%{name}-%{version}
  
 Summary: Collaboration platform for communities
 Name: %{name}
 Version: %{version}
-Release: 19
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: Development/Tools
@@ -16,9 +14,9 @@ Prefix: %{_prefix}
 Vendor: Sergio Oliveira <sergio@tracy.com.br>
 Url: https://github.com/colab/colab
 BuildArch: noarch
-BuildRequires: colab-deps >= 1.11.3, python-virtualenv
+BuildRequires: colab-deps >= 1.11.6, python-virtualenv
 # FIXME colab should not depend on nginx!
-Requires: colab-deps >= 1.11.3, solr, mailman-api >= 0.3rc3, nginx
+Requires: colab-deps >= 1.11.6, solr, mailman-api >= 0.3rc3, nginx
  
 %description
 Integrated software development platform.
@@ -227,6 +225,10 @@ if [ $1 -gt 1 ]; then
   systemctl try-restart colab
 fi
  
+colab-admin build_solr_schema > /var/tmp/schema.xml
+mv -f /var/tmp/schema.xml /usr/share/solr/example/solr/collection1/conf/schema.xml
+systemctl restart solr
+
 systemctl daemon-reload
  
 %preun
 Name:    kalibro-configurations-deps
 Version: 1.0
+Release: 0
 Summary: Ruby dependencies for kalibro-configurations
 Group:   Development/Tools
 License: Various
 Name:    prezento-spb-deps
 Version: 0.8.3.colab
+Release: 1
 Summary: Ruby dependencies for prezento
 Group:   Development/Tools
 License: Various
@@ -5,7 +5,7 @@ test_database_connectivity() {
 }
  
 test_colab_config_is_in_place() {
-  assertTrue 'colab settings.yml is in place' 'run_on integration test -f /etc/colab/settings.yaml'
+  assertTrue 'colab settings.py is in place' 'run_on integration test -f /etc/colab/settings.py'
 }
  
 test_colab_running() {
...	...	@@ -0,0 +1,96 @@
	1	+# Software Público - configuration management
	2	+
	3	+## Requirements
	4	+
	5	+* [chake](https://rubygems.org/gems/chake)
	6	+* rake
	7	+
	8	+For development
	9	+
	10	+* vagrant
	11	+* shunit2
	12	+* moreutils
	13	+* redir
	14	+
	15	+## Configuration parameters
	16	+
	17	+All configuration parameters are defined in `nodes.yaml`, with exception of IP
	18	+addresses, which are defined in different files:
	19	+
	20	+- for local development, the IP addresses of the Vagrant VMs are defined in
	21	+ config/local/ips.yaml.
	22	+
	23	+- for production, you need to create a new file called
	24	+ `config/production/ips.yaml`
	25	+
	26	+You will probably not need to change nodes.yaml unless you are developing the
	27	+deployment process.
	28	+
	29	+## Deploy
	30	+
	31	+### Development
	32	+
	33	+First you have to bring up the development virtual machines:
	34	+
	35	+```bash
	36	+$ vagrant up
	37	+$ rake preconfig
	38	+$ rake bootstrap_common
	39	+```
	40	+
	41	+Right now there are 5 VM's, so this might take a while. The basic commands for
	42	+deployment:
	43	+
	44	+```bash
	45	+$ rake # deploys all servers
	46	+$ rake nodes # lists all servers
	47	+$ rake converge:$server # deploys only $server
	48	+```
	49	+
	50	+### Production
	51	+
	52	+* TODO: document adding the SSL key and certificate
	53	+* TODO: document creation of `prod.yaml`.
	54	+* TODO: document SSH configuration
	55	+
	56	+The very first step is
	57	+
	58	+```
	59	+$ rake preconfig SPB_ENV=production
	60	+```
	61	+
	62	+This will perform some initial configuration to the system that is required
	63	+before doing the actual deployment.
	64	+
	65	+After that:
	66	+
	67	+```bash
	68	+$ rake SPB_ENV=production # deploys all servers
	69	+$ rake nodes SPB_ENV=production # lists all servers
	70	+$ rake converge:$server SPB_ENV=production # deploys only $server
	71	+```
	72	+
	73	+You can also do `export SPB_ENV=production` in your shell and omit it in the
	74	+`rake` calls.
	75	+
	76	+See the output of `rake -T` for other tasks.
	77	+
	78	+## Viewing the running site when developping locally
	79	+
	80	+Run:
	81	+
	82	+```bash
	83	+./server
	84	+```
	85	+
	86	+Follow the on-screen instructions an browse to
	87	+[http://softwarepublico.dev/](http://softwarepublico.dev/).
	88	+
	89	+Note: this requires that your system will resolve `\*.dev` to `localhost`.
	90	+Google DNS servers will do that automatically, otherwise you might add the following entries to `/etc/hosts`:
	91	+
	92	+```
	93	+127.0.53.53 softwarepublico.dev
	94	+127.0.53.53 listas.softwarepublico.dev
	95	+```
	96	+
...	...
1		-# Software Público - configuration management
	1	+# Software Público Brasileiro - desenvolvimento
2	2
3		-## Requirements
	3	+## Organização
4	4
5		-* [chake](https://rubygems.org/gems/chake)
6		-* rake
	5	+Este repositório contém tanto o código fonte desenvolvimento especificamente
	6	+para o SPB, quando o código de gestão de configuração necessário para implantar
	7	+o ambiente do SPB.
7	8
8		-For development
	9	+O código fonte dos componentes e pacotes desenvolvidos está no diretório
	10	+`src/`. Os demais diretórios contém código de gestão de configuração,
	11	+documentação, utilitários etc.
9	12
10		-* vagrant
11		-* shunit2
12		-* moreutils
13		-* redir
	13	+## Fazendo um release
14	14
15		-## Configuration parameters
	15	+* Atualize o número de versão no arquivo VERSION
	16	+* Execute `make release`.
16	17
17		-All configuration parameters are defined in `nodes.yaml`, with exception of IP
18		-addresses, which are defined in different files:
19		-
20		-- for local development, the IP addresses of the Vagrant VMs are defined in
21		- config/local/ips.yaml.
22		-
23		-- for production, you need to create a new file called
24		- `config/production/ips.yaml`
25		-
26		-You will probably not need to change nodes.yaml unless you are developing the
27		-deployment process.
28		-
29		-## Deploy
30		-
31		-### Development
32		-
33		-First you have to bring up the development virtual machines:
34		-
35		-```bash
36		-$ vagrant up
37		-$ rake preconfig
38		-$ rake bootstrap_common
39		-```
40		-
41		-Right now there are 5 VM's, so this might take a while. The basic commands for
42		-deployment:
43		-
44		-```bash
45		-$ rake # deploys all servers
46		-$ rake nodes # lists all servers
47		-$ rake converge:$server # deploys only $server
48		-```
49		-
50		-### Production
51		-
52		-* TODO: document adding the SSL key and certificate
53		-* TODO: document creation of `prod.yaml`.
54		-* TODO: document SSH configuration
55		-
56		-The very first step is
57		-
58		-```
59		-$ rake preconfig SPB_ENV=production
60		-```
61		-
62		-This will perform some initial configuration to the system that is required
63		-before doing the actual deployment.
64		-
65		-After that:
66		-
67		-```bash
68		-$ rake SPB_ENV=production # deploys all servers
69		-$ rake nodes SPB_ENV=production # lists all servers
70		-$ rake converge:$server SPB_ENV=production # deploys only $server
71		-```
72		-
73		-You can also do `export SPB_ENV=production` in your shell and omit it in the
74		-`rake` calls.
75		-
76		-See the output of `rake -T` for other tasks.
77		-
78		-## Viewing the running site when developping locally
79		-
80		-Run:
81		-
82		-```bash
83		-./server
84		-```
85		-
86		-Follow the on-screen instructions an browse to
87		-[http://softwarepublico.dev/](http://softwarepublico.dev/).
88		-
89		-Note: this requires that your system will resolve `\*.dev` to `localhost`.
90		-Google DNS servers will do that automatically, otherwise you might add the following entries to `/etc/hosts`:
91		-
92		-```
93		-127.0.53.53 softwarepublico.dev
94		-127.0.53.53 listas.softwarepublico.dev
95		-```
	18	+## Implantação
96	19
	20	+Veja as instruções em README.chef.md.
...	...
...	...	@@ -21,6 +21,11 @@ package 'colab-spb-theme' do
21	21	notifies :restart, 'service[colab]'
22	22	end
23	23
	24	+package 'colab-spb-theme' do
	25	+ action :upgrade
	26	+ notifies :restart, 'service[colab]'
	27	+end
	28	+
24	29	directory '/etc/colab' do
25	30	owner 'root'
26	31	group 'root'
...	...
...	...	@@ -9,6 +9,7 @@ verbose_name = 'Gitlab Plugin'
9	9	upstream = 'http://<%= node['peers']['integration'] %>:81/gitlab/'
10	10
11	11	private_token = '<%= @get_private_token.call %>'
	12	+verify_ssl = False
12	13
13	14	urls = {
14	15	'include': 'colab_gitlab.urls',
...	...
...	...	@@ -27,6 +27,8 @@ menu_urls = (
27	27	kwargs={'path': 'search/people'}, auth=False),
28	28	url(display=_('Communities'), viewname='noosfero',
29	29	kwargs={'path': 'search/communities'}, auth=False),
	30	+ url(display=_('Institutions'), viewname='noosfero',
	31	+ kwargs={'path': 'search/institutions'}, auth=False),
30	32	url(display=_('Profile'), viewname='noosfero',
31	33	kwargs={'path': 'profile/~/'}, auth=True),
32	34	url(display=_('Control Panel'), viewname='noosfero',
...	...
...	...	@@ -5,13 +5,19 @@ email = ARGV[1]
5	5	password = SecureRandom.random_number.to_s
6	6
7	7	user = User.find_by_login(login)
8		-exit(0) if user
9		-
10		-user = User.create!(
11		- login: login,
12		- email: email,
13		- password: password,
14		- password_confirmation: password
15		-)
16		-user.activate
17		-user.generate_private_token!
	8	+if user
	9	+ if user.private_token_expired?
	10	+ user.generate_private_token!
	11	+ else
	12	+ exit(0)
	13	+ end
	14	+else
	15	+ user = User.create!(
	16	+ login: login,
	17	+ email: email,
	18	+ password: password,
	19	+ password_confirmation: password
	20	+ )
	21	+ user.activate
	22	+ user.generate_private_token!
	23	+end
...	...
...	...	@@ -42,7 +42,7 @@ server {
42	42	proxy_set_header REMOTE_USER '';
43	43	}
44	44
45		- location /doc/ {
	45	+ location /doc {
46	46	root /srv;
47	47	}
48	48
...	...
...	...	@@ -65,6 +65,42 @@ Caso os ambientes já tenham sido convergidos anteriormente, não será possíve
65	65
66	66	O output do comando acima é a sua chave pública, ela deverá ser copiada e colada, manualmente, em ``~/.ssh/authorized_keys`` do usuário desejado. Esse procedimento deve ser repetido em todas as máquinas listadas em ``config/@@SPB_ENV@@/ips.yaml``.
67	67
	68	+Git push com HTTPS
	69	+-----------------
	70	+
	71	+Para a utilização do git com protocolo HTTPS é necessário configurar a senha do perfil do seu usuário na ferramenta Gitlab, pois a senha do seu usuário do portal não é configurada no Gitlab já que a autenticação é feita via REMOTE_USER (cabeçalho HTTP). Para configurar a sua senha no Gitlab é necessário que já exista um usuário válido no portal e o mesmo esteja logado, em seguida, siga os passos a seguir:
	72	+
	73	+1- No menu, clique no botão "Desenvolvimento" para que apareça novas opções
	74	+2- Nas opções apresentadas, clique em "Perfil" para ser direcionado para o seu perfil do Gitlab
	75	+3- No seu perfil será apresentado um novo menu abaixo do menu do portal, nesse menu clique na aba "Password"
	76	+4- Na aba "Password", indique que você esqueceu a sua senha clicando no link "Forgot your password?"
	77	+5- Um email será enviado para o seu endereço de email configurado no seu usuário do portal
	78	+6- Abra o email recebido e clique no link "Change my password", que irá redirecionar para uma página de configuração de uma nova senha
	79	+7- Na página de configuração de uma nova senha digite a sua senha e a confirme (sugere-se que use a mesma senha do portal), finalizando a operação de configuração da senha do seu perfil no Gitlab
	80	+
	81	+Com a senha do seu perfil do Gitlab configurada pode-se utlizar normalmente o git com protocolo HTTPS, onde será solcitado o seu usuário e senha durante as operações. Lembrando que o usuário será o seu usuário do portal e a senha será a que foi configurada com o processo descrito anteriormente.
	82	+
	83	+No Portal do Software Público Brasileiro, assim como em outros portais do governo, temos problemas com o certificado digital. Para o git conseguir realizar as operções usando HTTPS é necessário ignorar o certificado, para isso, abra o terminal (com o git instalado) e execute o seguinte comando::
	84	+
	85	+ $ cd <caminho-do-diretório-do-projeto>
	86	+ $ git config http.sslVerify "false"
	87	+
	88	+
	89	+Integração manual entre repositórios
	90	+---------------------------------
	91	+
	92	+Para empurrar modificações para mais de um repositório, por exemplo os repositórios do Portal do Software Público Brasileiro e Github, é necessário fazer algumas modificações nas configurações no git localmente (lado do cliente). Para isso, vamos configurar um apelido (alias) que aponte para as URLs dos nossos repositórios, e quando o comando ``git push <alias> <branch>`` for executado, as modificações serão empurradas para todos os nossos repositórios previamente configurados. Ou seja, apenas um comando será executado e todos os repositórios serão atualizados.
	93	+
	94	+Para realizar essa configuração é necessário que tenha o git instalado com um bash(terminal) e o repositório do seu projeto clonado localmente. Tendo isso, abra o bash e execute os comandos a seguir::
	95	+
	96	+ $ cd <caminho-do-diretório-do-projeto>
	97	+ $ git remote set-url --add --push <apelido> <URL-repo1>
	98	+ $ git remote set-url --add --push <apelido> <URL-repo2>
	99	+ $ git remote set-url --add --push <apelido> <URL-repo3>
	100	+
	101	+Lembrando que o <apelido> de todos deve ser o mesmo, usualmente é usado o apelido "origin". Com isso, ao empurrar as suas modificações todos os repositórios configurados serão atualizados.
	102	+
	103	+
68	104	Gerenciando listas de email
69	105	---------------------------
70	106	O Mailman fornece alguns scripts para administração das listas de email, tais programas podem ser encontrados na máquina ``integration`` em ``/usr/lib/mailman/bin``.
...	...
...	...	@@ -0,0 +1,49 @@
	1	+VERSION = $(shell cat ../VERSION)
	2	+subdirs = colab-spb-plugin colab-spb-theme-plugin noosfero-spb
	3	+
	4	+dist_all = $(patsubst %, %-dist, $(subdirs))
	5	+dist: $(dist_all)
	6	+$(dist_all): %-dist : %
	7	+ if [ -f $/Makefile ]; then make -C $ dist; fi
	8	+ if [ -f $/setup.py ]; then (cd $ && python setup.py sdist); fi
	9	+
	10	+clean_all = $(patsubst %, %-clean, $(subdirs))
	11	+clean: $(clean_all)
	12	+ $(MAKE) -C pkg-rpm/ clean
	13	+
	14	+$(clean_all): %-clean : %
	15	+ if [ -f $/Makefile ]; then make -C $ clean; fi
	16	+ if [ -f $/setup.py ]; then rm -rf $/dist; fi
	17	+
	18	+release:
	19	+ @if git tag \| grep -q '^v$(VERSION)$$'; then \
	20	+ echo "E: version $(VERSION) already tagged. You need a new version number"; \
	21	+ false; \
	22	+ fi
	23	+ echo '$(VERSION)' > colab-spb-plugin/VERSION
	24	+ echo '$(VERSION)' > colab-spb-theme-plugin/VERSION
	25	+ echo '$(VERSION)' > noosfero-spb/VERSION
	26	+ $(MAKE) dist
	27	+ cp noosfero-spb/dist/.tar. pkg-rpm/noosfero-spb/
	28	+ cp colab-spb-theme-plugin/dist/.tar. pkg-rpm/colab-spb-theme/
	29	+ cp colab-spb-plugin/dist/.tar. pkg-rpm/colab-spb-plugin/
	30	+ sed -i -e 's/^\(Version:\s\)./\1$(VERSION)/' \
	31	+ pkg-rpm/colab-spb-theme/colab-spb-theme.spec \
	32	+ pkg-rpm/colab-spb-plugin/colab-spb-plugin.spec \
	33	+ pkg-rpm/noosfero-spb/noosfero-spb.spec
	34	+ git diff
	35	+ @printf "Confirm release? [y/N]"; \
	36	+ read confirm; \
	37	+ if [ "$$confirm" = 'y' -o "$$confirm" = 'Y' ]; then \
	38	+ echo "SPB release $(VERSION)" > .commit_template; \
	39	+ git commit * --file .commit_template; \
	40	+ rm -f .commit_template; \
	41	+ else \
	42	+ echo 'Aborting at your request!'; \
	43	+ git checkout -- colab-spb-theme-plugin/VERSION noosfero-spb/VERSION colab-spb-plugin/VERSION ; \
	44	+ git checkout -- pkg-rpm/colab-spb-theme/ pkg-rpm/noosfero-spb/ pkg-rpm/colab-spb-plugin/ ; \
	45	+ false; \
	46	+ fi
	47	+ # TODO add pkg-rpm/colab-spb-plugin to the git checkout all above
	48	+ $(MAKE) -C pkg-rpm/ noosfero-spb-upload colab-spb-theme-upload colab-spb-plugin-upload
	49	+ git tag $(VERSION) -s -m 'SPB Release $(VERSION)'
...	...
1	1	include README.rst
2	2	include MANIFEST.in
	3	+include VERSION
3	4	recursive-include src/colab_spb/static *
4	5	recursive-include src/colab_spb/locale *
5	6	recursive-include src/colab_spb/templates *
...	...