Download as
Browse Code »

Commit 69dbec02142dfce5cc9b8e38ca640755469eff0e

Authored by Luciano Prestes
2 parents 52fbca4c 293e444a
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

Merge branch 'software_inprovement' into 'master' 

Software inprovement
Showing 3 changed files with 31 additions and 3 deletions   Show diff stats
lib/software_info.rb
  Diff comments   View file @69dbec0
... ... @@ -81,9 +81,10 @@ class SoftwareInfo < ActiveRecord::Base
81 81  
82 82 has_one :software_categories
83 83  
84   - validates_length_of :finality, :maximum => 140
  84 + validates_length_of :finality, :maximum => 120
85 85 validates_length_of :objectives, :maximum => 4000
86 86 validates_length_of :features, :maximum => 4000
  87 + validates_presence_of :finality
87 88  
88 89 validate :validate_acronym
89 90  
... ...
public/mpog-software-validations.js
  Diff comments   View file @69dbec0
... ... @@ -170,6 +170,19 @@
170 170 database_autocomplete();
171 171 language_autocomplete();
172 172  
  173 + $("#community_name_id").blur(function(){
  174 + var community_name = $("#community_name_id").val();
  175 + var domain = $("#software-hostname").text();
  176 +
  177 + var slug_name = community_name.replace(/\s+/g, '-').toLowerCase();
  178 +
  179 + var custom_domain = domain.concat('/');
  180 + custom_domain = domain.concat(slug_name);
  181 +
  182 + $("#community_name").val(slug_name);
  183 + $("#software_info_repository_link").val(custom_domain);
  184 + });
  185 +
173 186 $(".new-dynamic-table").click(function(){
174 187 var link = $(this);
175 188  
... ...
views/software_communities_plugin_myprofile/new_software.html.erb
  Diff comments   View file @69dbec0
1 1 <%= stylesheet_link_tag('plugins/software_communities/mpog-software') %>
2 2  
3 3 <div class="software-step-info">
4   - <h3><%= _("Step 1/2 - Software Creation")%></h3>
  4 + <h3><%= _("Step 1 - Software Creation")%></h3>
  5 + <h3 style="color: rgba(0, 0, 0, 0.2)"><%= _("Step 2 - Edit Community info ")%></h3>
  6 +
  7 + <p>
  8 + <spam class = 'software-message' >Enter the basic information about the software.<br>
  9 + You can add the details after you create it.
  10 + </spam>
  11 + </p>
  12 +
5 13 </div>
6 14  
7 15 <h1><%= _('Creating new software') %></h1>
... ... @@ -29,8 +37,14 @@
29 37 <%= required_fields_message %>
30 38  
31 39 <%= label("name", _('Name'), {:class => 'formlabel mandatory'}) %>
  40 + <%= required text_field(:community, :name, :size => 30, :maxlength => 100, :id => 'community_name_id') %>
32 41  
  42 + <br>
  43 + <br>
  44 +
  45 + <%= label("domain", _('Domain')) %>
33 46 <div id='software-name-field' class='formfield'>
  47 +
34 48 <span id='software-hostname'><%= environment.default_hostname %>/</span>
35 49 <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %>
36 50 </div>
... ... @@ -38,7 +52,7 @@
38 52 <%= fields_for @software_info do |swf| %>
39 53 <div class="formfield type-text">
40 54 <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %>
41   - <%= required swf.text_area(:finality, :placeholder => _("It is a software of..."), :cols => 40, :rows => 5, :maxlength => 140) %>
  55 + <%= required swf.text_area(:finality, :placeholder => _("What is the software?"), :cols => 40, :rows => 5, :maxlength => 140) %>
42 56 </div>
43 57 <% end %>
44 58  
... ...