Commit 69dbec02142dfce5cc9b8e38ca640755469eff0e
Exists in
master
and in
5 other branches
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
| @@ -81,9 +81,10 @@ class SoftwareInfo < ActiveRecord::Base | @@ -81,9 +81,10 @@ class SoftwareInfo < ActiveRecord::Base | ||
| 81 | 81 | ||
| 82 | has_one :software_categories | 82 | has_one :software_categories |
| 83 | 83 | ||
| 84 | - validates_length_of :finality, :maximum => 140 | 84 | + validates_length_of :finality, :maximum => 120 |
| 85 | validates_length_of :objectives, :maximum => 4000 | 85 | validates_length_of :objectives, :maximum => 4000 |
| 86 | validates_length_of :features, :maximum => 4000 | 86 | validates_length_of :features, :maximum => 4000 |
| 87 | + validates_presence_of :finality | ||
| 87 | 88 | ||
| 88 | validate :validate_acronym | 89 | validate :validate_acronym |
| 89 | 90 |
public/mpog-software-validations.js
| @@ -170,6 +170,19 @@ | @@ -170,6 +170,19 @@ | ||
| 170 | database_autocomplete(); | 170 | database_autocomplete(); |
| 171 | language_autocomplete(); | 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 | $(".new-dynamic-table").click(function(){ | 186 | $(".new-dynamic-table").click(function(){ |
| 174 | var link = $(this); | 187 | var link = $(this); |
| 175 | 188 |
views/software_communities_plugin_myprofile/new_software.html.erb
| 1 | <%= stylesheet_link_tag('plugins/software_communities/mpog-software') %> | 1 | <%= stylesheet_link_tag('plugins/software_communities/mpog-software') %> |
| 2 | 2 | ||
| 3 | <div class="software-step-info"> | 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 | </div> | 13 | </div> |
| 6 | 14 | ||
| 7 | <h1><%= _('Creating new software') %></h1> | 15 | <h1><%= _('Creating new software') %></h1> |
| @@ -29,8 +37,14 @@ | @@ -29,8 +37,14 @@ | ||
| 29 | <%= required_fields_message %> | 37 | <%= required_fields_message %> |
| 30 | 38 | ||
| 31 | <%= label("name", _('Name'), {:class => 'formlabel mandatory'}) %> | 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 | <div id='software-name-field' class='formfield'> | 46 | <div id='software-name-field' class='formfield'> |
| 47 | + | ||
| 34 | <span id='software-hostname'><%= environment.default_hostname %>/</span> | 48 | <span id='software-hostname'><%= environment.default_hostname %>/</span> |
| 35 | <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %> | 49 | <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %> |
| 36 | </div> | 50 | </div> |
| @@ -38,7 +52,7 @@ | @@ -38,7 +52,7 @@ | ||
| 38 | <%= fields_for @software_info do |swf| %> | 52 | <%= fields_for @software_info do |swf| %> |
| 39 | <div class="formfield type-text"> | 53 | <div class="formfield type-text"> |
| 40 | <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %> | 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 | </div> | 56 | </div> |
| 43 | <% end %> | 57 | <% end %> |
| 44 | 58 |