diff --git a/views/_main_software_editor_extras.html.erb b/views/_main_software_editor_extras.html.erb index 32a40e4..c3f1c3c 100644 --- a/views/_main_software_editor_extras.html.erb +++ b/views/_main_software_editor_extras.html.erb @@ -25,4 +25,8 @@ <%= context.profile.software_info.license_info.link %> +
+ <%= label_tag "repository_url", _("Link to Repository: ") %> + <%= text_field_tag(:reository_url) %> +
diff --git a/views/_public_software_info.html.erb b/views/_public_software_info.html.erb index c30ec8d..0acf778 100644 --- a/views/_public_software_info.html.erb +++ b/views/_public_software_info.html.erb @@ -1,252 +1,137 @@ -<%= javascript_include_tag "mpog-validations" %> -

<%= _('Edit software') %>

-<% unless @errors.blank? %> -
-

<%= _("Can`t edit software: #{@errors.length} errors") %>

- -
-<% end %> -
- <%= labelled_form_for :community, :html => { :multipart => true } do |f| %> - - <%= required_fields_message %> - - <%= required f.text_field(:name) %> - - <%= fields_for @software_info do |swf| %> -
- <%= swf.label("acronym" ,_("Acronym"), :class=>"formlabel") %> - <%= swf.text_field(:acronym) %> +
+ <%= label_tag("acronym" ,_("Acronym"), :class=>"formlabel") %> + <%= text_field_tag(:acronym) %>
- <%= swf.label _("Adherent to e-PING ?") %> + <%= label_tag _("Adherent to e-PING ?") %> - <%= swf.label "e_ping_true", "Yes" %> - <%= swf.radio_button(:e_ping,true)%> - <%= swf.label "e_ping_false", "No"%> - <%= swf.radio_button(:e_ping,false)%> + <%= label_tag "e_ping_true", "Yes" %> + <%= radio_button_tag(:e_ping,true)%> + <%= label_tag "e_ping_false", "No"%> + <%= radio_button_tag(:e_ping,false)%>
- <%= swf.label _("Adherent to e-MAG ?") %> + <%= label_tag _("Adherent to e-MAG ?") %> - <%= swf.label "e_mag_true", "Yes"%> - <%= swf.radio_button(:e_mag,true)%> - <%= swf.label "e_mag_false", "No"%> - <%= swf.radio_button(:e_mag,false)%> + <%= label_tag "e_mag_true", "Yes"%> + <%= radio_button_tag(:e_mag,true)%> + <%= label_tag "e_mag_false", "No"%> + <%= radio_button_tag(:e_mag,false)%>
- <%= swf.label _("Adherent to ICP-Brasil ?") %> + <%= label_tag _("Adherent to ICP-Brasil ?") %> - <%= swf.label "icp_brasil_true", "Yes"%> - <%= swf.radio_button(:icp_brasil,true)%> - <%= swf.label "icp_brasil_false", "No"%> - <%= swf.radio_button(:icp_brasil,false)%> + <%= label_tag "icp_brasil_true", "Yes"%> + <%= radio_button_tag(:icp_brasil,true)%> + <%= label_tag "icp_brasil_false", "No"%> + <%= radio_button_tag(:icp_brasil,false)%>
- <%= swf.label _("Adherent to e-ARQ ?") %> + <%= label_tag _("Adherent to e-ARQ ?") %> - <%= swf.label "e_arq_true", "Yes"%> - <%= swf.radio_button(:e_arq,true)%> - <%= swf.label "e_arq_false", "No"%> - <%= swf.radio_button(:e_arq,false)%> + <%= label_tag "e_arq_true", "Yes"%> + <%= radio_button_tag(:e_arq,true)%> + <%= label_tag "e_arq_false", "No"%> + <%= radio_button_tag(:e_arq,false)%>
- <%= swf.label _("Internacionalizable ?") %> + <%= label_tag _("Internacionalizable ?") %> - <%= swf.label "intern_true", "Yes" %> - <%= swf.radio_button(:intern,true)%> - <%= swf.label "intern_false", "No"%> - <%= swf.radio_button(:intern,false)%> + <%= label_tag "intern_true", "Yes" %> + <%= radio_button_tag(:intern,true)%> + <%= label_tag "intern_false", "No"%> + <%= radio_button_tag(:intern,false)%>
- <%= swf.label "operating_platform", _("Operating Platform: ") %>
- <%= swf.text_area(:operating_platform, :class=>"expand-field") %> + <%= label_tag "operating_platform", _("Operating Platform: ") %>
+ <%= text_area_tag :operating_platform %>
- <%= swf.label "objectives", _("Objectives: ")%>
- <%= required swf.text_area(:objectives, :class=>"expand-field") %> + <%= label_tag "objectives", _("Objectives: ")%>
+ <%= text_area_tag :objectives %>
- <%= swf.label "features", _("Features: ")%>
- <%= required swf.text_area(:features, :class=>"expand-field") %> + <%= label_tag "features", _("Features: ")%>
+ <%= text_area_tag :features %>
-
- <%= swf.label "demonstration_url", _("Demonstration URL: ") %> - <%= swf.text_field(:demonstration_url) %> -
- <% end %> - -
- <%= content_tag('label', _('Fill in the search field to add offerers for this Software'), :id => "text-input-search-offerers") %> - <%= token_input_field_tag(:q, 'search-offerers', {:action => 'search_offerers'}, { :focus => true, :hint_text => _('Type in a search term for a person to be added as -offerers'), :pre_populate => @tokenized_children}) %> -
- -
-

