Commit 0573a0771e43fca4e95f5aeb7cd809e7738acbd2

Authored by Gabriela Navarro
Committed by Fabio Teixeira
1 parent bd7dc727
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fix order of the fields

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 1 changed file with 13 additions and 13 deletions   Show diff stats
views/gov_user_plugin/_institution.html.erb
@@ -29,14 +29,14 @@ @@ -29,14 +29,14 @@
29 <%= fields_for :institutions do |inst| %> 29 <%= fields_for :institutions do |inst| %>
30 <span class=''> 30 <span class=''>
31 <div class='formfield type-radio'> 31 <div class='formfield type-radio'>
32 - <label> <%= _("Public Institution") %>  
33 - <%= radio_button_tag("institutions[type]", "PublicInstitution") %>  
34 - </label>  
35 -  
36 <label> 32 <label>
37 <%= _("Private Institution") %> 33 <%= _("Private Institution") %>
38 <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", true)%> 34 <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", true)%>
39 </label> 35 </label>
  36 +
  37 + <label> <%= _("Public Institution") %>
  38 + <%= radio_button_tag("institutions[type]", "PublicInstitution") %>
  39 + </label>
40 </div> 40 </div>
41 </span> 41 </span>
42 42
@@ -50,6 +50,15 @@ @@ -50,6 +50,15 @@
50 </div> 50 </div>
51 </span> 51 </span>
52 52
  53 + <span class='optional-field'>
  54 + <div class="formfield type-text">
  55 + <%= hidden_field_tag "acronym_translate", _("Acronym") %>
  56 + <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %>
  57 + <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %>
  58 + <%= inst.text_field(:acronym) %>
  59 + </div>
  60 + </span>
  61 +
53 <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}) %> 62 <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}) %>
54 63
55 <span class='required-field'> 64 <span class='required-field'>
@@ -69,15 +78,6 @@ @@ -69,15 +78,6 @@
69 </div> 78 </div>
70 </span> 79 </span>
71 80
72 - <span class='optional-field'>  
73 - <div class="formfield type-text">  
74 - <%= hidden_field_tag "acronym_translate", _("Acronym") %>  
75 - <%= hidden_field_tag "fantasy_name_translate", _("Fantasy name") %>  
76 - <%= inst.label("acronym" ,_("Acronym"), :class=>"formlabel") %>  
77 - <%= inst.text_field(:acronym) %>  
78 - </div>  
79 - </span>  
80 -  
81 <span class='required-field public-institutions-fields'> 81 <span class='required-field public-institutions-fields'>
82 <div class="formfield type-text"> 82 <div class="formfield type-text">
83 <%= inst.label("governmental_sphere_id" ,_("Governmental Sphere:"), :class=>"formlabel") %> 83 <%= inst.label("governmental_sphere_id" ,_("Governmental Sphere:"), :class=>"formlabel") %>