diff --git a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb index d0f14dc..8d97824 100644 --- a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb +++ b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb @@ -117,7 +117,7 @@ class GovUserPluginController < ApplicationController @juridical_nature = get_juridical_natures() state_list = get_state_list() - @state_options = state_list.zip(state_list).prepend([_('Select a state'), '-1']) + @state_options = state_list.zip(state_list) end def get_model_by_params_field diff --git a/src/noosfero-spb/gov_user/features/rating_institution_registration.feature b/src/noosfero-spb/gov_user/features/rating_institution_registration.feature new file mode 100644 index 0000000..1979966 --- /dev/null +++ b/src/noosfero-spb/gov_user/features/rating_institution_registration.feature @@ -0,0 +1,78 @@ +Feature: Create institution on user report + As a user + I want to create a institution in use report of a software + to add institution in report. + + Background: + Given "GovUserPlugin" plugin is enabled + And "SoftwareCommunitiesPlugin" plugin is enabled + And "OrganizationRatings" plugin is enabled + And I am logged in as mpog_admin + And I go to /admin/plugins + And I check "GovUserPlugin" + And I check "SoftwareCommunitiesPlugin" + And I check "Organization Ratings" + And I press "Save changes" + And the following softwares + | name | public_software | finality | + | Noosfero | true | some finality | + + @selenium + Scenario: Test Additional JavaScript Fields + Given I go to /profile/noosfero/plugin/organization_ratings/new_rating + And I should not see "Number of Beneficiaries" + And I should not see "Saved resources" + And I should not see "Organization name or Enterprise name" + When I click on anything with selector "#comments-additional-information" + Then I should see "Number of Beneficiaries" + And I should see "Organization name or Enterprise name" + And I should see "Saved resources" + + @selenium + Scenario: Show new institution fields when clicked in add new institution + Given I go to /profile/noosfero/plugin/organization_ratings/new_rating + And I click on anything with selector "#comments-additional-information" + And I fill in "input_institution" with "None institution" + And I sleep for 2 seconds + When I follow "Add" + Then I should see "New Institution" + And I should see "Public Institution" + And I should see "Private Institution" + And I should see "Corporate Name" + And I should see "Name" + And I should see "State" + And I should see "City" + And I should see "Country" + And I should see "CNPJ" + And I should see "Acronym" + And I choose "Public Institution" + And I should see "Governmental Sphere:" + And I should see "Governmental Power:" + And I should see "Juridical Nature:" + + @selenium + Scenario: Create new institution with name changed in the modal + Given I go to /profile/noosfero/plugin/organization_ratings/new_rating + And I click on anything with selector "#comments-additional-information" + And I fill in "input_institution" with "None institution" + And I sleep for 2 seconds + When I click on anything with selector "#create_institution_link" + And I fill in "community_name" with "Noosfero Institution" + And I select "United States" from "#community_country" + And I follow "#save_institution_button" + Then I should see "Noosfero Institution" + + @selenium + Scenario: Check new institution name in the modal + Given I go to /profile/noosfero/plugin/organization_ratings/new_rating + And I click on anything with selector "#comments-additional-information" + And I fill in "input_institution" with "None institution" + And I sleep for 2 seconds + When I click on anything with selector "#create_institution_link" + Then I should see "None Institution" within "community_name" + + + + + + diff --git a/src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps.rb b/src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps.rb deleted file mode 100644 index 97cf5e2..0000000 --- a/src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps.rb +++ /dev/null @@ -1,90 +0,0 @@ -Given /^Institutions has initial default values on database$/ do - GovernmentalPower.create(:name => "Executivo") - GovernmentalPower.create(:name => "Legislativo") - GovernmentalPower.create(:name => "Judiciario") - - GovernmentalSphere.create(:name => "Federal") - - JuridicalNature.create(:name => "Autarquia") - JuridicalNature.create(:name => "Administracao Direta") - JuridicalNature.create(:name => "Empresa Publica") - JuridicalNature.create(:name => "Fundacao") - JuridicalNature.create(:name => "Orgao Autonomo") - JuridicalNature.create(:name => "Sociedade") - JuridicalNature.create(:name => "Sociedade Civil") - JuridicalNature.create(:name => "Sociedade de Economia Mista") - - national_region = NationalRegion.new - national_region.name = "Distrito Federal" - national_region.national_region_code = '35' - national_region.national_region_type_id = NationalRegionType::STATE - national_region.save -end - -Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select| -# Wait the page javascript load -sleep 1 -# Basicaly it, search for the input field, type something, wait for ajax end select an item -page.driver.browser.execute_script %Q{ - var search_query = "#{input_field_selector}.ui-autocomplete-input"; - var input = jQuery(search_query).first(); - - input.trigger('click'); - input.val('#{typed}'); - input.trigger('keydown'); - - window.setTimeout(function(){ - search_query = ".ui-menu-item a:contains('#{should_select}')"; - var typed = jQuery(search_query).first(); - - typed.trigger('mouseenter').trigger('click'); - console.log(jQuery('#license_info_id')); - }, 1000); - } - sleep 1 -end - -Given /^the following public institutions?$/ do |table| - # table is a Cucumber::Ast::Table - table.hashes.each do |item| - community = Community.new - community.name = item[:name] - community.country = item[:country] - community.state = item[:state] - community.city = item[:city] - community.save! - - governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first - governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first - - juridical_nature = JuridicalNature.create(:name => item[:juridical_nature]) - - institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere) - institution.community = community - institution.corporate_name = item[:corporate_name] - institution.save! - end -end - -Given /^I sleep for (\d+) seconds$/ do |time| - sleep time.to_i -end - -Given /^I am logged in as mpog_admin$/ do - visit('/account/logout') - - user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com') - person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin" - user.person = person - user.save! - - user.activate - e = Environment.default - e.add_admin(user.person) - - visit('/account/login') - fill_in("Username", :with => user.login) - fill_in("Password", :with => '123456') - click_button("Log in") -end - diff --git a/src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps_backup.rb b/src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps_backup.rb new file mode 100644 index 0000000..e61c9ff --- /dev/null +++ b/src/noosfero-spb/gov_user/features/steps_definitions/gov_user_steps_backup.rb @@ -0,0 +1,93 @@ +Given /^Institutions has initial default values on database$/ do + GovernmentalPower.create(:name => "Executivo") + GovernmentalPower.create(:name => "Legislativo") + GovernmentalPower.create(:name => "Judiciario") + + GovernmentalSphere.create(:name => "Federal") + + JuridicalNature.create(:name => "Autarquia") + JuridicalNature.create(:name => "Administracao Direta") + JuridicalNature.create(:name => "Empresa Publica") + JuridicalNature.create(:name => "Fundacao") + JuridicalNature.create(:name => "Orgao Autonomo") + JuridicalNature.create(:name => "Sociedade") + JuridicalNature.create(:name => "Sociedade Civil") + JuridicalNature.create(:name => "Sociedade de Economia Mista") + + national_region = NationalRegion.new + national_region.name = "Distrito Federal" + national_region.national_region_code = '35' + national_region.national_region_type_id = NationalRegionType::STATE + national_region.save +end + +Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select| +# Wait the page javascript load +sleep 1 +# Basicaly it, search for the input field, type something, wait for ajax end select an item +page.driver.browser.execute_script %Q{ + var search_query = "#{input_field_selector}.ui-autocomplete-input"; + var input = jQuery(search_query).first(); + + input.trigger('click'); + input.val('#{typed}'); + input.trigger('keydown'); + + window.setTimeout(function(){ + search_query = ".ui-menu-item a:contains('#{should_select}')"; + var typed = jQuery(search_query).first(); + + typed.trigger('mouseenter').trigger('click'); + console.log(jQuery('#license_info_id')); + }, 1000); + } + sleep 1 +end + +Given /^the following public institutions?$/ do |table| + # table is a Cucumber::Ast::Table + table.hashes.each do |item| + community = Community.new + community.name = item[:name] + community.country = item[:country] + community.state = item[:state] + community.city = item[:city] + community.save! + + governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first + governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first + + juridical_nature = JuridicalNature.create(:name => item[:juridical_nature]) + + institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere) + institution.community = community + institution.corporate_name = item[:corporate_name] + institution.save! + end +end + +Given /^I sleep for (\d+) seconds$/ do |time| + sleep time.to_i +end + +Given /^I am logged in as mpog_admin$/ do + visit('/account/logout') + + user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com') + person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin" + user.person = person + user.save! + + user.activate + e = Environment.default + e.add_admin(user.person) + + visit('/account/login') + fill_in("Username", :with => user.login) + fill_in("Password", :with => '123456') + click_button("Log in") +end + +Given /^I click on anything with selector "([^"]*)"$/ do |selector| + evaluate_script "jQuery('#{selector}').trigger('click') && true" +end diff --git a/src/noosfero-spb/gov_user/features/steps_definitions/software_communities_steps.rb b/src/noosfero-spb/gov_user/features/steps_definitions/software_communities_steps.rb new file mode 120000 index 0000000..b324809 --- /dev/null +++ b/src/noosfero-spb/gov_user/features/steps_definitions/software_communities_steps.rb @@ -0,0 +1 @@ +../../../software_communities/features/step_definitions/software_communities_steps.rb \ No newline at end of file diff --git a/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb b/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb index fb2b59e..d2b36c8 100644 --- a/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb +++ b/src/noosfero-spb/gov_user/lib/ext/organization_rating.rb @@ -13,7 +13,8 @@ OrganizationRating.class_eval do def verify_institution if self.institution != nil institution = Institution.find_by_id self.institution.id - self.errors.add :institution, _("not found") unless institution + self.errors.add :institution, _("institution not found") unless institution + return !!institution end end diff --git a/src/noosfero-spb/gov_user/lib/gov_user_plugin.rb b/src/noosfero-spb/gov_user/lib/gov_user_plugin.rb index 5cd63dc..8a7c96c 100644 --- a/src/noosfero-spb/gov_user/lib/gov_user_plugin.rb +++ b/src/noosfero-spb/gov_user/lib/gov_user_plugin.rb @@ -146,12 +146,14 @@ class GovUserPlugin < Noosfero::Plugin lib/noosfero-root.js lib/select-element.js lib/select-field-choices.js + lib/modal-observer.js views/complete-registration.js views/control-panel.js views/create-institution.js views/new-community.js views/user-edit-profile.js views/gov-user-comments-extra-fields.js + views/institution-modal.js initializer.js app.js ) diff --git a/src/noosfero-spb/gov_user/lib/institution_modal_helper.rb b/src/noosfero-spb/gov_user/lib/institution_modal_helper.rb new file mode 100644 index 0000000..faaa308 --- /dev/null +++ b/src/noosfero-spb/gov_user/lib/institution_modal_helper.rb @@ -0,0 +1,74 @@ +class InstitutionModalHelper + extend( + ActionView::Helpers::FormOptionsHelper, # content_tag + ActionView::Helpers::FormTagHelper, # button_tag + ActionView::Helpers::UrlHelper, # link_to + ActionView::Context # content_tag do end + ) + + def self.modal_button link_text=_("Create new institution"), display="block" + # HTML Sample in: http://getbootstrap.com/javascript/#modals-examples + content_tag :div, :id=>"institution_modal_container", :style=>"display: #{display}" do + link = link_to( + link_text, + "javascript: void(0)", + {:class=>"button with-text", :data=>{:toggle=>"modal", :target=>"#institution_modal"}, :id=>"create_institution_link"} + ) + + link.concat modal + end + end + + private + + def self.modal + options = { + :id=>"institution_modal", + :role=>"dialog", + :class=>"modal fade" + } + + content_tag :div, options do + modal_dialog + end + end + + def self.modal_dialog + content_tag :div, :class=>"modal-dialog", :role=>"document" do + modal_content + end + end + + def self.modal_content + content_tag :div, :class=>"modal-content" do + #modal_header.concat(modal_body.concat(modal_footer)) + modal_header.concat(modal_body) + end + end + + def self.modal_header + content_tag :div, :class=>"modal-header" do + button = button_tag :type=>"button", :data=>{:dismiss=>"modal"}, :class=>"close" do + content_tag :span, "×" + end + + h4 = content_tag :h4, _("New Institution"), :class=>"modal-title" + + button.concat h4 + end + end + + def self.modal_body + content_tag :div, "", :id=>"institution_modal_body", :class=>"modal-body" + end + + #def self.modal_footer + # content_tag :div, {:class=>"modal-footer"} do + # close = button_tag _("Close"), :type=>"button", :class=>"button with-text" + # save = button_tag _("Save changes"), :type=>"button", :class=>"button with-text" + # + # close.concat save + # end + #end +end + diff --git a/src/noosfero-spb/gov_user/po/gov_user.pot b/src/noosfero-spb/gov_user/po/gov_user.pot index cefb207..edb788e 100644 --- a/src/noosfero-spb/gov_user/po/gov_user.pot +++ b/src/noosfero-spb/gov_user/po/gov_user.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.3.1+spb2\n" -"POT-Creation-Date: 2015-10-16 19:14-0000\n" +"Project-Id-Version: 1.3~rc1-3-gaf61824\n" +"POT-Creation-Date: 2015-12-03 10:35-0200\n" "PO-Revision-Date: 2015-09-01 20:59-0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,62 +17,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: plugins/gov_user/test/unit/gov_user_person_test.rb:50 -#: plugins/gov_user/test/unit/gov_user_person_test.rb:56 -msgid "Name Should begin with a capital letter and no special characters" -msgstr "" - #: plugins/gov_user/controllers/gov_user_plugin_myprofile_controller.rb:28 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:168 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:181 msgid "Could not find Governmental Power or Governmental Sphere" msgstr "" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:18 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:43 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:137 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:80 msgid "Select a Governmental Sphere" msgstr "" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:19 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:44 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:142 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:87 msgid "Select a Governmental Power" msgstr "" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:20 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:45 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:147 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:93 msgid "Select a Juridical Nature" msgstr "" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:21 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:46 -msgid "Select a state" -msgstr "" - -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:214 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:227 msgid "Institution successful created!" msgstr "" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:219 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:232 msgid "Institution could not be created!" msgstr "" -#: plugins/gov_user/lib/gov_user_plugin.rb:17 -msgid "Add features related to Brazilian government." -msgstr "" - -#: plugins/gov_user/lib/gov_user_plugin.rb:132 -#: plugins/gov_user/lib/gov_user_plugin.rb:163 -msgid "Create Institution" -msgstr "" - -#: plugins/gov_user/lib/gov_user_plugin.rb:289 -msgid "Institution Info" -msgstr "" - -#: plugins/gov_user/lib/gov_user_plugin.rb:314 -msgid "Institution" +#: plugins/gov_user/test/unit/gov_user_person_test.rb:50 +#: plugins/gov_user/test/unit/gov_user_person_test.rb:56 +msgid "Name Should begin with a capital letter and no special characters" msgstr "" #: plugins/gov_user/lib/institution.rb:47 @@ -89,6 +64,14 @@ msgstr "" msgid "invalid format" msgstr "" +#: plugins/gov_user/lib/ext/search_controller.rb:17 +msgid "Institution Catalog" +msgstr "" + +#: plugins/gov_user/lib/ext/organization_rating.rb:16 +msgid "institution not found" +msgstr "" + #: plugins/gov_user/lib/ext/user.rb:19 msgid "Email must be different from secondary email." msgstr "" @@ -101,12 +84,12 @@ msgstr "" msgid "Invalid secondary email format." msgstr "" -#: plugins/gov_user/lib/ext/search_controller.rb:17 -msgid "Institution Catalog" +#: plugins/gov_user/lib/institution_modal_helper.rb:9 +msgid "Create new institution" msgstr "" -#: plugins/gov_user/lib/ext/organization_rating.rb:16 -msgid "not found" +#: plugins/gov_user/lib/institution_modal_helper.rb:55 +msgid "New Institution" msgstr "" #: plugins/gov_user/lib/institutions_block.rb:4 @@ -129,6 +112,40 @@ msgstr "" msgid "institutions|View all" msgstr "" +#: plugins/gov_user/lib/gov_user_plugin.rb:17 +msgid "Add features related to Brazilian government." +msgstr "" + +#: plugins/gov_user/lib/gov_user_plugin.rb:132 +#: plugins/gov_user/lib/gov_user_plugin.rb:165 +msgid "Create Institution" +msgstr "" + +#: plugins/gov_user/lib/gov_user_plugin.rb:291 +msgid "Institution Info" +msgstr "" + +#: plugins/gov_user/lib/gov_user_plugin.rb:316 +#: plugins/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb:4 +msgid "Institution" +msgstr "" + +#: plugins/gov_user/views/search/institutions.html.erb:3 +msgid "Type words about the %s you're looking for" +msgstr "" + +#: plugins/gov_user/views/incomplete_registration.html.erb:3 +msgid "Complete Profile" +msgstr "" + +#: plugins/gov_user/views/incomplete_registration.html.erb:6 +msgid "Complete your profile" +msgstr "" + +#: plugins/gov_user/views/incomplete_registration.html.erb:7 +msgid "Hide" +msgstr "" + #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:1 msgid "Edit Institution" msgstr "" @@ -143,100 +160,135 @@ msgid "" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:11 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:18 msgid "\"Can`t create new Institution: #{flash[:errors].length} errors\"" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:28 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:37 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:51 msgid "Public Institution" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:33 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:33 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:44 msgid "Private Institution" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:40 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:44 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:67 msgid "Institution name already exists" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:48 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:71 msgid "Corporate Name" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:53 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79 msgid "Country" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:53 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:57 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:88 msgid "State" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:63 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:66 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:108 msgid "CNPJ" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:70 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:72 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:72 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:74 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:115 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:117 msgid "Acronym" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:71 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:73 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:116 msgid "Fantasy name" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:79 #: plugins/gov_user/views/profile/_institution_tab.html.erb:17 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:81 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:124 msgid "Governmental Sphere:" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:86 #: plugins/gov_user/views/profile/_institution_tab.html.erb:16 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:88 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:131 msgid "Governmental Power:" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:92 #: plugins/gov_user/views/profile/_institution_tab.html.erb:18 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:94 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:138 msgid "Juridical Nature:" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:99 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:101 msgid "SISP?" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:101 #: plugins/gov_user/views/profile/_institution_tab.html.erb:19 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:104 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:153 msgid "Yes" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:103 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:106 #: plugins/gov_user/views/profile/_institution_tab.html.erb:19 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:106 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:108 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:158 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:162 msgid "No" msgstr "" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:111 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:114 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:118 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:172 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:175 msgid "Save" msgstr "" +#: plugins/gov_user/views/ratings_extra_field.html.erb:2 +msgid "Organization name or Enterprise name" +msgstr "" + +#: plugins/gov_user/views/ratings_extra_field.html.erb:7 +msgid "No organization or company found" +msgstr "" + +#: plugins/gov_user/views/ratings_extra_field.html.erb:8 +msgid "Add" +msgstr "" + +#: plugins/gov_user/views/person_editor_extras.html.erb:2 +msgid "Secondary e-mail" +msgstr "" + +#: plugins/gov_user/views/person_editor_extras.html.erb:21 +msgid "No institution found" +msgstr "" + +#: plugins/gov_user/views/person_editor_extras.html.erb:38 +msgid "Should begin with a capital letter and no special characters" +msgstr "" + +#: plugins/gov_user/views/person_editor_extras.html.erb:39 +msgid "Email should have the following format: name@host.br" +msgstr "" + +#: plugins/gov_user/views/person_editor_extras.html.erb:40 +msgid "Site should have a valid format: http://name.hosts" +msgstr "" + +#: plugins/gov_user/views/person_editor_extras.html.erb:41 +msgid "If you work in a public agency use your government e-Mail" +msgstr "" + #: plugins/gov_user/views/profile/_institution_tab.html.erb:3 msgid "Institution Information" msgstr "" @@ -277,76 +329,35 @@ msgstr "" msgid "SISP:" msgstr "" -#: plugins/gov_user/views/ratings_extra_field.html.erb:2 -msgid "Organization name or Enterprise name" -msgstr "" - -#: plugins/gov_user/views/ratings_extra_field.html.erb:6 -#: plugins/gov_user/views/person_editor_extras.html.erb:21 -msgid "No institution found" -msgstr "" - -#: plugins/gov_user/views/person_editor_extras.html.erb:2 -msgid "Secondary e-mail" -msgstr "" - -#: plugins/gov_user/views/person_editor_extras.html.erb:22 -msgid "Add new institution" -msgstr "" - -#: plugins/gov_user/views/person_editor_extras.html.erb:23 -msgid "Create new institution" -msgstr "" - -#: plugins/gov_user/views/person_editor_extras.html.erb:39 -msgid "Should begin with a capital letter and no special characters" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11 +msgid "The highlighted fields are mandatory" msgstr "" -#: plugins/gov_user/views/person_editor_extras.html.erb:40 -msgid "Email should have the following format: name@host.br" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:23 +msgid "\"#{key_name.capitalize} #{value.join()}\"" msgstr "" -#: plugins/gov_user/views/person_editor_extras.html.erb:41 -msgid "Site should have a valid format: http://name.hosts" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62 +msgid "Name" msgstr "" -#: plugins/gov_user/views/person_editor_extras.html.erb:42 -msgid "If you work in a public agency use your government e-Mail" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:97 +msgid "City" msgstr "" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:1 -msgid "New Institution" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:145 +msgid "SISP ?" msgstr "" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:16 -msgid "\"#{key_name.capitalize} #{value.join()}\"" -msgstr "" - -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:115 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:119 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:173 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:176 msgid "Cancel" msgstr "" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:121 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:177 msgid "Could not send the form data to the server" msgstr "" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:128 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:185 msgid "Creating institution" msgstr "" - -#: plugins/gov_user/views/search/institutions.html.erb:3 -msgid "Type words about the %s you're looking for" -msgstr "" - -#: plugins/gov_user/views/incomplete_registration.html.erb:3 -msgid "Complete Profile" -msgstr "" - -#: plugins/gov_user/views/incomplete_registration.html.erb:6 -msgid "Complete your profile" -msgstr "" - -#: plugins/gov_user/views/incomplete_registration.html.erb:7 -msgid "Hide" -msgstr "" diff --git a/src/noosfero-spb/gov_user/po/pt/gov_user.po b/src/noosfero-spb/gov_user/po/pt/gov_user.po index b3413a0..c0c1ba3 100644 --- a/src/noosfero-spb/gov_user/po/pt/gov_user.po +++ b/src/noosfero-spb/gov_user/po/pt/gov_user.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: 1.3.1+spb2\n" -"POT-Creation-Date: 2015-10-16 19:14-0000\n" +"Project-Id-Version: 1.3~rc1-3-gaf61824\n" +"POT-Creation-Date: 2015-12-03 10:35-0200\n" "PO-Revision-Date: 2015-09-01 19:55-0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,64 +16,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: plugins/gov_user/test/unit/gov_user_person_test.rb:50 -#: plugins/gov_user/test/unit/gov_user_person_test.rb:56 -msgid "Name Should begin with a capital letter and no special characters" -msgstr "" -"Nome deve iniciar com letrar maiúscula e não deve conter carateres especiais" - #: plugins/gov_user/controllers/gov_user_plugin_myprofile_controller.rb:28 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:168 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:181 msgid "Could not find Governmental Power or Governmental Sphere" msgstr "Não foi possível encontrar o Poder ou Esfera Governamental" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:18 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:43 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:137 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:80 msgid "Select a Governmental Sphere" msgstr "Selecione uma Esfera Governamental" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:19 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:44 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:142 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:87 msgid "Select a Governmental Power" msgstr "Selecione um Poder Governamental" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:20 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:45 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:147 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:93 msgid "Select a Juridical Nature" msgstr "Seleciona uma Natureza Jurídica" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:21 -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:46 -msgid "Select a state" -msgstr "Selecione um Estado" - -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:214 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:227 msgid "Institution successful created!" msgstr "Instituição criada com sucesso!" -#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:219 +#: plugins/gov_user/controllers/gov_user_plugin_controller.rb:232 msgid "Institution could not be created!" msgstr "Instituição não pode ser criada!" -#: plugins/gov_user/lib/gov_user_plugin.rb:17 -msgid "Add features related to Brazilian government." -msgstr "Adicionar funcionlidade relacionada com o governo brasileiro." - -#: plugins/gov_user/lib/gov_user_plugin.rb:132 -#: plugins/gov_user/lib/gov_user_plugin.rb:163 -msgid "Create Institution" -msgstr "Criar Instituição" - -#: plugins/gov_user/lib/gov_user_plugin.rb:289 -msgid "Institution Info" -msgstr "Informações da Instituição" - -#: plugins/gov_user/lib/gov_user_plugin.rb:314 -msgid "Institution" -msgstr "Instituição" +#: plugins/gov_user/test/unit/gov_user_person_test.rb:50 +#: plugins/gov_user/test/unit/gov_user_person_test.rb:56 +msgid "Name Should begin with a capital letter and no special characters" +msgstr "Nome deve iniciar com letrar maiúscula e não deve conter carateres especiais" #: plugins/gov_user/lib/institution.rb:47 msgid "invalid, only public and private institutions are allowed." @@ -89,6 +63,14 @@ msgstr "não pode ficar em branco" msgid "invalid format" msgstr "formato inválido" +#: plugins/gov_user/lib/ext/search_controller.rb:17 +msgid "Institution Catalog" +msgstr "Catálogo de Instituições" + +#: plugins/gov_user/lib/ext/organization_rating.rb:16 +msgid "institution not found" +msgstr "Nenhuma instituição encontrada" + #: plugins/gov_user/lib/ext/user.rb:19 msgid "Email must be different from secondary email." msgstr "Email deve ser diferente do email secundário" @@ -101,13 +83,13 @@ msgstr "Email ou email secundário já estão sendo utilizados." msgid "Invalid secondary email format." msgstr "Formato inválido do email sencundário" -#: plugins/gov_user/lib/ext/search_controller.rb:17 -msgid "Institution Catalog" -msgstr "Catálogo de Instituições" +#: plugins/gov_user/lib/institution_modal_helper.rb:9 +msgid "Create new institution" +msgstr "Criar nova instituição" -#: plugins/gov_user/lib/ext/organization_rating.rb:16 -msgid "not found" -msgstr "não encontrada" +#: plugins/gov_user/lib/institution_modal_helper.rb:55 +msgid "New Institution" +msgstr "Nova Instituição" #: plugins/gov_user/lib/institutions_block.rb:4 #: plugins/gov_user/views/person_editor_extras.html.erb:11 @@ -129,6 +111,40 @@ msgstr "Esse bloco mostra as instituições em que o usuário faz parte." msgid "institutions|View all" msgstr "instituições|Ver todas" +#: plugins/gov_user/lib/gov_user_plugin.rb:17 +msgid "Add features related to Brazilian government." +msgstr "Adicionar funcionlidade relacionada com o governo brasileiro." + +#: plugins/gov_user/lib/gov_user_plugin.rb:132 +#: plugins/gov_user/lib/gov_user_plugin.rb:165 +msgid "Create Institution" +msgstr "Criar Instituição" + +#: plugins/gov_user/lib/gov_user_plugin.rb:291 +msgid "Institution Info" +msgstr "Informações da Instituição" + +#: plugins/gov_user/lib/gov_user_plugin.rb:316 +#: plugins/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb:4 +msgid "Institution" +msgstr "Instituição" + +#: plugins/gov_user/views/search/institutions.html.erb:3 +msgid "Type words about the %s you're looking for" +msgstr "Escreve palavras sobre o %s que você está procurando" + +#: plugins/gov_user/views/incomplete_registration.html.erb:3 +msgid "Complete Profile" +msgstr "Complete o Perfil" + +#: plugins/gov_user/views/incomplete_registration.html.erb:6 +msgid "Complete your profile" +msgstr "Complete seu perfil" + +#: plugins/gov_user/views/incomplete_registration.html.erb:7 +msgid "Hide" +msgstr "Ocultar" + #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:1 msgid "Edit Institution" msgstr "Editar Instituição" @@ -147,101 +163,136 @@ msgstr "" "critérios." #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:11 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:18 msgid "\"Can`t create new Institution: #{flash[:errors].length} errors\"" msgstr "" "\"Não foi possível criar nova Instituição: #{flash[:errors].length} erros\"" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:28 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:37 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:51 msgid "Public Institution" msgstr "Instituição Pública" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:33 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:33 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:44 msgid "Private Institution" msgstr "Instituição Privada" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:40 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:44 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:67 msgid "Institution name already exists" msgstr "Nome de Instituição já existe" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:44 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:48 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:71 msgid "Corporate Name" -msgstr "Nome da Coorporação" +msgstr "Razão social" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:49 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:53 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:79 msgid "Country" msgstr "País" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:53 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:57 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:88 msgid "State" msgstr "Estado" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:63 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:66 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:108 msgid "CNPJ" msgstr "CNPJ" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:70 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:72 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:72 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:74 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:115 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:117 msgid "Acronym" msgstr "Sigla" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:71 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:73 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:116 msgid "Fantasy name" msgstr "Nome Fantasia" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:79 #: plugins/gov_user/views/profile/_institution_tab.html.erb:17 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:81 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:124 msgid "Governmental Sphere:" msgstr "Esfera Governamental:" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:86 #: plugins/gov_user/views/profile/_institution_tab.html.erb:16 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:88 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:131 msgid "Governmental Power:" msgstr "Poder Governamental:" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:92 #: plugins/gov_user/views/profile/_institution_tab.html.erb:18 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:94 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:138 msgid "Juridical Nature:" msgstr "Natureza Jurídica:" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:99 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:101 msgid "SISP?" msgstr "SISP?" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:101 #: plugins/gov_user/views/profile/_institution_tab.html.erb:19 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:104 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:153 msgid "Yes" msgstr "Sim" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:103 #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:106 #: plugins/gov_user/views/profile/_institution_tab.html.erb:19 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:106 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:108 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:158 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:162 msgid "No" msgstr "Não" #: plugins/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb:111 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:114 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:118 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:172 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:175 msgid "Save" msgstr "Salvar" +#: plugins/gov_user/views/ratings_extra_field.html.erb:2 +msgid "Organization name or Enterprise name" +msgstr "Nome da organização ou empresa" + +#: plugins/gov_user/views/ratings_extra_field.html.erb:7 +msgid "No organization or company found" +msgstr "Nenhuma organização ou companhia encontrados" + +#: plugins/gov_user/views/ratings_extra_field.html.erb:8 +msgid "Add" +msgstr "Adicionar" + +#: plugins/gov_user/views/person_editor_extras.html.erb:2 +msgid "Secondary e-mail" +msgstr "Email secundário" + +#: plugins/gov_user/views/person_editor_extras.html.erb:21 +msgid "No institution found" +msgstr "Nenhuma instituição encontrada" + +#: plugins/gov_user/views/person_editor_extras.html.erb:38 +msgid "Should begin with a capital letter and no special characters" +msgstr "Deve começar com letra maíscula e não conter caracteres especiais" + +#: plugins/gov_user/views/person_editor_extras.html.erb:39 +msgid "Email should have the following format: name@host.br" +msgstr "Email deve ter o seguinte formato: name@host.br" + +#: plugins/gov_user/views/person_editor_extras.html.erb:40 +msgid "Site should have a valid format: http://name.hosts" +msgstr "Site deve ter um formato válido: http://name.hosts" + +#: plugins/gov_user/views/person_editor_extras.html.erb:41 +msgid "If you work in a public agency use your government e-Mail" +msgstr "Se você trabalha em uma agência pública use seu email governamental" + #: plugins/gov_user/views/profile/_institution_tab.html.erb:3 msgid "Institution Information" msgstr "Informação da Instituição" @@ -282,82 +333,47 @@ msgstr "Sigla:" msgid "SISP:" msgstr "SISP:" -#: plugins/gov_user/views/ratings_extra_field.html.erb:2 -msgid "Organization name or Enterprise name" -msgstr "Nome da organização ou empresa" - -#: plugins/gov_user/views/ratings_extra_field.html.erb:6 -#: plugins/gov_user/views/person_editor_extras.html.erb:21 -msgid "No institution found" -msgstr "Nenhuma instituição encontrada" - -#: plugins/gov_user/views/person_editor_extras.html.erb:2 -msgid "Secondary e-mail" -msgstr "Email secundário" - -#: plugins/gov_user/views/person_editor_extras.html.erb:22 -msgid "Add new institution" -msgstr "Adicionar nova instituição" - -#: plugins/gov_user/views/person_editor_extras.html.erb:23 -msgid "Create new institution" -msgstr "Criar nova instituição" - -#: plugins/gov_user/views/person_editor_extras.html.erb:39 -msgid "Should begin with a capital letter and no special characters" -msgstr "Deve começar com letra maíscula e não conter caracteres especiais" - -#: plugins/gov_user/views/person_editor_extras.html.erb:40 -msgid "Email should have the following format: name@host.br" -msgstr "Email deve ter o seguinte formato: name@host.br" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:11 +msgid "The highlighted fields are mandatory" +msgstr "Todos os campos com (*) são obrigatórios" -#: plugins/gov_user/views/person_editor_extras.html.erb:41 -msgid "Site should have a valid format: http://name.hosts" -msgstr "Site deve ter um formato válido: http://name.hosts" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:23 +msgid "\"#{key_name.capitalize} #{value.join()}\"" +msgstr "\"#{key_name.capitalize} #{value.join()}\"" -#: plugins/gov_user/views/person_editor_extras.html.erb:42 -msgid "If you work in a public agency use your government e-Mail" -msgstr "Se você trabalha em uma agência pública use seu email governamental" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:62 +msgid "Name" +msgstr "Nome" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:1 -msgid "New Institution" -msgstr "Nova Instituição" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:97 +msgid "City" +msgstr "Cidade" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:16 -msgid "\"#{key_name.capitalize} #{value.join()}\"" -msgstr "\"#{key_name.capitalize} #{value.join()}\"" +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:145 +msgid "SISP ?" +msgstr "SISP ?" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:115 -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:119 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:173 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:176 msgid "Cancel" msgstr "Cancelar" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:121 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:177 msgid "Could not send the form data to the server" msgstr "Não foi possível enviar os dados do formulário para o servidor" -#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:128 +#: plugins/gov_user/views/gov_user_plugin/_institution.html.erb:185 msgid "Creating institution" msgstr "Criar instituição" -#: plugins/gov_user/views/search/institutions.html.erb:3 -msgid "Type words about the %s you're looking for" -msgstr "Escreve palavras sobre o %s que você está procurando" +#~ msgid "Select a state" +#~ msgstr "Selecione um Estado" -#: plugins/gov_user/views/incomplete_registration.html.erb:3 -msgid "Complete Profile" -msgstr "Complete o Perfil" - -#: plugins/gov_user/views/incomplete_registration.html.erb:6 -msgid "Complete your profile" -msgstr "Complete seu perfil" - -#: plugins/gov_user/views/incomplete_registration.html.erb:7 -msgid "Hide" -msgstr "Ocultar" +#~ msgid "not found" +#~ msgstr "não encontrada" -#~ msgid "All fields with (*) are mandatory" -#~ msgstr "Todos os campos com (*) são obrigatórios" +#~ msgid "Add new institution" +#~ msgstr "Adicionar nova instituição" #~ msgid "A plugin that does this and that." #~ msgstr "Um plugin que faz isso e aquilo" diff --git a/src/noosfero-spb/gov_user/public/initializer.js b/src/noosfero-spb/gov_user/public/initializer.js index aaf8c9f..045805a 100644 --- a/src/noosfero-spb/gov_user/public/initializer.js +++ b/src/noosfero-spb/gov_user/public/initializer.js @@ -9,7 +9,8 @@ 'CompleteRegistration', 'UserEditProfile', 'NewCommunity', - 'GovUserCommentsExtraFields' + 'GovUserCommentsExtraFields', + 'InstitutionModal' ]; diff --git a/src/noosfero-spb/gov_user/public/lib/modal-observer.js b/src/noosfero-spb/gov_user/public/lib/modal-observer.js new file mode 100644 index 0000000..1325f00 --- /dev/null +++ b/src/noosfero-spb/gov_user/public/lib/modal-observer.js @@ -0,0 +1,36 @@ +/* globals modulejs */ + +// Works on: IE 11, Edge 12+, Firefox 40+, Chrome 43+, Opera 32+, Safari 32+ +modulejs.define("ModalObserver", function() { + "use strict"; + + function ModalObserver(target, callback) { + this.action_callback = callback; + this.observer = new MutationObserver(this.mutationVerifier.bind(this)); + + this.observer.observe(target, {attributes: true}); + } + + + ModalObserver.prototype.mutationVerifier = function(mutations) { + var callback = this.action_callback; + var observer = this.observer; + + mutations.forEach(function(mutation) { + if (mutation.attributeName === "style" && + mutation.target.style.display === "none") + { + callback(); + // stop the observer, once its action is done + observer.disconnect(); + } + }); + }; + + + return { + init: function(target, callback) { + new ModalObserver(target, callback); + } + }; +}); diff --git a/src/noosfero-spb/gov_user/public/style.css b/src/noosfero-spb/gov_user/public/style.css index c1fdab2..e903755 100644 --- a/src/noosfero-spb/gov_user/public/style.css +++ b/src/noosfero-spb/gov_user/public/style.css @@ -24,3 +24,12 @@ border-color: #FF0000; box-shadow: 0 0 10px #FF0000; } + +#institution_empty_ajax_message { + margin-top: 10px; + margin-left: 0px !important; +} + +#create_institution_link { + margin-left: 8px; +} diff --git a/src/noosfero-spb/gov_user/public/views/create-institution.js b/src/noosfero-spb/gov_user/public/views/create-institution.js index 2da1926..4652d7a 100644 --- a/src/noosfero-spb/gov_user/public/views/create-institution.js +++ b/src/noosfero-spb/gov_user/public/views/create-institution.js @@ -4,8 +4,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] 'use strict'; var AJAX_URL = { - create_institution_modal: - NoosferoRoot.urlWithSubDirectory("/plugin/gov_user/create_institution"), new_institution: NoosferoRoot.urlWithSubDirectory("/plugin/gov_user/new_institution"), institution_already_exists: @@ -16,30 +14,11 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] NoosferoRoot.urlWithSubDirectory("/account/search_cities") }; - - function open_create_institution_modal(evt) { - evt.preventDefault(); - - $.get(AJAX_URL.create_institution_modal, function(response){ - $("#institution_dialog").html(response); - - set_form_count_custom_data(); - set_events(); - - $("#institution_dialog").dialog({ - modal: true, - width: 500, - height: 530, - position: 'center', - close: function() { - $("#institution_dialog").html(""); - $('#institution_empty_ajax_message').switchClass("show-field", "hide-field"); - } - }); - }); + function set_institution_field_name(name) { + $("#input_institution").attr("value", name); + $("#input_institution").autocomplete("search"); } - function show_public_institutions_fields() { $(".public-institutions-fields").show(); } @@ -92,13 +71,28 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] var institution_name = response.institution_data.name; var institution_id = response.institution_data.id; - $("#institution_dialog").html("

