diff --git a/public/mpog-software.css b/public/mpog-software.css
deleted file mode 100644
index 10f8142..0000000
--- a/public/mpog-software.css
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#software-name-field
-{
-  padding-bottom: 10px;
-}
-
-#software-hostname
-{
-  float: left;
-  display: inline-block;
-  vertical-align: middle;
-
-  background: #EEE;
-  border: 1px solid #CFCFCF;
-
-  line-height: 22px;
-  padding: 0px 7px;
-  color: #4A4A4A;
-  font-size: 20px;
-  text-transform: lowercase;
-  min-width: 190px;
-  border-spacing: 20px;
-}
\ No newline at end of file
diff --git a/public/style.css b/public/style.css
index 0cb4796..7f5becf 100644
--- a/public/style.css
+++ b/public/style.css
@@ -126,4 +126,27 @@
 #profile-data .validated {
   box-shadow: 0px 0px 7px green;
   border-color: rgb(0, 80, 0)
-}
\ No newline at end of file
+}
+
+#software-name-field
+{
+  padding-bottom: 10px;
+}
+
+#software-hostname
+{
+  float: left;
+  display: inline-block;
+  vertical-align: middle;
+
+  background: #EEE;
+  border: 1px solid #CFCFCF;
+
+  line-height: 22px;
+  padding: 0px 7px;
+  color: #4A4A4A;
+  font-size: 20px;
+  text-transform: lowercase;
+  min-width: 190px;
+  border-spacing: 20px;
+}
diff --git a/views/_main_software_editor_extras.html.erb b/views/_main_software_editor_extras.html.erb
new file mode 100644
index 0000000..32a40e4
--- /dev/null
+++ b/views/_main_software_editor_extras.html.erb
@@ -0,0 +1,28 @@
+<h2><%= _('Software Information') %></h2>
+
+<%= label_tag("name", _('Name'), {:class => 'formlabel'}) %>
+
+<div id='software-name-field' class='formfield'>
+  <span id='software-hostname'><%= context.profile.environment.default_hostname %>/</span>
+  <%= text_field_tag(:name, context.profile.software_info.community.name) %>
+</div>
+    
+<h3> <%= _("Finality") %> </h3>
+<div id="finality"> 
+  <%= text_field_tag(:finality, context.profile.software_info.finality) %>
+</div>
+
+<h3> <%= _("Licenses") %> </h3>
+<div id='licenses'>
+  <%= select_tag(:version, options_for_select(LicenseHelper.getListLicenses.collect{|l| [l.version, l.id]}, :selected => context.profile.software_info.license_info.id), :onchange => "get_license_link('version')") %>
+  <br />
+
+  <h4> <%= _("License link") %> </h4>
+  <% LicenseHelper.getListLicenses.each do | license |  %>
+    <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
+  <% end %>
+
+  <a id = "version_link" href="<%= context.profile.software_info.license_info.link %>" target="BLANK"> <%= context.profile.software_info.license_info.link %> </a>
+</div>
+
+
diff --git a/views/_public_software_info.html.erb b/views/_public_software_info.html.erb
new file mode 100644
index 0000000..c30ec8d
--- /dev/null
+++ b/views/_public_software_info.html.erb
@@ -0,0 +1,252 @@
+<%= javascript_include_tag "mpog-validations" %>
+
+<h1><%= _('Edit  software') %></h1>
+
+<% unless @errors.blank? %>
+<div class="errorExplanation" id="errorExplanation">
+  <h2> <%= _("Can`t edit software: #{@errors.length} errors") %> </h2>
+  <ul>
+  <% @errors.each do |error| %>
+    <li> <%= error %> </li>
+  <% end %>
+  </ul>
+</div>
+<% end %>
+
+<div>
+  <%= labelled_form_for :community, :html => { :multipart => true } do |f| %>
+
+    <%= required_fields_message %>
+
+    <%= required f.text_field(:name) %>
+
+    <%= fields_for @software_info do |swf| %>
+      <div class="formfield type-text">
+        <%= swf.label("acronym" ,_("Acronym"), :class=>"formlabel") %>
+        <%= swf.text_field(:acronym) %>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label _("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)%>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label _("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)%>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label _("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)%>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label _("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)%>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label _("Internacionalizable ?") %>
+
+        <%= swf.label "intern_true", "Yes" %>
+        <%= swf.radio_button(:intern,true)%>
+        <%= swf.label "intern_false", "No"%>
+        <%= swf.radio_button(:intern,false)%>
+      <div class="formfieldline">
+        <%= swf.label "operating_platform", _("Operating Platform: ") %> <br />
+        <%= swf.text_area(:operating_platform, :class=>"expand-field") %>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label "objectives", _("Objectives: ")%><br />
+        <%= required swf.text_area(:objectives, :class=>"expand-field") %>
+      </div>
+
+      <div class="formfieldline">
+        <%= swf.label "features", _("Features: ")%><br />
+        <%= required swf.text_area(:features, :class=>"expand-field") %>
+      </div>
+
+      <div class="formfieldline formfield type-text">
+        <%= swf.label "demonstration_url", _("Demonstration URL: ") %>
+        <%= swf.text_field(:demonstration_url) %>
+      </div>
+    <% end %>
+
+   <div class="formfieldline">
+      <%= 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}) %>
+    </div>
+
+  <div id='libraries_fields'>
+    <h4> <%= _("Libraries") %> </h4>
+    <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
+  </div>
+  <br />
+
+  <div id='operating_system_fields'>
+    <h4> <%= _("Operating Systems") %> </h4>
+    <% 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} %>
+  </div>
+  <br />
+
+  <%=  fields_for @license_info do |lcv| %>
+    <div class="formfieldline">
+      <h4> <%= lcv.label _("License Version: ") %> </h4>
+        <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %>
+
+      <h4> <%= _("License link") %> </h4>
+      <% LicenseHelper.getListLicenses.each do | license |  %>
+        <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
+      <% end %>
+      <a id = "version_link" href="<%= LicenseInfo.first.link %>" target="_BLANK"> <%=LicenseInfo.first.link %> </a>
+
+    </div>
+  <% end %>
+
+  <br />
+  <div id='programming_languages_fields'>
+    <h4> <%= _("Programming languages") %> </h4>
+    <% 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 } %>
+  </div>
+
+  <br />
+  <div id='database_fields'>
+    <h4> <%= _("Databases") %> </h4>
+    <% 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 } %>
+  </div>
+
+  <%= fields_for @software_categories do |cv| %>
+  <div id="software_categories_fields">
+    <h4> <%= _("Software Categories:") %> </h4>
+
+    <%= cv.check_box :administration %>
+    <%= cv.label :administration, _("Administration") %><br />
+
+    <%= cv.check_box :agriculture %>
+    <%= cv.label :agriculture, _("Agriculture") %><br />
+
+    <%= cv.check_box :business_and_services %>
+    <%= cv.label :business_and_services, _("Business_and Services") %><br />
+
+    <%= cv.check_box :communication %>
+    <%= cv.label :communication, _("Communication") %><br />
+
+    <%= cv.check_box :culture %>
+    <%= cv.label :culture, _("Culture") %><br />
+
+    <%= cv.check_box :national_defense %>
+    <%= cv.label :national_defense, _("National Defense") %><br />
+
+    <%= cv.check_box :economy_and_finances %>
+    <%= cv.label :economy_and_finances, _("Economy and Finances") %><br />
+
+    <%= cv.check_box :education %>
+    <%= cv.label :education, _("Education") %><br />
+
+    <%= cv.check_box :energy %>
+    <%= cv.label :energy, _("Energy") %><br />
+
+    <%= cv.check_box :sports %>
+    <%= cv.label :sports, _("Sports") %><br />
+
+    <%= cv.check_box :habitation %>
+    <%= cv.label :habitation, _("Habitation") %><br />
+
+    <%= cv.check_box :industry %>
+    <%= cv.label :industry, _("Industry") %><br />
+
+    <%= cv.check_box :environment %>
+    <%= cv.label :environment, _("Environment") %><br />
+
+    <%= cv.check_box :research_and_development %>
+    <%= cv.label :research_and_development, _("Research and Development") %><br />
+
+    <%= cv.check_box :social_security %>
+    <%= cv.label :social_security, _("Social Security") %><br />
+
+    <%= cv.check_box :social_protection %>
+    <%= cv.label :social_protection, _("Social Protection") %><br />
+
+    <%= cv.check_box :sanitation %>
+    <%= cv.label :sanitation, _("Sanitation") %><br />
+
+    <%= cv.check_box :health %>
+    <%= cv.label :health, _("Health") %><br />
+
+    <%= cv.check_box :security_public_order %>
+    <%= cv.label :security_public_order, _("Security and Public Order") %><br />
+
+    <%= cv.check_box :work %>
+    <%= cv.label :work, _("Work") %><br />
+
+    <%= cv.check_box :transportation %>
+    <%= cv.label :transportation, _("Transportation") %><br />
+
+    <%= cv.check_box :urbanism %>
+    <%= cv.label :urbanism, _("Urbanism") %><br />
+  </div>
+  <% 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 %>
+
+    <div style='margin-bottom: 1em; margin-top: 1em;'>
+      <%= _('New members must be approved:')%>
+    </div>
+    <div style='margin-bottom: 0.5em' id='community-join-before'>
+      <%= radio_button 'community', 'closed', 'true', :style => 'float: left' %>
+      <div style='margin-left: 30px'>
+        <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %>
+      </div>
+    </div>
+    <div id='community-join-after'>
+      <%= radio_button 'community', 'closed', 'false', :style => 'float: left' %>
+      <div style='margin-left: 30px'>
+        <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
+      </div>
+    </div>
+
+    <%= 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 %>
+
+</div>
diff --git a/views/mpog_software_plugin_myprofile/public_software_info.html.erb b/views/mpog_software_plugin_myprofile/public_software_info.html.erb
deleted file mode 100644
index 921fb77..0000000
--- a/views/mpog_software_plugin_myprofile/public_software_info.html.erb
+++ /dev/null
@@ -1,258 +0,0 @@
-<%= javascript_include_tag "mpog-validations" %>
-
-<h1><%= _('Creating new software') %></h1>
-
-<% if environment.enabled?('admin_must_approve_new_communities') %>
-  <div class='explanation'>
-    <%= _("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 }%>
-  </div>
-<%end %>
-
-<% unless @errors.blank? %>
-<div class="errorExplanation" id="errorExplanation">
-  <h2> <%= _("Can`t create new software: #{@errors.length} errors") %> </h2>
-  <ul>
-  <% @errors.each do |error| %>
-    <li> <%= error %> </li>
-  <% end %>
-  </ul>
-</div>
-<% end %>
-
-<div>
-  <%= labelled_form_for :community, :html => { :multipart => true } do |f| %>
-
-    <%= required_fields_message %>
-
-    <%= required f.text_field(:name) %>
-
-    <%= fields_for @software_info do |swf| %>
-      <div class="formfield type-text">
-        <%= swf.label("acronym" ,_("Acronym"), :class=>"formlabel") %>
-        <%= swf.text_field(:acronym) %>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label _("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)%>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label _("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)%>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label _("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)%>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label _("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)%>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label _("Internacionalizable ?") %>
-
-        <%= swf.label "intern_true", "Yes" %>
-        <%= swf.radio_button(:intern,true)%>
-        <%= swf.label "intern_false", "No"%>
-        <%= swf.radio_button(:intern,false)%>
-      <div class="formfieldline">
-        <%= swf.label "operating_platform", _("Operating Platform: ") %> <br />
-        <%= swf.text_area(:operating_platform, :class=>"expand-field") %>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label "objectives", _("Objectives: ")%><br />
-        <%= required swf.text_area(:objectives, :class=>"expand-field") %>
-      </div>
-
-      <div class="formfieldline">
-        <%= swf.label "features", _("Features: ")%><br />
-        <%= required swf.text_area(:features, :class=>"expand-field") %>
-      </div>
-
-      <div class="formfieldline formfield type-text">
-        <%= swf.label "demonstration_url", _("Demonstration URL: ") %>
-        <%= swf.text_field(:demonstration_url) %>
-      </div>
-    <% end %>
-
-   <div class="formfieldline">
-      <%= 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}) %>
-    </div>
-
-  <div id='libraries_fields'>
-    <h4> <%= _("Libraries") %> </h4>
-    <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
-  </div>
-  <br />
-
-  <div id='operating_system_fields'>
-    <h4> <%= _("Operating Systems") %> </h4>
-    <% 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} %>
-  </div>
-  <br />
-
-  <%=  fields_for @license_info do |lcv| %>
-    <div class="formfieldline">
-      <h4> <%= lcv.label _("License Version: ") %> </h4>
-        <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %>
-
-      <h4> <%= _("License link") %> </h4>
-      <% LicenseHelper.getListLicenses.each do | license |  %>
-        <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
-      <% end %>
-      <a id = "version_link" href="<%= LicenseInfo.first.link %>" target="_BLANK"> <%=LicenseInfo.first.link %> </a>
-
-    </div>
-  <% end %>
-
-  <br />
-  <div id='programming_languages_fields'>
-    <h4> <%= _("Programming languages") %> </h4>
-    <% 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 } %>
-  </div>
-
-  <br />
-  <div id='database_fields'>
-    <h4> <%= _("Databases") %> </h4>
-    <% 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 } %>
-  </div>
-
-  <%= fields_for @software_categories do |cv| %>
-  <div id="software_categories_fields">
-    <h4> <%= _("Software Categories:") %> </h4>
-
-    <%= cv.check_box :administration %>
-    <%= cv.label :administration, _("Administration") %><br />
-
-    <%= cv.check_box :agriculture %>
-    <%= cv.label :agriculture, _("Agriculture") %><br />
-
-    <%= cv.check_box :business_and_services %>
-    <%= cv.label :business_and_services, _("Business_and Services") %><br />
-
-    <%= cv.check_box :communication %>
-    <%= cv.label :communication, _("Communication") %><br />
-
-    <%= cv.check_box :culture %>
-    <%= cv.label :culture, _("Culture") %><br />
-
-    <%= cv.check_box :national_defense %>
-    <%= cv.label :national_defense, _("National Defense") %><br />
-
-    <%= cv.check_box :economy_and_finances %>
-    <%= cv.label :economy_and_finances, _("Economy and Finances") %><br />
-
-    <%= cv.check_box :education %>
-    <%= cv.label :education, _("Education") %><br />
-
-    <%= cv.check_box :energy %>
-    <%= cv.label :energy, _("Energy") %><br />
-
-    <%= cv.check_box :sports %>
-    <%= cv.label :sports, _("Sports") %><br />
-
-    <%= cv.check_box :habitation %>
-    <%= cv.label :habitation, _("Habitation") %><br />
-
-    <%= cv.check_box :industry %>
-    <%= cv.label :industry, _("Industry") %><br />
-
-    <%= cv.check_box :environment %>
-    <%= cv.label :environment, _("Environment") %><br />
-
-    <%= cv.check_box :research_and_development %>
-    <%= cv.label :research_and_development, _("Research and Development") %><br />
-
-    <%= cv.check_box :social_security %>
-    <%= cv.label :social_security, _("Social Security") %><br />
-
-    <%= cv.check_box :social_protection %>
-    <%= cv.label :social_protection, _("Social Protection") %><br />
-
-    <%= cv.check_box :sanitation %>
-    <%= cv.label :sanitation, _("Sanitation") %><br />
-
-    <%= cv.check_box :health %>
-    <%= cv.label :health, _("Health") %><br />
-
-    <%= cv.check_box :security_public_order %>
-    <%= cv.label :security_public_order, _("Security and Public Order") %><br />
-
-    <%= cv.check_box :work %>
-    <%= cv.label :work, _("Work") %><br />
-
-    <%= cv.check_box :transportation %>
-    <%= cv.label :transportation, _("Transportation") %><br />
-
-    <%= cv.check_box :urbanism %>
-    <%= cv.label :urbanism, _("Urbanism") %><br />
-  </div>
-  <% 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 %>
-
-    <div style='margin-bottom: 1em; margin-top: 1em;'>
-      <%= _('New members must be approved:')%>
-    </div>
-    <div style='margin-bottom: 0.5em' id='community-join-before'>
-      <%= radio_button 'community', 'closed', 'true', :style => 'float: left' %>
-      <div style='margin-left: 30px'>
-        <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %>
-      </div>
-    </div>
-    <div id='community-join-after'>
-      <%= radio_button 'community', 'closed', 'false', :style => 'float: left' %>
-      <div style='margin-left: 30px'>
-        <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
-      </div>
-    </div>
-
-    <%= 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 %>
-
-</div>
diff --git a/views/software_editor_extras.html.erb b/views/software_editor_extras.html.erb
deleted file mode 100644
index d44352d..0000000
--- a/views/software_editor_extras.html.erb
+++ /dev/null
@@ -1,153 +0,0 @@
-<h2><%= _('Software Information') %></h2>
-
-<div class="formfieldline formfield type-text">
-  <%= labelled_text_field(_("Acronym"), 'software_info[acronym]', context.profile.software_info.acronym) %>
-</div>
-
-<div class="formfieldline">
-  <%= _("Adherent to e-PING?") %>
-  <%= labelled_radio_button(_('Yes'), 'software_info[e_ping]', 'true', context.profile.software_info.e_ping)%>
-  <%= labelled_radio_button(_('No'), 'software_info[e_ping]', 'false', !context.profile.software_info.e_ping)%>
-</div>
-<div class="formfieldline">
-  <%= _("Adherent to e-MAG?") %>
-  <%= labelled_radio_button(_('Yes'), 'software_info[e_mag]', 'true', context.profile.software_info.e_mag)%>
-  <%= labelled_radio_button(_('No'), 'software_info[e_mag]', 'false', !context.profile.software_info.e_mag)%>
-</div>
-<div class="formfieldline">
-  <%= _("Adherent to ICP-Brasil?") %>
-  <%= labelled_radio_button(_('Yes'), 'software_info[icp_brasil]', 'true', context.profile.software_info.icp_brasil)%>
-  <%= labelled_radio_button(_('No'), 'software_info[icp_brasil]', 'false', !context.profile.software_info.icp_brasil)%>
-</div>
-<div class="formfieldline">
-  <%= _("Adherent to e-ARQ?") %>
-  <%= labelled_radio_button(_('Yes'), 'software_info[e_arq]', 'true', context.profile.software_info.e_arq)%>
-  <%= labelled_radio_button(_('No'), 'software_info[e_arq]', 'false', !context.profile.software_info.e_arq)%>
-</div>
-<div class="formfieldline">
-  <%= _("Internacionalizable") %>
-  <%= labelled_radio_button(_('Yes'), 'software_info[intern]', 'true', context.profile.software_info.intern)%>
-  <%= labelled_radio_button(_('No'), 'software_info[intern]', 'false', !context.profile.software_info.intern)%>
-</div>
-
-<div class="formfieldline">
-  <%= label_tag('software_info[operating_platform]', 'Operating Platform:') %>
-  <br />
-  <%= text_area_tag('software_info[operating_platform]', context.profile.software_info.operating_platform, :size => '40x20', :class=>"expand-field") %>
-</div>
-
-<div class="formfieldline">
-  <%= label_tag('software_info[objectives]', 'Objectives:') %>
-  <br />
-  <%= text_area_tag('software_info[objectives]', context.profile.software_info.objectives, :size => '40x20', :class=>"expand-field") %>
-</div>
-
-<div class="formfieldline">
-  <%= label_tag('software_info[features]', 'Features:') %>
-  <br />
-  <%= text_area_tag('software_info[features]', context.profile.software_info.features, :size => '40x20', :class=>"expand-field") %>
-</div>
-
-<div class="formfieldline formfield type-text">
-  <%= labelled_text_field('Demonstration URL', 'software_info[demonstration_url]', context.profile.software_info.demonstration_url) %>
-</div>
-
-<h3> <%= _("Licenses") %> </h3>
-<div id='licenses'>
-  <%= select_tag(:version, options_for_select(LicenseHelper.getListLicenses.collect{|l| [l.version, l.id]}, :selected => context.profile.software_info.license_info.id), :onchange => "get_license_link('version')") %>
-  <br />
-
-  <h4> <%= _("License link") %> </h4>
-  <% LicenseHelper.getListLicenses.each do | license |  %>
-    <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
-  <% end %>
-
-  <a id = "version_link" href="<%= context.profile.software_info.license_info.link %>" target="BLANK"> <%= context.profile.software_info.license_info.link %> </a>
-</div>
-
-<h3> <%= _("Libraries") %> </h3>
-<div id='libraries'>
-  <% LibraryHelper.library_as_tables(context.profile.software_info.libraries).each do |tab| %>
-      <%= tab.call %>
-  <%end%>
-</div>
-
-<div id='table_structure_libraries' style="display:none"><%= LibraryHelper.add_dynamic_table %></div>
-<%= link_to _('New Library'), "#", :class=>"button icon-add with-text new-dynamic-table dynamic-libraries"%>
-
-<h3> <%= _("Programming Languages") %> </h3>
-<div id='languages'>
-  <% SoftwareLanguageHelper.language_as_tables(context.profile.software_info.software_languages).each do |tab| %>
-      <%= tab.call %>
-  <%end%>
-</div>
-
-<div id='table_structure_languages' style="display:none"><%= SoftwareLanguageHelper.add_dynamic_table %></div>
-<%= link_to _('New language'), "#", :class=>"button icon-add with-text new-dynamic-table dynamic-languages"%>
-
-<h3> <%= _("Databases") %> </h3>
-<div id='databases'>
-  <% DatabaseHelper.database_as_tables(context.profile.software_info.software_databases).each do |tab| %>
-    <%= tab.call %>
-  <%end%>
-</div>
-
-<div id='table_structure_databases' style="display:none"><%= DatabaseHelper.add_dynamic_table %></div>
-<%= link_to _('New Database'), "#", :class=>"button icon-add with-text new-dynamic-table dynamic-databases"%>
-
-<div id="software_categories_fields">
-<h4> <%= _("Software Categories") %> </h4>
-
-    <%= labelled_check_box _("Administration"), "software_categories[administration]", "1", context.profile.software_info.software_categories.administration %> <br />
-
-    <%= labelled_check_box _("Agriculture"), "software_categories[agriculture]", "1", context.profile.software_info.software_categories.agriculture %> <br />
-
-    <%= labelled_check_box _("Business_and Services"), "software_categories[business_and_services]", "1", context.profile.software_info.software_categories.business_and_services %> <br />
-
-    <%= labelled_check_box  _("Communication"), "software_categories[communication]", "1", context.profile.software_info.software_categories.communication %> <br />
-
-    <%= labelled_check_box _("Culture"), "software_categories[culture]", "1", context.profile.software_info.software_categories.culture %> <br />
-
-    <%= labelled_check_box _("National Defense"), "software_categories[national_defense]", "1", context.profile.software_info.software_categories.national_defense %> <br />
-
-    <%= labelled_check_box _("Economy and Finances"), "software_categories[economy_and_finances]", "1", context.profile.software_info.software_categories.economy_and_finances %> <br />
-
-    <%= labelled_check_box _("Education"), "software_categories[education]", "1", context.profile.software_info.software_categories.education %> <br />
-
-    <%= labelled_check_box _("Energy"), "software_categories[energy]", "1", context.profile.software_info.software_categories.energy %> <br />
-
-    <%= labelled_check_box _("Sports"), "software_categories[sports]", "1", context.profile.software_info.software_categories.sports %> <br />
-
-    <%= labelled_check_box _("Habitation"), "software_categories[habitation]", "1", context.profile.software_info.software_categories.habitation %> <br />
-
-    <%= labelled_check_box  _("Industry"), "software_categories[industry]", "1", context.profile.software_info.software_categories.industry %> <br />
-
-    <%= labelled_check_box _("Environment"), "software_categories[environment]", "1", context.profile.software_info.software_categories.environment %> <br />
-
-    <%= labelled_check_box _("Research and Development"), "software_categories[research_and_development]", "1", context.profile.software_info.software_categories.research_and_development %> <br />
-
-    <%= labelled_check_box _("Social Security"), "software_categories[social_security]", "1", context.profile.software_info.software_categories.social_security %> <br />
-
-    <%= labelled_check_box _("Social Protection"), "software_categories[social_protection]", "1", context.profile.software_info.software_categories.social_protection %> <br />
-
-    <%= labelled_check_box _("Sanitation"), "software_categories[sanitation]", "1", context.profile.software_info.software_categories.sanitation %> <br />
-
-    <%= labelled_check_box _("Health"), "software_categories[health]", "1", context.profile.software_info.software_categories.health %> <br />
-
-    <%= labelled_check_box _("Security and Public Order"), "software_categories[security_public_order]", "1", context.profile.software_info.software_categories.security_public_order %> <br />
-
-    <%= labelled_check_box _("Work"), "software_categories[work]", "1", context.profile.software_info.software_categories.work %> <br />
-
-    <%= labelled_check_box _("Transportation"), "software_categories[transportation]", "1", context.profile.software_info.software_categories.transportation %> <br />
-
-    <%= labelled_check_box _("Urbanism"), "software_categories[urbanism]", "1", context.profile.software_info.software_categories.urbanism %> <br />
-</div>
-
-<h3> <%= _("Operating System") %> </h3>
-<div id='operating_system_fields'>
-  <% OperatingSystemHelper.operating_system_as_tables(context.profile.software_info.operating_systems).each do |tab| %>
-    <%= tab.call %>
-  <%end%>
-</div>
-<div id='table_structure_operating_system' style="display:none"><%= OperatingSystemHelper.add_dynamic_table %></div>
-<%= link_to _('New Operating System'), "#", :class=>"button icon-add with-text new-dynamic-table dynamic-operating_system"%>
--
libgit2 0.21.2