Merge branch 'general_plugin_fix'

Arthur Esposte
2 parents 86c0d8d7 735e9bb0
Showing 14 changed files with 184 additions and 114 deletions Show diff stats
controllers/software_communities_plugin_myprofile_controller.rb
lib/software_communities_plugin.rb
public/initializer.js
public/style.css
public/views/new-community.js
public/views/new-software.js
views/blocks/download.html.erb
views/blocks/repository.html.erb
views/profile/_software_tab.html.erb
views/profile_editor/edit_software_community.html.erb
views/software_communities_plugin_myprofile/_main_software_editor_extras.html.erb
views/software_communities_plugin_myprofile/_public_software_info.html.erb
views/software_communities_plugin_myprofile/edit_software.html.erb
views/software_communities_plugin_myprofile/new_software.html.erb
@@ -27,6 +27,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
     end
     control_software_creation
+    update_new_software_errors
   end
   def search_offerers
@@ -60,6 +61,7 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
         session[:notice] = _('Software updated successfully')
       end
     rescue ActiveRecord::RecordInvalid => invalid
+      update_new_software_errors
       session[:notice] = _('Could not update software')
     end
   end
@@ -75,9 +77,9 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
   def add_software_erros
       @errors = []
-      @errors |= @community.errors.full_messages
-      @errors |= @software_info.errors.full_messages
-      @errors |= @license_info.errors.full_messages
+      @errors |= @community.errors.full_messages if @community
+      @errors |= @software_info.errors.full_messages if @software_info
+      @errors |= @license_info.errors.full_messages if @license_info
   end
   def control_software_creation
@@ -217,4 +219,20 @@ class SoftwareCommunitiesPluginMyprofileController &lt; MyProfileController
       end
     end
   end
+
+  def update_new_software_errors
+    if request.post?
+      @community.valid? if @community
+      @software_info.valid? if @software_info
+      @license_info.valid? if @license_info
+      add_software_erros
+    end
+
+
+    @error_community_name = @community.errors.include?(:name) ? "highlight-error" : "" if @community
+    @error_software_acronym = @software_info.errors.include?(:acronym) ? "highlight-error" : "" if @software_info
+    @error_software_domain = @community.errors.include?(:identifier) ? "highlight-error" : "" if @community
+    @error_software_finality = @software_info.errors.include?(:finality) ? "highlight-error" : "" if @software_info
+    @error_software_license = @license_info.errors.include?(:version) ? "highlight-error" : "" if @license_info
+  end
 end
@@ -128,6 +128,7 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
       views/complete-registration.js
       views/search-software-catalog.js
       views/profile-tabs-software.js
+      views/new-community.js
       blocks/software-download.js
       initializer.js
       app.js
@@ -10,7 +10,8 @@
     'CompleteRegistration',
     'SearchSoftwareCatalog',
     'SoftwareDownload',
-    'ProfileTabsSoftware'
+    'ProfileTabsSoftware',
+    'NewCommunity'
   ];
@@ -533,3 +533,7 @@ div#finality textarea {
   resize: none;
   height: 100px;
 }
+
+.highlight-error label {
+  color: #FF0000 !important;
+}
 \ No newline at end of file