"+response.message+"

"); - $("#create_institution_errors").switchClass("show-field", "hide-field"); + // Tell the user it was created + window.display_notice(response.message); + + set_institution_field_name($("#community_name").val()); + //settup_created_institution(); + + // Close modal + //$(".modal-header .close").trigger("click"); + // Clear modal fields + $("#institution_modal_body").html(window.sessionStorage.getItem("InstitutionModalBody")); + + // Reset modal events + init_module(); + + + // If the page has a user institution list, update it without repeating the institution $(".institution_container").append(get_clone_institution_data(institution_id)); add_selected_institution_to_list(institution_id, institution_name); - $(".remove-institution").click(remove_institution); + //$('#institution_dialog').dialog('close'); + $('#institution_modal').modal('toggle'); } else { var errors = create_error_list(response); $("#create_institution_errors").switchClass("hide-field", "show-field").html("

"+response.message+"

"+errors); @@ -172,7 +166,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] function cancel_institution(evt){ evt.preventDefault(); - $('#institution_dialog').dialog('close'); + $('#institution_modal').modal('toggle'); } @@ -196,6 +190,16 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] return user_institutions; } + function toggle_extra_fields_style_status(status) { + if(status) { + $('.extra-fields-container').css({ marginTop: "55px" }); + $('.button-bar').css({ marginTop: "55px" }); + } else { + $('.extra-fields-container').css({ marginTop: "0px" }); + $('.button-bar').css({ marginTop: "20px" }); + } + } + function institution_autocomplete() { $("#input_institution").autocomplete({ @@ -209,8 +213,8 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] if( result.length === 0 ) { $('#institution_empty_ajax_message').switchClass("hide-field", "show-field"); - } else { - $('#institution_empty_ajax_message').switchClass("show-field", "hide-field"); + toggle_extra_fields_style_status(true); + $("#institution_modal").css({display: "none"}); } }, error: function(ajax, stat, errorThrown) { @@ -222,17 +226,13 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] minLength: 2, select : function (event, selected) { + $('#institution_empty_ajax_message').switchClass("show-field", "hide-field"); + //$("#create_institution_link").remove(); + toggle_extra_fields_style_status(false); $("#institution_selected").val(selected.item.id).attr("data-name", selected.item.label); - - // +("") -> 0; +("1") -> 1... - if (+($("#institution_selected").val()) !== 0) { - add_new_institution(); - } } }); } - - function add_selected_institution_to_list(id, name) { var selected_institution = "
  • "+name; selected_institution += "
    • "; @@ -240,28 +240,27 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] $(".institutions_added").append(selected_institution); } - - function add_new_institution() { + function add_new_institution(evt) { + evt.preventDefault(); var selected = $("#institution_selected"); - var already_added_to_list = is_institution_already_added_to_list(selected.val()); + var institution_already_added = $(".institutions_added li[data-institution='"+selected.val()+"']").length; - if(selected.val().length > 0 && !already_added_to_list) { + if(selected.val().length > 0 && institution_already_added === 0) { //field that send the institutions to the server $(".institution_container").append(get_clone_institution_data(selected.val())); // Visualy add the selected institution to the list add_selected_institution_to_list(selected.val(), selected.attr("data-name")); + // clean the institution flag + selected.val("").attr("data-name", ""); + $("#input_institution").val(""); + $(".remove-institution").click(remove_institution); } } - function is_institution_already_added_to_list(institution_id) { - return $(".institutions_added li[data-institution='"+institution_id+"']").length !== 0; - } - - function remove_institution(evt) { evt.preventDefault(); var code = $(this).parent().attr("data-institution"); @@ -279,15 +278,19 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] function show_hide_cnpj_city(country) { - var cnpj = $("#institutions_cnpj").parent().parent(); - var city = $("#community_city").parent().parent(); - var state = $("#community_state").parent().parent(); + var cnpj = $("#institutions_cnpj").parent(); + var city = $("#community_city").parent(); + var state = $("#community_state").parent(); var inst_type = $("input[name='institutions[type]']:checked").val(); + institution_type_actions(inst_type); - if( country === "-1" ) $("#community_country").val("BR"); + if ( country === "-1" ) { + $("#community_country").val("BR"); + country = "BR"; + } - if( country !== "BR" ) { + if ( country !== "BR" ) { cnpj.hide(); city.hide(); state.hide(); @@ -364,18 +367,24 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] } } - function set_events() { - $("#create_institution_link").click(open_create_institution_modal); + function set_institution_name_into_modal() { + $("#community_name").val($("#input_institution").val()); + } + + + function set_events() { $("input[name='institutions[type]']").click(function(){ institution_type_actions(this.value); - }); + }).trigger("click"); $('#save_institution_button').click(save_institution); $('#cancel_institution_button').click(cancel_institution); $("#community_name").keyup(institution_already_exists); + $("#add_new_institution").click(add_new_institution); + $(".remove-institution").click(remove_institution); $("#community_country").change(function(){ @@ -390,19 +399,22 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] $('#community_country').change(function(){ autoCompleteCity(); }); + + $("#create_institution_link").click(set_institution_name_into_modal); } + function init_module() { + set_form_count_custom_data(); + set_events(); + } + return { isCurrentPage: function() { return $("#institution_form").length === 1; }, - - init: function() { - set_form_count_custom_data(); - set_events(); - }, + init: init_module, institution_autocomplete: function(){ institution_autocomplete(); diff --git a/src/noosfero-spb/gov_user/public/views/institution-modal.js b/src/noosfero-spb/gov_user/public/views/institution-modal.js new file mode 100644 index 0000000..829c0a6 --- /dev/null +++ b/src/noosfero-spb/gov_user/public/views/institution-modal.js @@ -0,0 +1,54 @@ +/* globals modulejs */ + +modulejs.define('InstitutionModal', + ['jquery', 'NoosferoRoot', 'CreateInstitution', 'ModalObserver'], + function($, NoosferoRoot, CreateInstitution, ModalObserver) +{ + 'use strict'; + + var AJAX_URL = { + create_institution_modal: + NoosferoRoot.urlWithSubDirectory("/plugin/gov_user/create_institution"), + }; + + // When the modal is closed, put the community name into the autocomplete + function observer_action() { + var community_name = $("#community_name").val(); + $("#input_institution").attr("value", community_name).autocomplete("search"); + + // Clear error messages + $("#create_institution_errors").html(""); + } + + // Observe when modal is closed + function observe_modal() { + var institution_modal = document.querySelector("#institution_modal"); + ModalObserver.init(institution_modal, observer_action); + } + + + function prepare_institution_modal() { + $.get(AJAX_URL.create_institution_modal, function(response){ + window.sessionStorage.setItem("InstitutionModalBody", response); + $("#institution_modal_body").html(response); + + // Set all events on modal + CreateInstitution.init(); + }); + + $("#create_institution_link").click(observe_modal); + } + + + return { + isCurrentPage: function() { + return $("#institution_modal_container").length === 1; + }, + + + init: function() { + prepare_institution_modal(); + }, + }; +}); + diff --git a/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb b/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb index e2aa5b0..9cb18bd 100644 --- a/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb +++ b/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb @@ -1,128 +1,197 @@ -

    <%= _('New Institution') %>

    +
    +
    + <% if environment.enabled?('admin_must_approve_new_communities') %> +
    + <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%> +
    + <% end %> +
    -<% if environment.enabled?('admin_must_approve_new_communities') %> -
    - <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%> +
    + <%= _("The highlighted fields are mandatory") %>
    -<%end %> - -<% unless flash[:errors].nil? %> -
    -

    <%= _("Can`t create new Institution: #{flash[:errors].length} errors") %>

    -
      - <% flash[:errors].each do |key, value| %> - <% key_name = key.to_s.gsub("_", " ") %> - <% if value.length > 0 %> -
    • <%= _("#{key_name.capitalize} #{value.join()}") %>
      • +
    + +
    + <% unless flash[:errors].nil? %> +
    +

    <%= _("Can`t create new Institution: #{flash[:errors].length} errors") %>

    +
      + <% flash[:errors].each do |key, value| %> + <% key_name = key.to_s.gsub("_", " ") %> + <% if value.length > 0 %> +
    • <%= _("#{key_name.capitalize} #{value.join()}") %>
      • + <% end %> <% end %> +
    +
    <% end %> -
    -<% end %> -
    - -
    - <%= labelled_form_for :community, :url => {:action=>"new_institution"}, :html => { :multipart => true, :id=>"institution_form" } do |f| %> - <%= required_fields_message %> - <%= hidden_field_tag "edit_institution_page", false %> - <%= fields_for :institutions do |inst| %> - -
    - - - -
    -     +
    +
    +
    - <%= required f.text_field(:name, :class => flash[:error_community_name], :value => params[:community][:name]) %> - <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %> - -
    - <%= inst.label "corporate_name", _("Corporate Name"), :class=>"formlabel" %> - <%= inst.text_field(:corporate_name, :value => params[:institutions][:corporate_name], :size => 55) %> -
    -     +<%= form_for :community, :url => {:action=>"new_institution"}, :html => { :multipart => true, :id=>"institution_form" } do |f| %> - <%= required select_country(_('Country'), 'community', 'country', {:class => "type-select #{flash[:error_community_country]}", :id => "community_country"}) %> + <%= hidden_field_tag "edit_institution_page", false %> + <%= fields_for :institutions do |inst| %> +
    +
    + +
    - -
    - - <%= f.select(:state, @state_options, {:selected => params[:community][:state]}, {:class => flash[:error_community_state]}) %> -
    -     +
    + +
    - <%= required f.text_field(:city, :class => flash[:error_community_city], :value => params[:community][:city]) %> +
    +
    +
    +
    +
    + -
    + <%= f.text_field(:name, :class => flash[:error_community_name], :value => params[:community][:name]) %> + <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %> +
    + +
    + <%= inst.label "corporate_name", _("Fantasy name"), :class=>"formlabel" %> + <%= inst.text_field(:corporate_name, :value => params[:institutions][:corporate_name], :size => 55) %> +
    +
    + +
    +
    + + + <%= select("community", "country", [[_('Select a country'), nil]] + country_helper.countries, {:class => "type-select #{flash[:error_community_country]}"}) %> +
    + +
    + + + <%= f.select(:state, @state_options, {:selected => params[:community][:state]}, {:class => flash[:error_community_state]}) %> +
    + +
    + + + <%= f.text_field(:city, :class => flash[:error_community_city], :value => params[:community][:city]) %> +
    +
    + + +
    +
    <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %> - <%= required inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %> + <%= inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %> +
    +
    + +
    +
    + <%= hidden_field_tag "acronym_translate", _("Acronym") %> + <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %> + <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %> + <%= inst.text_field(:acronym, :value => params[:institutions][:acronym]) %>
    +
    - -
    - <%= hidden_field_tag "acronym_translate", _("Acronym") %> - <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %> - <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %> - <%= inst.text_field(:acronym, :value => params[:institutions][:acronym]) %> -
    -     +
    +
    + - -
    - <%= inst.label("governmental_sphere_id" ,_("Governmental Sphere:"), :class=>"formlabel") %> - <%= inst.select(:governmental_sphere, @governmental_sphere, :selected=>params[:institutions][:governmental_sphere], :class => flash[:error_institution_governmental_sphere])%> -
    -     + <%= inst.select(:governmental_sphere, @governmental_sphere, :selected=>params[:institutions][:governmental_sphere], :class => flash[:error_institution_governmental_sphere])%> +
    +
    - -
    - <%= inst.label("governmental_power_id" ,_("Governmental Power:"), :class=>"formlabel") %> - <%= inst.select(:governmental_power, @governmental_power, :selected=>params[:institutions][:governmental_sphere], :class => flash[:error_institution_governmental_power])%> -
    -     - -
    - <%= inst.label("juridical_nature_id" ,_("Juridical Nature:"), :class=>"formlabel") %> - <%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%> -
    -     +
    +
    + + + <%= inst.select(:governmental_power, @governmental_power, :selected=>params[:institutions][:governmental_sphere], :class => flash[:error_institution_governmental_power])%> +
    +
    + +
    +
    + + + <%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%> +
    +
    + +
    +
    + <%= _("SISP ?") %> +
    - -
    - <%= _("SISP?") %> +
    +
    <% if @show_sisp_field %> +
    <%= inst.radio_button(:sisp, true, :class => "#{flash[:error_institution_sisp]}" ) %> <%= inst.label :sisp ,_("Yes"), :value => true %> +
    + +
    <%= inst.radio_button(:sisp, false, :checked=>"checked", :class => "#{flash[:error_institution_sisp]}") %> <%= inst.label :sisp ,_("No"), :value => false %> +
    <% else %> - <%= inst.label("sisp", _("No")) %> +
    + <%= inst.label("sisp", _("No")) %> +
    <% end %> -
    - - - <% if @url_token == "create_institution_admin" %> - <%= submit_button :save, _('Save') %> - <%= button(:cancel, _("Cancel"), {:controller => "admin_panel", :action => 'index'}) %> - <%else%> -
    - <%= 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') %>
    - <%= hidden_field_tag :institution_error_message, _("Could not send the form data to the server") %> - <%end%> - - <% end %> +
    +
    + +
    +
    + <% if @url_token == "create_institution_admin" %> + <%= submit_button :save, _('Save') %> + <%= button(:cancel, _("Cancel"), {:controller => "admin_panel", :action => 'index'}) %> + <% else %> + <%= 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') %> + <%= hidden_field_tag :institution_error_message, _("Could not send the form data to the server") %> + <% end %> +
    +
    <% end %> +<% end %>
    <%= hidden_field_tag :loading_message, _("Creating institution") %> diff --git a/src/noosfero-spb/gov_user/views/person_editor_extras.html.erb b/src/noosfero-spb/gov_user/views/person_editor_extras.html.erb index 163bf21..9bdb55d 100644 --- a/src/noosfero-spb/gov_user/views/person_editor_extras.html.erb +++ b/src/noosfero-spb/gov_user/views/person_editor_extras.html.erb @@ -19,8 +19,8 @@
    <%= content_tag(:div, _("No institution found"), :id=>"institution_empty_ajax_message", :class=>"errorExplanation hide-field") %> - <%= link_to(_("Create new institution"), "#", :id=>"create_institution_link", :class=>'button with-text icon-add') %> - <%= content_tag(:div, "", :id=>"institution_dialog") %> + + <%= InstitutionModalHelper.modal_button %> <%= hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions') %> <%= hidden_field_tag("institution_selected", "") %> diff --git a/src/noosfero-spb/gov_user/views/ratings_extra_field.html.erb b/src/noosfero-spb/gov_user/views/ratings_extra_field.html.erb index 6f835d1..4ccfa65 100644 --- a/src/noosfero-spb/gov_user/views/ratings_extra_field.html.erb +++ b/src/noosfero-spb/gov_user/views/ratings_extra_field.html.erb @@ -3,8 +3,11 @@ - <%= content_tag(:div, _("No institution found"), - :id=>"institution_empty_ajax_message", - :class=>"errorExplanation hide-field") %> +
    + <%= _("No organization or company found") %> + <%= InstitutionModalHelper.modal_button(_("Add"), "none") %> +
    + <%= hidden_field_tag "organization_rating[institution_id]", "", id: "institution_selected" %>
    + diff --git a/src/noosfero-spb/noosfero-spb-theme/css/modal.css b/src/noosfero-spb/noosfero-spb-theme/css/modal.css new file mode 100644 index 0000000..13b29fe --- /dev/null +++ b/src/noosfero-spb/noosfero-spb-theme/css/modal.css @@ -0,0 +1,257 @@ +/* Bootstrap modal default css */ +.modal { + position: fixed; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + z-index: 1050; + display: none; + overflow: hidden; + outline: 0px none; + background-color: rgba(0, 0, 0, 0.5); + height: 100%; +} + +.modal-open .modal { + overflow-x: hidden; + overflow-y: auto; +} + +.fade { + opacity: 0; + transition: opacity 0.15s linear 0s; +} + +.fade.in { + opacity: 1; +} + +.modal-dialog { + width: 45%; + margin: 15px auto; + position: relative; +} + +.modal.in .modal-dialog { + transform: translate(0px, 0px); +} + +.modal.fade .modal-dialog { + transition: transform 0.3s ease-out 0s; +} + +.modal-content { + box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.5); +} + +.modal-content { + position: relative; + background-color: #FFF; + background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + outline: 0px none; + box-shadow: 0px 3px 9px rgba(0, 0, 0, 0.5); +} + +.modal-header { + min-height: 16.43px; + padding: 15px; + border-bottom: 1px solid #E5E5E5; +} + +.modal-header .close { + margin-top: -2px; +} + +.modal-header button.close { + padding: 0px; + cursor: pointer; + background: transparent none repeat scroll 0px 0px; + border: 0px none; +} + +.modal-header .close { + float: right; + font-size: 21px; + font-weight: 700; + line-height: 1; + color: #000; + text-shadow: 0px 1px 0px #FFF; + opacity: 0.2; +} + +.modal-title { + margin: 0px !important; + line-height: 1.42857 !important; +} + +.modal-body { + position: relative; + padding: 15px; +} + +.modal-footer { + padding: 15px; + text-align: right; + border-top: 1px solid #E5E5E5; +} + + +/* Bootstrap modal override */ +.modal-title { + font-family: 'open_sansregular', Arial, Helvetica, sans-serif; +} + +.modal-header h4 { + color: #333 !important; + font-size: 17px !important; +} + +.modal-body { + overflow: hidden; +} + +/* Bootstrap modal form fields */ +.modal, +.modal input, +.modal select, +.modal .formlabel { + font-family: 'open_sansregular', Arial, Helvetica, sans-serif; + color: #333; + font-style: normal; +} + +.modal label { + margin-left: 4px; +} + +.modal .sisp-fields label { + margin-left: 0px; +} + +.modal h2 { + margin-top: 0px !important; +} + +.modal .form-description { + border-bottom: 1px solid #E5E5E5; + padding-bottom: 15px; + overflow: hidden; +} + +.modal .formfieldline { + padding: 0px; + margin: 0px; +} + +.modal input[type="text"], +.modal select { + padding: 10px; + border-radius: 5px; + border: solid 1px #ccc; + background-color: #fff; +} + +.modal input[type="radio"] { + vertical-align: middle; +} + +.modal .explanation { + color: #3F60C6; + font-size: 12px; +} + +.modal .required-field, .modal .errorExplanation { + color: #EA1C00; + font-size:12px; +} + +.modal .spb-row { + margin-top: 15px; +} + +.no-margin-top { + margin-top: 0px !important; +} + +.modal .modal-margin-right { + margin-right: 4%; +} + +.modal .modal-margin-left { + margin-left: 4%; +} + +.modal #community_name { + width: 200px; +} + +.modal #institutions_corporate_name { + width: 285px; +} + +.modal #community_country { + width: 220px; +} + +.modal #community_state { + width: 80px; +} + +.modal #community_city { + width: 190px; + margin-top: 2px; +} + +.modal #institutions_cnpj, +.modal #institutions_acronym { + width: 530px; +} + +.modal a.button.with-text.icon-add, +.modal a.button.with-text.icon-cancel { + line-height: 25px !important; + padding: 5px 15px !important; + font-size: 12px !important; +} + +.modal a.button.with-text.icon-add { + background-color: #3E67B1 !important; + color: #fff !important; +} + +.modal .public-institutions-fields { + display: none; +} + +.modal .modal-form-actions { + margin-top: 20px; +} + +/* New rating page */ +.rating-create-institution-container { + overflow: hidden; +} + +.rating-create-institution-container > .institution-not-found { + line-height: 30px; +} + +.rating-create-institution-container .institution-not-found { + position: relative; + float: left; +} + +.rating-create-institution-container #institution_modal_container { + position: relative; + float: left; +} + +.rating-create-institution-container #create_institution_link { + background-color: #3E67B1 !important; + color: #FFF !important; + text-transform: none !important; +} + diff --git a/src/noosfero-spb/noosfero-spb-theme/css/spb-grid.css b/src/noosfero-spb/noosfero-spb-theme/css/spb-grid.css new file mode 100644 index 0000000..c162d87 --- /dev/null +++ b/src/noosfero-spb/noosfero-spb-theme/css/spb-grid.css @@ -0,0 +1,76 @@ +.spb-row, +.spb-col { + box-sizing: border-box; +} + +.spb-row:before, +.spb-row:after { + content: ""; + display: table; +} + +.spb-row:after { + clear: both; +} + +.spb-col { + position: relative; + float: left; +} + +.spb-col { + margin-right: 1.6%; +} +.spb-col:last-child { + margin-right: 0%; +} + + +.spb-col-1 { + width: 6.86666666667%; +} + +.spb-col-2 { + width: 15.3333333333%; +} + +.spb-col-3 { + width: 23.8%; +} + +.spb-col-4 { + width: 32.2666666667%; +} + +.spb-col-5 { + width: 40.7333333333%; +} + +.spb-col-6 { + width: 49.2%; +} + +.spb-col-7 { + width: 57.6666666667%; +} + +.spb-col-8 { + width: 66.1333333333%; +} + +.spb-col-9 { + width: 74.6%; +} + +.spb-col-10 { + width: 83.0666666667%; +} + +.spb-col-11 { + width: 91.5333333333%; +} + +.spb-col-12 { + width: 100%; +} + diff --git a/src/noosfero-spb/noosfero-spb-theme/css/use-report.css b/src/noosfero-spb/noosfero-spb-theme/css/use-report.css index cd1fe8b..b7b56d1 100644 --- a/src/noosfero-spb/noosfero-spb-theme/css/use-report.css +++ b/src/noosfero-spb/noosfero-spb-theme/css/use-report.css @@ -239,7 +239,7 @@ #content .star-rate-form .star-comment-container .comments-software-extra-fields { height: 0; - overflow: hidden; + overflow: initial; } #content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments { @@ -248,11 +248,11 @@ height: 50px; } -#content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments label { +#content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments > label { font-size: 12px; } -#content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments input { +#content .star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments > input { display: block; height: 19px; width: 335px; diff --git a/src/noosfero-spb/noosfero-spb-theme/style.css b/src/noosfero-spb/noosfero-spb-theme/style.css index 1f00af6..ace6792 100644 --- a/src/noosfero-spb/noosfero-spb-theme/style.css +++ b/src/noosfero-spb/noosfero-spb-theme/style.css @@ -9,6 +9,7 @@ /*** SPB Theme section styles ***/ @import url(css/overwriting-base-theme.css); +@import url(css/spb-grid.css); @import url(css/header.css); @import url(css/footer.css); @import url(css/left-bar.css); @@ -26,6 +27,7 @@ @import url(css/tooltip.css); @import url(css/popover.css); @import url(css/notifications.css); +@import url(css/modal.css); @font-face{ font-weight: normal; diff --git a/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb b/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb index e87447b..12e1897 100644 --- a/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb +++ b/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb @@ -18,6 +18,28 @@ Given /^SoftwareInfo has initial default values on database$/ do OperatingSystemName.create(:name=>"CentOS") end +Given /^Institutions has initial default values on database$/ do + GovernmentalPower.create(:name => "Executivo") + GovernmentalPower.create(:name => "Legislativo") + GovernmentalPower.create(:name => "Judiciario") + + GovernmentalSphere.create(:name => "Federal") + + JuridicalNature.create(:name => "Autarquia") + JuridicalNature.create(:name => "Administracao Direta") + JuridicalNature.create(:name => "Empresa Publica") + JuridicalNature.create(:name => "Fundacao") + JuridicalNature.create(:name => "Orgao Autonomo") + JuridicalNature.create(:name => "Sociedade") + JuridicalNature.create(:name => "Sociedade Civil") + JuridicalNature.create(:name => "Sociedade de Economia Mista") + + national_region = NationalRegion.new + national_region.name = "Distrito Federal" + national_region.national_region_code = '35' + national_region.national_region_type_id = NationalRegionType::STATE + national_region.save +end Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*)"$/ do |typed, input_field_selector, should_select| # Wait the page javascript load @@ -42,6 +64,27 @@ Given /^I type in "([^"]*)" in autocomplete list "([^"]*)" and I choose "([^"]*) sleep 1 end +Given /^the following public institutions?$/ do |table| + # table is a Cucumber::Ast::Table + table.hashes.each do |item| + community = Community.new + community.name = item[:name] + community.country = item[:country] + community.state = item[:state] + community.city = item[:city] + community.save! + + governmental_power = GovernmentalPower.where(:name => item[:governmental_power]).first + governmental_sphere = GovernmentalSphere.where(:name => item[:governmental_sphere]).first + + juridical_nature = JuridicalNature.create(:name => item[:juridical_nature]) + + institution = PublicInstitution.new(:name => item[:name], :type => "PublicInstitution", :acronym => item[:acronym], :cnpj => item[:cnpj], :juridical_nature => juridical_nature, :governmental_power => governmental_power, :governmental_sphere => governmental_sphere) + institution.community = community + institution.corporate_name = item[:corporate_name] + institution.save! + end +end Given /^the following software language$/ do |table| table.hashes.each do |item| diff --git a/src/noosfero-spb/software_communities/public/style.css b/src/noosfero-spb/software_communities/public/style.css index 5d4c536..2711d26 100644 --- a/src/noosfero-spb/software_communities/public/style.css +++ b/src/noosfero-spb/software_communities/public/style.css @@ -110,3 +110,7 @@ cursor: pointer; } +.extra-fields-container { + overflow: auto; +} + diff --git a/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb b/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb index f50992a..bad694c 100644 --- a/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb +++ b/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb @@ -7,15 +7,18 @@
    -
    - <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%> - - <%= text_field_tag "organization_rating[people_benefited]", "" %> -
    -
    - <%= label_tag "comments_saved_value", _("Saved resources")%> - - <%= text_field_tag "organization_rating[saved_value]", "", :placeholder=>"R$"%> +
    +
    + <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%> + + <%= text_field_tag "organization_rating[people_benefited]", "" %> +
    + +
    + <%= label_tag "comments_saved_value", _("Saved resources")%> + + <%= text_field_tag "organization_rating[saved_value]", "", :placeholder=>"R$"%> +
    -- libgit2 0.21.2