<%= _("Libraries") %>

- <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %> -
-
- -
-

<%= _("Operating Systems") %>

- <% if @list_operating_systems.blank? %> - <%= OperatingSystemHelper.operating_system_as_tables(nil, false).call %> - <% end %> - <%= render :partial => 'operating_system_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %> -
-
- - <%= fields_for @license_info do |lcv| %> -
-

<%= lcv.label _("License Version: ") %>

- <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %> - -

<%= _("License link") %>

- <% LicenseHelper.getListLicenses.each do | license | %> - - <% end %> - <%=LicenseInfo.first.link %> - -
- <% end %> - -
-
-

<%= _("Programming languages") %>

- <% if @list_languages.blank? %> - <%= SoftwareLanguageHelper.language_as_tables(nil, false).call %> - <% end %> - - <%= render :partial => 'language_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :languages => @list_languages } %> -
- -
-
-

<%= _("Databases") %>

- <% if @list_databases.blank? %> - <%= DatabaseHelper.database_as_tables(nil, true).call %> - <% end %> - - <%= render :partial => 'database_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :database => @list_databases } %> -
- <%= fields_for @software_categories do |cv| %>

<%= _("Software Categories:") %>

- <%= cv.check_box :administration %> - <%= cv.label :administration, _("Administration") %>
+ <%= check_box_tag :administration %> + <%= label_tag :administration, _("Administration") %>
- <%= cv.check_box :agriculture %> - <%= cv.label :agriculture, _("Agriculture") %>
+ <%= check_box_tag :agriculture %> + <%= label_tag :agriculture, _("Agriculture") %>
- <%= cv.check_box :business_and_services %> - <%= cv.label :business_and_services, _("Business_and Services") %>
+ <%= check_box_tag :business_and_services %> + <%= label_tag :business_and_services, _("Business_and Services") %>
- <%= cv.check_box :communication %> - <%= cv.label :communication, _("Communication") %>
+ <%= check_box_tag :communication %> + <%= label_tag :communication, _("Communication") %>
- <%= cv.check_box :culture %> - <%= cv.label :culture, _("Culture") %>
+ <%= check_box_tag :culture %> + <%= label_tag :culture, _("Culture") %>
- <%= cv.check_box :national_defense %> - <%= cv.label :national_defense, _("National Defense") %>
+ <%= check_box_tag :national_defense %> + <%= label_tag :national_defense, _("National Defense") %>
- <%= cv.check_box :economy_and_finances %> - <%= cv.label :economy_and_finances, _("Economy and Finances") %>
+ <%= check_box_tag :economy_and_finances %> + <%= label_tag :economy_and_finances, _("Economy and Finances") %>
- <%= cv.check_box :education %> - <%= cv.label :education, _("Education") %>
+ <%= check_box_tag :education %> + <%= label_tag :education, _("Education") %>
- <%= cv.check_box :energy %> - <%= cv.label :energy, _("Energy") %>
+ <%= check_box_tag :energy %> + <%= label_tag :energy, _("Energy") %>
- <%= cv.check_box :sports %> - <%= cv.label :sports, _("Sports") %>
+ <%= check_box_tag :sports %> + <%= label_tag :sports, _("Sports") %>
- <%= cv.check_box :habitation %> - <%= cv.label :habitation, _("Habitation") %>
+ <%= check_box_tag :habitation %> + <%= label_tag :habitation, _("Habitation") %>
- <%= cv.check_box :industry %> - <%= cv.label :industry, _("Industry") %>
+ <%= check_box_tag :industry %> + <%= label_tag :industry, _("Industry") %>
- <%= cv.check_box :environment %> - <%= cv.label :environment, _("Environment") %>
+ <%= check_box_tag :environment %> + <%= label_tag :environment, _("Environment") %>
- <%= cv.check_box :research_and_development %> - <%= cv.label :research_and_development, _("Research and Development") %>
+ <%= check_box_tag :research_and_development %> + <%= label_tag :research_and_development, _("Research and Development") %>
- <%= cv.check_box :social_security %> - <%= cv.label :social_security, _("Social Security") %>
+ <%= check_box_tag :social_security %> + <%= label_tag :social_security, _("Social Security") %>
- <%= cv.check_box :social_protection %> - <%= cv.label :social_protection, _("Social Protection") %>
+ <%= check_box_tag :social_protection %> + <%= label_tag :social_protection, _("Social Protection") %>
- <%= cv.check_box :sanitation %> - <%= cv.label :sanitation, _("Sanitation") %>
+ <%= check_box_tag :sanitation %> + <%= label_tag :sanitation, _("Sanitation") %>
- <%= cv.check_box :health %> - <%= cv.label :health, _("Health") %>
+ <%= check_box_tag :health %> + <%= label_tag :health, _("Health") %>
- <%= cv.check_box :security_public_order %> - <%= cv.label :security_public_order, _("Security and Public Order") %>
+ <%= check_box_tag :security_public_order %> + <%= label_tag :security_public_order, _("Security and Public Order") %>
- <%= cv.check_box :work %> - <%= cv.label :work, _("Work") %>
+ <%= check_box_tag :work %> + <%= label_tag :work, _("Work") %>
- <%= cv.check_box :transportation %> - <%= cv.label :transportation, _("Transportation") %>
+ <%= check_box_tag :transportation %> + <%= label_tag :transportation, _("Transportation") %>
- <%= cv.check_box :urbanism %> - <%= cv.label :urbanism, _("Urbanism") %>
+ <%= check_box_tag :urbanism %> + <%= label_tag :urbanism, _("Urbanism") %>
- <% end %> - <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %> - - <%= f.fields_for :image_builder, @community.image do |i| %> - <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %> - <% end %> - -
- <%= _('New members must be approved:')%> -
-
- <%= radio_button 'community', 'closed', 'true', :style => 'float: left' %> -
- <%= _('Before joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %> -
-
-
- <%= radio_button 'community', 'closed', 'false', :style => 'float: left' %> -
- <%= _('After joining this group (a moderator can always desactivate access for users later).') %> -
-
- - <%= template_options(:communities, 'community')%> - - <%= hidden_field_tag('back_to', @back_to) %> - - <% button_bar do %> - <%= submit_button(:save, _('Create')) %> - <%= button(:cancel, _('Cancel'), @back_to ) %> - <% end %> - - <% end %> -
-- libgit2 0.21.2