@@ -0,0 +1,28 @@
+modulejs.define("NewCommunity", ['jquery'], function($) {
+
+  function replace_mandatory_message() {
+    $(".required-field").first()
+    .replaceWith("<span class='required-field'> Os campos em destaque<label class='pseudoformlabel'> (*)</label> são obrigatórios. </span>");
+  }
+
+  function remove_image_builder_text() {
+    $("label:contains('Image builder')").hide();
+  }
+  
+  function hide_organization_template_fields(){
+    $('#template-options').hide();
+  }
+
+  return {
+
+    isCurrentPage: function() {
+      return true;
+    },
+
+    init: function() {
+      replace_mandatory_message();
+      remove_image_builder_text();
+      hide_organization_template_fields();
+    }
+  }
+})
-modulejs.define('NewSoftware', ['jquery', 'NoosferoRoot', 'AutoComplete'], function($, NoosferoRoot, AutoComplete) {
+modulejs.define('NewSoftware', ['jquery', 'NoosferoRoot', 'AutoComplete', 'NewCommunity'], function($, NoosferoRoot, AutoComplete, Community) {
   'use strict';
   var AJAX_URL = {
@@ -61,6 +61,7 @@ modulejs.define(&#39;NewSoftware&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;AutoComplete&#39;], funct
     init: function() {
       license_info_autocomplete();
+      Community.init();
       $("#community_name_id").blur(replace_domain_and_repository_link);
     }
@@ -7,8 +7,10 @@
     <% block.downloads.each_with_index do |download, index| %>
         <div id="download-info-<%=(index+1)%>">
           <div id="version01">
-            <%= link_to _(""), download[:link], {:id => "image-download", :title => "Baixar o software"} %>
-            <%= link_to _(download[:size]), download[:link], {:id => "size-download", :title => "Baixar o software"} %>
+          <%= link_to download[:link], title: _("Download the software"), download: block.owner.name do %>
+            <span id="image-download"></span>
+            <span id="size-download"><%= download[:size] %></span>
+          <% end %>
           </div>
           <div id="info-software-download">
             <span class="download-name"><%= _("#{download[:name]}") %></span>
@@ -2,4 +2,4 @@
   <%= _("This community needs a software to use this block") %>
 <% else %>
   <%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>
-<% end %>
 \ No newline at end of file
+<% end %>
@@ -11,7 +11,7 @@
   <%= content_tag('tr', content_tag('td', _("Internacionalizable:")) + content_tag('td', profile.software_info.intern ? _("Yes") : _("No"))) %>
   <%= display_mpog_field(_('Operating Platform:'), profile.software_info, :operating_platform, true) %>
   <%= display_mpog_field(_('Demonstration URL:'), profile.software_info, :demonstration_url, true) %>
-  <%= display_mpog_field(_('Acronym:'), profile.software_info, :acronym, true) %>
+  <%= display_mpog_field(_('Short Name:'), profile.software_info, :acronym, true) %>
   <%= display_mpog_field(_('Objectives:'), profile.software_info, :objectives, true) %>
   <%= display_mpog_field(_('Features:'), profile.software_info, :features, true) %>
+
 <%= render :partial => 'first_edit_software_community_extras', :locals => {:class_step_one => "another-step", :class_step_two => "current-step"} if @first_edit %>
 <h1><%= _('Configure Software Community') %></h1>
@@ -13,7 +14,7 @@
 <%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>
-  <% if user.has_permission?('manage_environment_templates', profile.environment) %>
+  <% if environment.admins.include?(user) %>
     <div id="profile-is-template">
       <%= labelled_check_box(_('This profile is a template'), 'profile_data[is_template]', true, @profile.is_template) %>
     </div>
@@ -62,23 +63,24 @@
     end.join("\n")
   %>
-  <%= select_categories(:profile_data, _('Select the categories of your interest'), 2) %>
+  <%= select_categories(:profile_data, _('Software Categories'), 2) %>
   <% button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
-    <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+
+    <% unless @first_edit %>
+      <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
+    <% end %>
   <% end %>
-  <% if user && user.has_permission?('destroy_profile', profile) %>
+  <% if user && user.has_permission?('destroy_profile', profile) && !@first_edit %>
     <% button_bar(:id => 'delete-profile') do %>
-      <%= button(:remove, _('Delete profile'), {:action => :destroy_profile}) %>
-
+      <%= button(:remove, _('Delete software and community'), {:action => :destroy_profile}) %>
       <% if environment.admins.include?(current_person) %>
-
         <% if profile.visible? %>
-          <%= button(:remove, _('Deactivate profile'), {:action => :deactivate_profile, :id=>profile.id}, :id=>'deactivate_profile_button', :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
+          <%= button(:remove, _('Deactivate software and community'), {:action => :deactivate_profile, :id=>profile.id}, :id=>'deactivate_profile_button', :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
         <% else %>
-          <%= button(:add, _('Activate profile'), {:action => :activate_profile, :id=>profile.id}, :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
+          <%= button(:add, _('Activate software and community'), {:action => :activate_profile, :id=>profile.id}, :data => {:confirm=>_("Are you sure you want to deactivate this profile?")}) %>
         <% end %>
       <% end %>
     <% end %>
-<h1><%= @profile.software_info.name + _(' Information') %></h1>
-<h3> <%= _("Name") %> </h3>
-<div id="name">
-  <%= text_field_tag("community[name]", @profile.name) %>
+<div class= <%= @error_community_name %> >
+  <%= label_tag("community[name]", _('Name'), {:class => 'formlabel mandatory'}) %>
+  <%= text_field_tag("community[name]", @profile.name, :id => 'community_name_id') %>
 </div>
-<h3> <%= _("Acronym") %> </h3>
-<div id="acronym">
-  <%= text_field_tag("software[acronym]", @profile.software_info.acronym, :maxlength=>"10") %>
+<div class= <%= @error_software_acronym %> >
+  <%= label_tag("software[acronym]", _('Short Name'), {:class => 'formlabel mandatory'}) %>
+  <%= text_field_tag("software[acronym]", @profile.software_info.acronym, :id => 'software_acronym_id', :maxlength=>"10") %>
 </div>
-<h3> <%= _("Finality") %> </h3>
-<div id="finality">
-  <%= text_area_tag "software[finality]", @profile.software_info.finality, :placeholder => _("What is the software for?"), :maxlength => 120 %>
+<div class= <%= @error_software_finality %> >
+  <div id="finality" class="formfield type-text">
+    <%= label_tag("software[finality]", _('Finality'), {:class => 'formlabel mandatory'}) %>
+    <%= text_area_tag "software[finality]", @profile.software_info.finality, :placeholder => _("What is the software for?"), :maxlength => 120 %>
+  </div>
 </div>
-<div id="profile_change_picture_title">
-  <h3><%= _('Software Logo') %></h3>
+<div id="profile_change_picture_title" class="formlabel">
+  <label>
+    <%= _('Software Logo') %>
+  </label>
 </div>
 <div id="profile_change_picture">
     <%= f.fields_for :image_builder, @profile.image do |i| %>
@@ -24,20 +27,21 @@
     <% end %>
 </div>
-<h3><%= _("License Version: ") %></h3>
-<div id='licenses'>
-  <%= render :partial => "license_info_fields", :locals => {
-      :license_version => @license_version,
-      :license_id => @license_id,
-      :another_version => @another_license_version,
-      :another_link => @another_license_link
-    }
-  %>
+<div class= <%= @error_software_license %> >
+  <div id="profile_change_picture_title" class="formlabel formfieldline">
+    <label class="formlabel mandatory">
+      <%= _("License Version: ") %>
+    </label>
+      <%= render :partial => "license_info_fields", :locals => {
+        :license_version => @license_version,
+        :license_id => @license_id,
+        :another_version => @another_license_version,
+        :another_link => @another_license_link
+      } %>
+  </div>
 </div>
-<h3> <%= _("Link to Repository") %> </h3>
-<div id='repository_link'>
-  <%= text_field_tag("software[repository_link]", @profile.software_info.repository_link, :class => "improve_input_size") %>
+<div class="formfieldline formfield type-text">
+  <%= label_tag("software[repository_link]", _('Link to Repository: '), {:class => 'formlabel'}) %>
+  <%= text_field_tag("software[repository_link]", @profile.software_info.repository_link, :class => "improve_input_size", :id => "software-info-repository-link") %>
 </div>
-
-
-<h1><%= _('Edit  software') %></h1>
-
-<div class="formfieldline">
-  <h4> <%= _("Operating Platform") %> </h4>
-  <%= text_area_tag "software[operating_platform]", @software_info.operating_platform, :cols => 40, :rows => 5%>
-</div>
-
-<div class="formfieldline">
-  <h4> <%= _("Features") %> </h4>
-  <%= text_area_tag "software[features]", @software_info.features, :maxlength=>"4000", :cols => 40, :rows => 5%>
-</div>
-
-<div id='libraries_fields'>
-  <h4> <%= _("Libraries") %> </h4>
-
-  <%= render :partial => 'library_fields', :locals => {:object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
-</div>
-<br />
-
-<div id='operating_system_fields'>
-  <h4> <%= _("Operating Systems") %> </h4>
-
-  <%= render :partial => 'operating_system_fields', :locals => {:object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %>
-</div>
-<br />
-
-<br />
-<div id='programming_languages_fields'>
-  <h4> <%= _("Programming languages") %> </h4>
-
-  <%= render :partial => 'language_fields', :locals => { :object_name => 'community', :profile => @community, :languages => @list_languages } %>
-</div>
-
-<br />
-<div id='database_fields'>
-  <h4> <%= _("Databases") %> </h4>
-
-  <%= render :partial => 'database_fields', :locals => {:object_name => 'community', :profile => @community, :database => @list_databases } %>
-</div>
-
-<div id = "demonstration_url">
-  <h4> <%= _("Demonstration url") %> </h4>
-  <%= text_field_tag("software[demonstration_url]", @software_info.demonstration_url) %>
-</div>
-
-<br>
-
 <div id = "public_software">
   <% if @disabled_public_software_field == true %>
     <%= check_box_tag("software[public_software]", "true", @software_info.public_software?, :disabled => "disabled") %>
@@ -101,3 +54,49 @@
     </div>
   </div>
 </div>
+
+<div class="formfieldline">
+  <h4> <%= _("Operating Platform") %> </h4>
+  <%= text_area_tag "software[operating_platform]", @software_info.operating_platform, :cols => 40, :rows => 5%>
+</div>
+
+<div class="formfieldline">
+  <h4> <%= _("Features") %> </h4>
+  <%= text_area_tag "software[features]", @software_info.features, :maxlength=>"4000", :cols => 40, :rows => 5%>
+</div>
+
+<div id = "demonstration_url">
+  <h4> <%= _("Demonstration url") %> </h4>
+  <%= text_field_tag("software[demonstration_url]", @software_info.demonstration_url) %>
+</div>
+
+<div id='libraries_fields'>
+  <h4> <%= _("Libraries") %> </h4>
+
+  <%= render :partial => 'library_fields', :locals => {:object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
+</div>
+
+<br />
+
+<div id='operating_system_fields'>
+  <h4> <%= _("Operating Systems") %> </h4>
+
+  <%= render :partial => 'operating_system_fields', :locals => {:object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %>
+</div>
+<br />
+
+<br />
+<div id='programming_languages_fields'>
+  <h4> <%= _("Programming languages") %> </h4>
+
+  <%= render :partial => 'language_fields', :locals => { :object_name => 'community', :profile => @community, :languages => @list_languages } %>
+</div>
+
+<br />
+<div id='database_fields'>
+  <h4> <%= _("Databases") %> </h4>
+
+  <%= render :partial => 'database_fields', :locals => {:object_name => 'community', :profile => @community, :database => @list_databases } %>
+</div>
+
+<br>
+<h1><%= _('Edit Software') %></h1>
+
 <% tabs = [] %>
 <%= error_messages_for :software_info, :community %>
 <%= labelled_form_for :community, :html => { :multipart => true, :id => 'edit-form' } do |f| %>
-  <% tabs << {:title => _("Software"), :id => 'basic-info',
+  <% tabs << {:title => _("Main Information"), :id => 'basic-info',
     :content => (render :partial => 'main_software_editor_extras', :locals => {:f => f})} %>
   <% tabs << {:title => _("Specifications"), :id => 'especific-info',
@@ -33,25 +33,31 @@
     <%= required_fields_message %>
-    <%= label("name", _('Name'), {:class => 'formlabel mandatory'}) %>
-    <%= required text_field(:community, :name, :size => 30, :maxlength => 100, :id => 'community_name_id') %>
+    <div class= <%= @error_community_name %> >
+      <%= label("name", _('Name'), {:class => 'formlabel mandatory'}) %>
+      <%= required text_field(:community, :name, :size => 30, :maxlength => 100, :id => 'community_name_id') %>
+    </div>
     <br>
     <br>
-    <%= label("domain", _('Domain'), {:class => "formlabel mandatory"}) %>
-    <div id='software-name-field' class='formfield'>
+    <div class= <%= @error_software_domain %> >
+      <%= label("domain", _('Domain'), {:class => "formlabel mandatory"}) %>
+      <div id='software-name-field' class='formfield'>
-      <span id='software-hostname'><%= environment.default_hostname %>/</span>
-      <%= required text_field(:community, :identifier, :size => 30, :maxlength => 100, :id => 'community-identifier') %>
+        <span id='software-hostname'><%= environment.default_hostname %>/</span>
+        <%= required text_field(:community, :identifier, :size => 30, :maxlength => 100, :id => 'community-identifier') %>
+      </div>
     </div>
-    <%= fields_for @software_info do |swf| %>
-      <div id="finality" class="formfield type-text">
-        <%= swf.label("finality" ,_("Finality"), :class=>"formlabel mandatory") %>
-        <%= required swf.text_area(:finality, :placeholder => _("What is the software for?"), :maxlength => 120) %>
-      </div>
-    <% end %>
+    <div class= <%= @error_software_finality %> >
+      <%= fields_for @software_info do |swf| %>
+        <div id="finality" class="formfield type-text">
+          <%= swf.label("finality" ,_("Finality"), :class=>"formlabel mandatory") %>
+          <%= required swf.text_area(:finality, :placeholder => _("What is the software for?"), :maxlength => 120) %>
+        </div>
+      <% end %>
+    </div>
     <div id="profile_change_picture_title" class="formlabel">
       <label>
@@ -64,16 +70,18 @@
         <% end %>
     </div>
-    <div id="profile_change_picture_title" class="formlabel formfieldline">
-      <label class="formlabel mandatory">
-        <%= _("License Version: ") %>
-      </label>
-        <%= render :partial => "license_info_fields", :locals => {
-          :license_version => "",
-          :license_id => "",
-          :another_version=>"",
-          :another_link=>""
-        } %>
+    <div class= <%= @error_software_license %> >
+      <div id="profile_change_picture_title" class="formlabel formfieldline">
+        <label class="formlabel mandatory">
+          <%= _("License Version: ") %>
+        </label>
+          <%= render :partial => "license_info_fields", :locals => {
+            :license_version => "",
+            :license_id => "",
+            :another_version=>"",
+            :another_link=>""
+          } %>
+      </div>
     </div>
     <%= fields_for @software_info do |swf| %>
	@@ -10,7 +10,8 @@		@@ -10,7 +10,8 @@
10	'CompleteRegistration',	10	'CompleteRegistration',
11	'SearchSoftwareCatalog',	11	'SearchSoftwareCatalog',
12	'SoftwareDownload',	12	'SoftwareDownload',
13	- 'ProfileTabsSoftware'	13	+ 'ProfileTabsSoftware',
		14	+ 'NewCommunity'
14	];	15	];
15		16
16		17
	@@ -533,3 +533,7 @@ div#finality textarea {		@@ -533,3 +533,7 @@ div#finality textarea {
533	resize: none;	533	resize: none;
534	height: 100px;	534	height: 100px;
535	}	535	}
		536	+
		537	+.highlight-error label {
		538	+ color: #FF0000 !important;
		539	+}
536	\ No newline at end of file	540	\ No newline at end of file
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+modulejs.define("NewCommunity", ['jquery'], function($) {
	2	+
	3	+ function replace_mandatory_message() {
	4	+ $(".required-field").first()
	5	+ .replaceWith("<span class='required-field'> Os campos em destaque<label class='pseudoformlabel'> (*)</label> são obrigatórios. </span>");
	6	+ }
	7	+
	8	+ function remove_image_builder_text() {
	9	+ $("label:contains('Image builder')").hide();
	10	+ }
	11	+
	12	+ function hide_organization_template_fields(){
	13	+ $('#template-options').hide();
	14	+ }
	15	+
	16	+ return {
	17	+
	18	+ isCurrentPage: function() {
	19	+ return true;
	20	+ },
	21	+
	22	+ init: function() {
	23	+ replace_mandatory_message();
	24	+ remove_image_builder_text();
	25	+ hide_organization_template_fields();
	26	+ }
	27	+ }
	28	+})
	@@ -2,4 +2,4 @@		@@ -2,4 +2,4 @@
2	<%= _("This community needs a software to use this block") %>	2	<%= _("This community needs a software to use this block") %>
3	<% else %>	3	<% else %>
4	<%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>	4	<%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>
5	-<% end %>
6	\ No newline at end of file	5	\ No newline at end of file
		6	+<% end %>
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	<%= content_tag('tr', content_tag('td', _("Internacionalizable:")) + content_tag('td', profile.software_info.intern ? _("Yes") : _("No"))) %>	11	<%= content_tag('tr', content_tag('td', _("Internacionalizable:")) + content_tag('td', profile.software_info.intern ? _("Yes") : _("No"))) %>
12	<%= display_mpog_field(_('Operating Platform:'), profile.software_info, :operating_platform, true) %>	12	<%= display_mpog_field(_('Operating Platform:'), profile.software_info, :operating_platform, true) %>
13	<%= display_mpog_field(_('Demonstration URL:'), profile.software_info, :demonstration_url, true) %>	13	<%= display_mpog_field(_('Demonstration URL:'), profile.software_info, :demonstration_url, true) %>
14	- <%= display_mpog_field(_('Acronym:'), profile.software_info, :acronym, true) %>	14	+ <%= display_mpog_field(_('Short Name:'), profile.software_info, :acronym, true) %>
15	<%= display_mpog_field(_('Objectives:'), profile.software_info, :objectives, true) %>	15	<%= display_mpog_field(_('Objectives:'), profile.software_info, :objectives, true) %>
16	<%= display_mpog_field(_('Features:'), profile.software_info, :features, true) %>	16	<%= display_mpog_field(_('Features:'), profile.software_info, :features, true) %>
17		17