From 6f434dd372e84c78c801bca5ac40317d84745fd2 Mon Sep 17 00:00:00 2001
From: Gabriela Navarro <navarro1703@gmail.com>
Date: Tue, 14 Apr 2015 11:21:08 -0300
Subject: [PATCH] Fix some institution problems:

---
 lib/gov_user_plugin.rb                      | 12 ++++++++++++
 public/static/governmental_powers.txt       |  4 ++--
 public/static/governmental_sphere.txt       |  2 +-
 public/static/juridical_nature.txt          |  8 ++++----
 public/views/create-institution.js          | 14 +++++++++++---
 views/gov_user_plugin/_institution.html.erb |  4 +++-
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/lib/gov_user_plugin.rb b/lib/gov_user_plugin.rb
index 22e3640..e148b53 100644
--- a/lib/gov_user_plugin.rb
+++ b/lib/gov_user_plugin.rb
@@ -137,6 +137,18 @@ class GovUserPlugin < Noosfero::Plugin
     )
   end
 
+  def admin_panel_links
+    [
+      {
+        :title => _('Create Institution'),
+        :url => {
+          :controller => 'gov_user_plugin',
+          :action => 'create_institution_admin'
+        }
+      }
+    ]
+  end
+
   protected
 
   def profile_required_list
diff --git a/public/static/governmental_powers.txt b/public/static/governmental_powers.txt
index 6fffa27..d798c3a 100644
--- a/public/static/governmental_powers.txt
+++ b/public/static/governmental_powers.txt
@@ -1,4 +1,4 @@
 Executivo
 Legislativo
-Judiciario
-Nao se aplica
+Judiciário
+Não se aplica
diff --git a/public/static/governmental_sphere.txt b/public/static/governmental_sphere.txt
index ffaa31e..ef7cfce 100644
--- a/public/static/governmental_sphere.txt
+++ b/public/static/governmental_sphere.txt
@@ -1,4 +1,4 @@
 Federal
 Estadual
 Distrital
-Municipal
\ No newline at end of file
+Municipal
diff --git a/public/static/juridical_nature.txt b/public/static/juridical_nature.txt
index 517bbd6..d66b9a7 100644
--- a/public/static/juridical_nature.txt
+++ b/public/static/juridical_nature.txt
@@ -1,8 +1,8 @@
-Administracao Direta
+Administração Direta
 Autarquia
-Empresa Publica
-Fundacao
-Orgao Autonomo
+Empresa Pública
+Fundação
+Orgão Autônomo
 Sociedade
 Sociedade Civil
 Sociedade de Economia Mista
diff --git a/public/views/create-institution.js b/public/views/create-institution.js
index 4a58871..197be6d 100644
--- a/public/views/create-institution.js
+++ b/public/views/create-institution.js
@@ -125,6 +125,11 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
     });
   }
 
+  function cancel_institution(evt){
+    evt.preventDefault();
+    $('#institution_dialog').dialog('close');
+  }
+
 
   function institution_already_exists(){
     if( this.value.length >= 3 ) {
@@ -187,8 +192,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
 
 
   function add_new_institution(evt) {
-    (" JAJAjAjAJAJaJ ADD NEW INST")
-
     evt.preventDefault();
     var selected = $("#institution_selected");
     var institution_already_added = $(".institutions_added li[data-institution='"+selected.val()+"']").length;
@@ -227,6 +230,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
     var cnpj = $("#institutions_cnpj").parent().parent();
     var city = $("#community_city").parent().parent();
     var state = $("#community_state").parent().parent();
+    var inst_type = $("input[name='institutions[type]']:checked").val();
+    institution_type_actions(inst_type)
 
     if( country === "-1" ) $("#community_country").val("BR");
 
@@ -243,7 +248,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
 
 
   function institution_type_actions(type) {
-    if( type === "PublicInstitution" ) {
+    var country = $("#community_country").val();
+    if( type === "PublicInstitution" && country == "BR") {
       show_public_institutions_fields();
     } else {
       show_private_institutions_fields();
@@ -255,6 +261,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
     var divisor_option = SelectElement.generateOption("-1", "--------------------------------");
     var default_option = SelectElement.generateOption("BR", "Brazil");
 
+
     var inst_type = $("input[name='institutions[type]']:checked").val();
     var country = $("#community_country").val();
 
@@ -282,6 +289,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
     });
 
     $('#save_institution_button').click(save_institution);
+    $('#cancel_institution_button').click(cancel_institution);
 
     $("#community_name").keyup(institution_already_exists);
 
diff --git a/views/gov_user_plugin/_institution.html.erb b/views/gov_user_plugin/_institution.html.erb
index 9566ed5..e5ed297 100644
--- a/views/gov_user_plugin/_institution.html.erb
+++ b/views/gov_user_plugin/_institution.html.erb
@@ -64,7 +64,7 @@
       <span class='required-field'>
         <div class="formfield">
           <label for="community_state" class="formlabel"><%= _("State") %></label>
-          <%= f.select(:state, @state_list.collect {|state| [state.name, state.name]}) %>
+          <%= f.select(:state, [[_('Select a state'), '-1']] | @state_list.collect {|state| [state.name, state.name]}) %>
         </div>
       </span>
 
@@ -115,9 +115,11 @@
 
       <% if @url_token == "create_institution_admin" %>
         <%= submit_button :save, _('Save') %>
+        <%= button(:cancel, _("Cancel"), {:controller => "admin_panel", :action => 'index'}) %>
       <%else%>
         <div>
          <%= link_to(_('Save'), '#', :id=>'save_institution_button', :class=>'button with-text icon-add') %>
+         <%= link_to(_('Cancel'), '#', :id=>"cancel_institution_button", :class=>'button with-text icon-cancel') %>
         </div>
         <%= hidden_field_tag :institution_error_message, _("Could not send the form data to the server") %>
       <%end%>
--
libgit2 0.21.2