Luciano Prestes · Thiago Ribeiro · Thiago Ribeiro · Thiago Ribeiro · Luciano Prestes · Luciano Prestes
Showing 16 changed files Show diff stats
lib/categories_software_block.rb
lib/ext/communities_block.rb
lib/ext/profile_controller.rb
lib/ext/search_controller.rb
lib/software_info.rb
po/pt/software_communities.po
test/functional/search_controller_test.rb
views/blocks/categories_and_tags.html.erb
views/blocks/categories_software.html.erb
views/blocks/software_highlights.html.erb
views/blocks/software_statistics.html.erb
views/organization_ratings_extra_fields_show_data.html.erb
views/profile/index.html.erb
views/profile/members.html.erb
views/profile_editor/edit_software_community.html.erb
views/search/_catalog_result_list.html.erb
@@ -16,10 +16,15 @@ class CategoriesSoftwareBlock &lt; Block
   def content(args={})
     block = self
     s = show_name
+
+    software_category = Category.find_by_name("Software")
+    categories = []
+    categories = software_category.children.sort if software_category
+
     lambda do |object|
       render(
         :file => 'blocks/categories_software',
-        :locals => { :block => block, :show_name => s }
+        :locals => { :block => block, :show_name => s, :categories => categories }
       )
     end
   end
@@ -22,7 +22,7 @@ class CommunitiesBlock
     valid_communities_string = Community.get_valid_communities_string
     Community.all.each{|community| delete_communities << community.id unless eval(valid_communities_string)}
-    visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities])
+    visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities]) unless delete_communities.empty?
     if !prioritize_profiles_with_image
       return visible_profiles.all(
@@ -25,17 +25,10 @@ class ProfileController
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      all_members = if params[:sort] and params[:sort] == "desc"
-        profile.members.order("name desc")
-      else
-        profile.members.order("name asc")
-      end
-      @profile_admins = profile.admins
-      @profile_members = all_members - @profile_admins
-      @profile_members = @profile_members.paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @profile_members.size)
-      @profile_admins = @profile_admins.paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @profile_admins.size)
-      @total_members = all_members.size
-      @profile_members_url = url_for(:controller => "profile", :action => "members")
+      sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
+      @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
+      @profile_members = profile.members.order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
+      @profile_members_url = url_for(:controller => 'profile', :action => 'members')
     end
   end
@@ -61,6 +61,7 @@ class SearchController
   def get_filtered_software_list
     params[:query] ||= ""
+    visible_communities = visible_profiles(Community)
     filtered_software_list = SoftwareInfo.search_by_query(params[:query])
@@ -70,6 +71,7 @@ class SearchController
       @public_software_selected = false
     end
+    filtered_software_list.select!{ |software| visible_communities.include?(software.community) }
     category_ids = get_filter_category_ids
     unless category_ids.empty?
@@ -89,7 +91,7 @@ class SearchController
   def get_communities_list software_list
     filtered_community_list = []
       software_list.each do |software|
-       if @all_selected || software.public_software?
+       if !@public_software_selected || software.public_software?
          filtered_community_list << software.community unless software.community.nil?
        end
     end
@@ -13,15 +13,15 @@ class SoftwareInfo &lt; ActiveRecord::Base
     DatabaseDescription
   ]
-  scope :search_by_query, lambda {|query = ""|
+  scope :search_by_query, lambda { |query = ""|
     filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|')
     search_fields = SoftwareInfo.pg_search_plugin_fields
     if query.empty?
-      SoftwareInfo.all
+      SoftwareInfo.joins(:community).where("profiles.visible = ?", true)
     else
       searchable_software_objects = SoftwareInfo.transform_list_in_methods_list(SEARCHABLE_SOFTWARE_CLASSES)
-      includes(searchable_software_objects).where("to_tsvector('simple', #{search_fields}) @@ to_tsquery('#{filtered_query}')")
+      includes(searchable_software_objects).where("to_tsvector('simple', #{search_fields}) @@ to_tsquery('#{filtered_query}')").where("profiles.visible = ?", true)
     end
   }
@@ -179,7 +179,7 @@ msgstr &quot; campo finalidade em branco.&quot;
 #: plugins/software_communities/lib/create_software.rb:48
 msgid " this finality:<p><em>%{finality}</em></p>"
-msgstr "esta finalidade:<p><em>%{finality}</em></p>"
+msgstr " esta finalidade:<p><em>%{finality}</em></p>"
 #: plugins/software_communities/lib/create_software.rb:68
 msgid "%{requestor} wants to create software %{subject}"
@@ -214,6 +214,48 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community
   end
+  should "software_infos search return only enabled softwares" do
+    s1 = SoftwareInfo.first
+    s2 = SoftwareInfo.last
+
+    # First get them all normally
+    get(
+      :software_infos,
+      :query => "software"
+    )
+
+    assert_includes assigns(:searches)[:software_infos][:results], s1.community
+    assert_includes assigns(:searches)[:software_infos][:results], s2.community
+
+    s2.community.disable
+
+    # Now it should not contain the disabled community
+    get(
+      :software_infos,
+      :query => "software"
+    )
+
+    assert_includes assigns(:searches)[:software_infos][:results], s1.community
+    assert_not_includes assigns(:searches)[:software_infos][:results], s2.community
+  end
+
+  should "software_infos search not return software with secret community" do
+    software_one = create_software_info("Software ABC", :acronym => "SFO", :finality => "Help")
+    software_two = create_software_info("Python", :acronym => "SFT", :finality => "Task")
+    software_three = create_software_info("Software DEF", :acronym => "SFW", :finality => "Java")
+
+    software_one.community.secret = true
+    software_one.community.save!
+
+    get(
+      :software_infos,
+    )
+
+    assert_includes assigns(:searches)[:software_infos][:results], software_two.community
+    assert_includes assigns(:searches)[:software_infos][:results], software_three.community
+    assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community
+  end
+
   private
   def create_software_categories
 <% if block.owner.categories.count > 0 %>
-	<h3 class="block-title"><span><%= _("Categories") %></span></h3>
+	<h3 class="block-title"><span><%= _("Categories:") %></span></h3>
 	<div class="category_cloud">
 	<% block.owner.categories.each do |category| %>
@@ -8,12 +8,9 @@
     <p><%= _("Categories:") %></p>
     <ul class="categories-mais-software">
-      <% categories = Category.where(:name => "Software") %>
-      <% unless categories.blank? %>
-        <% categories.first.children.each do |category| %>
-          <% unless category.software_infos.count < 1 %>
-            <li><%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %></li>
-          <% end %>
+      <% categories.each do |category| %>
+        <% unless category.software_infos.count < 1 %>
+          <li><%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %></li>
         <% end %>
       <% end %>
     </ul>
@@ -2,13 +2,19 @@
 <!-- popover html structure -->
 <!-- <a> link to fire popover -->
-<a class="toggle-popover">mais informaçõs</a>
+<a class="toggle-popover">mais informações</a>
 <!-- <span> to handle popover options -->
 <span class="popover-span" data-toggle="popover" data-placement="top" data-class="highlights-popover">?</span>
 <!-- <div> with html content of popover
      MUST APPEAR AFTER THE SPAN  -->
 <div class="popover-content" style="display: none">
+  <div class="inner-content">
   <p>Este software foi desenvolvido com recursos públicos, gerenciado por uma instituição
-       governamental. Sua inclusão neste portal atende aos requisitos do <span>art. 14 da IN 01/2011</span>.</p>
+       governamental. Sua inclusão neste portal atende aos requisitos do
+      <a href="https://softwarepublico.gov.br/social/articles/0000/3365/in_spb_01.pdf">art. 14 da IN 01/2011</a>.
+  </p>
+  </div>
+  <div class="see-all">
   <%= link_to _('See all'), {:controller => :search, :action => :software_infos, :only_softwares => softwares} %>
+  </div>
 </div>
 <div class="software-metrics-block">
   <ul class="metrics-list">
-    <li><span class="arrow-globe-icon"></span><a href="#"><%= pluralize(profile.hits, 'visita', 'visitas') %></a></li>
-    <li><span class="downloads-icon"></span><a href="#"><%= pluralize(total_downloads, 'download', 'downloads') %></a></li>
-    <li><span class="face-icon"></span><a href="#"><%= block.benefited_people.to_s + _(' benefited people*') %></a></li>
-    <li><span class="pig-safe-icon"></span><a href="#"><strong class="saved-money"><%= number_to_currency(block.saved_resources, unit: 'R$ ', separator: ',', delimiter: '.') %></strong> <%= _(' saved resources*') %></a></li>
+    <li>
+    	<span class="arrow-globe-icon"></span>
+    	<span id="visit-count">
+    		<%= pluralize(profile.hits, 'visita', 'visitas') %>
+    	</span>
+    </li>
+    <li>
+    	<span class="downloads-icon"></span>
+    	<span id="downloads-count">
+    		<%= pluralize(total_downloads, 'download', 'downloads') %>
+    	</span>
+    </li>
+    <li>
+    	<span class="face-icon"></span>
+    	<span id="benefited-people">
+    		<%= block.benefited_people.to_s + _(' benefited people*') %>
+    	</span>
+    </li>
+    <li>
+    	<span class="pig-safe-icon"></span>
+    	<span id="saved-resources">
+    		<strong class="saved-money">
+    			<%= number_to_currency(block.saved_resources, unit: 'R$ ',
+    			 separator: ',', delimiter: '.') %>
+    		</strong>
+    		<%= _(' saved resources*') %>
+    	</span>
+    </li>
   </ul>
-
-  <div class="admin-estimation">* <%= _("Data estimated by the software administrator.") %></div>
+  <div class="admin-estimation">
+  	* <%= _("Data estimated by the software administrator.") %>
+  </div>
 </div>
 <div class="aditional-informations">
   <div class="comments-people-benefited">
-    <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
+    <span><%=_("Benefited People")%> :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
   </div>
   <div class="comments-saved-value">
-    <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %>
+    <span><%=_("Saved Resources")%> :</span> <%= user_rating.saved_value unless user_rating.nil? %>
   </div>
 </div>
@@ -11,7 +11,7 @@
 <% end %>
 <div class="page-profile-header">
-  <%= render "blocks/profile_info_actions/join_leave_community" %>
+  <%= render "blocks/profile_info_actions/join_leave_community" if profile.class == "Community" %>
   <% if !user.nil? && user.has_permission?('edit_profile', profile) %>
     <div class="control-panel-button">
       <%= button :control_panel, _('Control Panel'), profile.admin_url %>
+<div class="common-profile-list-block">
-<div class="page-members-header">
-  <h1><%= _("Members") + " (#{@total_members})" %></h1>
-  <h3 class="community-name"><%= _("%s") % profile.name %></h3>
-  <%= render "blocks/profile_info_actions/community" %>
-</div>
+  <div class="page-members-header">
+    <h1><%= _("Members (%d)") % @profile_members.total_entries %></h1>
+    <h3 class="community-name"><%= profile.name %></h3>
+    <%= render "blocks/profile_info_actions/community" %>
+  </div>
 <% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
-<div class="profile-members-tabs-container">
+  <div class="profile-members-tabs-container">
     <% tabs = [] %>
-        <% div_members = content_tag :div, :class => "profile-members" do
+    <% div_members = content_tag :div, :class => "profile-members" do
       render :partial => 'profile_members_list',
                             :locals => {
                             :users => @profile_members,
                             :role => "members"
                             }
+    end %>
-     end %>
-
-     <% members_pagination = content_tag :div, :class => "pagination-profile-members" do
-        pagination_links @profile_members, :param_name => 'npage'
-     end %>
-
-
-   <% tabs << {:title => "#{@profile_members.size} "+_("Members"),
+    <% tabs << {:title =>  _("%d Members") % @profile_members.total_entries,
                      :id => "members-tab",
-                     :content => (div_members + members_pagination)
+                     :content => div_members
                      } %>
     <% div_admins = content_tag :div, :class => "profile-admins" do
@@ -34,24 +29,16 @@
                             :users => @profile_admins,
                             :role => "admins"
                             }
-     end %>
-
-     <% admins_pagination = content_tag :div, :class => "pagination-profile-admins" do
-        pagination_links @profile_admins, :param_name => 'npage'
-     end %>
-
-    <% tabs << {:title => "#{@profile_admins.size} "+_("Administrators"),
-                           :id => "admins-tab",
-                           :content => (div_admins+admins_pagination)
-                           } %>
-
-
+    end %>
+    <% tabs << {:title => _("%d Administrators") % @profile_admins.total_entries,
+                            :id => "admins-tab",
+                            :content => div_admins
+                            } %>
     <%= render_tabs(tabs) %>
-  <% end %>
-</div>
-
+  </div><!-- end of class="profile-members-tabs-container" -->
+<% end %>
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
@@ -66,7 +53,6 @@
 <% end %>
 <%= hidden_field_tag "profile_url", @profile_members_url %>
-<%= hidden_field_tag "sort", "asc" %>
-</div><!-- fim class="common-profile-list-block" -->
+</div><!-- end of class="common-profile-list-block" -->
 <%= javascript_include_tag "members_page.js" %>
@@ -32,6 +32,9 @@
     </div>
   <% else %>
     <div>
+      <%= labelled_check_box _("Secret &mdash; hide the community and all its contents for non members and other people can't join this community unless they are invited to."), 'profile_data[secret]', true, profile.secret, :class => "profile-secret-box" %>
+    </div>
+    <div>
       <%= labelled_radio_button _('Public &mdash; show content of this group to all internet users'), 'profile_data[public_profile]', true, @profile.public_profile? %>
     </div>
     <div>
@@ -84,4 +87,4 @@
       <% end %>
     <% end %>
   <% end %>
-<% end %>
 \ No newline at end of file
+<% end %>
@@ -9,7 +9,7 @@
       <% if multiple_search?(@searches) %>
         <h3><%= @names[name] %></h3>
         <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
-          <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+          <%= link_to(_("see all (%d)") % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
         <% end %>
       <% end %>
	@@ -22,7 +22,7 @@ class CommunitiesBlock		@@ -22,7 +22,7 @@ class CommunitiesBlock
22	valid_communities_string = Community.get_valid_communities_string	22	valid_communities_string = Community.get_valid_communities_string
23	Community.all.each{\|community\| delete_communities << community.id unless eval(valid_communities_string)}	23	Community.all.each{\|community\| delete_communities << community.id unless eval(valid_communities_string)}
24		24
25	- visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities])	25	+ visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities]) unless delete_communities.empty?
26		26
27	if !prioritize_profiles_with_image	27	if !prioritize_profiles_with_image
28	return visible_profiles.all(	28	return visible_profiles.all(
	@@ -25,17 +25,10 @@ class ProfileController		@@ -25,17 +25,10 @@ class ProfileController
25		25
26	def members	26	def members
27	if is_cache_expired?(profile.members_cache_key(params))	27	if is_cache_expired?(profile.members_cache_key(params))
28	- all_members = if params[:sort] and params[:sort] == "desc"
29	- profile.members.order("name desc")
30	- else
31	- profile.members.order("name asc")
32	- end
33	- @profile_admins = profile.admins
34	- @profile_members = all_members - @profile_admins
35	- @profile_members = @profile_members.paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @profile_members.size)
36	- @profile_admins = @profile_admins.paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @profile_admins.size)
37	- @total_members = all_members.size
38	- @profile_members_url = url_for(:controller => "profile", :action => "members")	28	+ sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
		29	+ @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
		30	+ @profile_members = profile.members.order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
		31	+ @profile_members_url = url_for(:controller => 'profile', :action => 'members')
39	end	32	end
40	end	33	end
41		34
	@@ -13,15 +13,15 @@ class SoftwareInfo < ActiveRecord::Base		@@ -13,15 +13,15 @@ class SoftwareInfo < ActiveRecord::Base
13	DatabaseDescription	13	DatabaseDescription
14	]	14	]
15		15
16	- scope :search_by_query, lambda {\|query = ""\|	16	+ scope :search_by_query, lambda { \|query = ""\|
17	filtered_query = query.gsub(/[\\|\(\)\\\/\s\[\]'"%&!:]/,' ').split.map{\|w\| w += ":"}.join('\|')	17	filtered_query = query.gsub(/[\\|\(\)\\\/\s\[\]'"%&!:]/,' ').split.map{\|w\| w += ":"}.join('\|')
18	search_fields = SoftwareInfo.pg_search_plugin_fields	18	search_fields = SoftwareInfo.pg_search_plugin_fields
19		19
20	if query.empty?	20	if query.empty?
21	- SoftwareInfo.all	21	+ SoftwareInfo.joins(:community).where("profiles.visible = ?", true)
22	else	22	else
23	searchable_software_objects = SoftwareInfo.transform_list_in_methods_list(SEARCHABLE_SOFTWARE_CLASSES)	23	searchable_software_objects = SoftwareInfo.transform_list_in_methods_list(SEARCHABLE_SOFTWARE_CLASSES)
24	- includes(searchable_software_objects).where("to_tsvector('simple', #{search_fields}) @@ to_tsquery('#{filtered_query}')")	24	+ includes(searchable_software_objects).where("to_tsvector('simple', #{search_fields}) @@ to_tsquery('#{filtered_query}')").where("profiles.visible = ?", true)
25	end	25	end
26	}	26	}
27		27
	@@ -179,7 +179,7 @@ msgstr " campo finalidade em branco."		@@ -179,7 +179,7 @@ msgstr " campo finalidade em branco."
179		179
180	#: plugins/software_communities/lib/create_software.rb:48	180	#: plugins/software_communities/lib/create_software.rb:48
181	msgid " this finality:<p><em>%{finality}</em></p>"	181	msgid " this finality:<p><em>%{finality}</em></p>"
182	-msgstr "esta finalidade:<p><em>%{finality}</em></p>"	182	+msgstr " esta finalidade:<p><em>%{finality}</em></p>"
183		183
184	#: plugins/software_communities/lib/create_software.rb:68	184	#: plugins/software_communities/lib/create_software.rb:68
185	msgid "%{requestor} wants to create software %{subject}"	185	msgid "%{requestor} wants to create software %{subject}"
	@@ -214,6 +214,48 @@ class SearchControllerTest < ActionController::TestCase		@@ -214,6 +214,48 @@ class SearchControllerTest < ActionController::TestCase
214	assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community	214	assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community
215	end	215	end
216		216
		217	+ should "software_infos search return only enabled softwares" do
		218	+ s1 = SoftwareInfo.first
		219	+ s2 = SoftwareInfo.last
		220	+
		221	+ # First get them all normally
		222	+ get(
		223	+ :software_infos,
		224	+ :query => "software"
		225	+ )
		226	+
		227	+ assert_includes assigns(:searches)[:software_infos][:results], s1.community
		228	+ assert_includes assigns(:searches)[:software_infos][:results], s2.community
		229	+
		230	+ s2.community.disable
		231	+
		232	+ # Now it should not contain the disabled community
		233	+ get(
		234	+ :software_infos,
		235	+ :query => "software"
		236	+ )
		237	+
		238	+ assert_includes assigns(:searches)[:software_infos][:results], s1.community
		239	+ assert_not_includes assigns(:searches)[:software_infos][:results], s2.community
		240	+ end
		241	+
		242	+ should "software_infos search not return software with secret community" do
		243	+ software_one = create_software_info("Software ABC", :acronym => "SFO", :finality => "Help")
		244	+ software_two = create_software_info("Python", :acronym => "SFT", :finality => "Task")
		245	+ software_three = create_software_info("Software DEF", :acronym => "SFW", :finality => "Java")
		246	+
		247	+ software_one.community.secret = true
		248	+ software_one.community.save!
		249	+
		250	+ get(
		251	+ :software_infos,
		252	+ )
		253	+
		254	+ assert_includes assigns(:searches)[:software_infos][:results], software_two.community
		255	+ assert_includes assigns(:searches)[:software_infos][:results], software_three.community
		256	+ assert_not_includes assigns(:searches)[:software_infos][:results], software_one.community
		257	+ end
		258	+
217	private	259	private
218		260
219	def create_software_categories	261	def create_software_categories
1	<% if block.owner.categories.count > 0 %>	1	<% if block.owner.categories.count > 0 %>
2	- <h3 class="block-title"><span><%= _("Categories") %></span></h3>	2	+ <h3 class="block-title"><span><%= _("Categories:") %></span></h3>
3		3
4	<div class="category_cloud">	4	<div class="category_cloud">
5	<% block.owner.categories.each do \|category\| %>	5	<% block.owner.categories.each do \|category\| %>
1	<div class="software-metrics-block">	1	<div class="software-metrics-block">
2	<ul class="metrics-list">	2	<ul class="metrics-list">
3	- <li><span class="arrow-globe-icon"></span><a href="#"><%= pluralize(profile.hits, 'visita', 'visitas') %></a></li>
4	- <li><span class="downloads-icon"></span><a href="#"><%= pluralize(total_downloads, 'download', 'downloads') %></a></li>
5	- <li><span class="face-icon"></span><a href="#"><%= block.benefited_people.to_s + _(' benefited people*') %></a></li>
6	- <li><span class="pig-safe-icon"></span><a href="#"><strong class="saved-money"><%= number_to_currency(block.saved_resources, unit: 'R$ ', separator: ',', delimiter: '.') %></strong> <%= _(' saved resources*') %></a></li>	3	+ <li>
		4	+ <span class="arrow-globe-icon"></span>
		5	+ <span id="visit-count">
		6	+ <%= pluralize(profile.hits, 'visita', 'visitas') %>
		7	+ </span>
		8	+ </li>
		9	+ <li>
		10	+ <span class="downloads-icon"></span>
		11	+ <span id="downloads-count">
		12	+ <%= pluralize(total_downloads, 'download', 'downloads') %>
		13	+ </span>
		14	+ </li>
		15	+ <li>
		16	+ <span class="face-icon"></span>
		17	+ <span id="benefited-people">
		18	+ <%= block.benefited_people.to_s + _(' benefited people*') %>
		19	+ </span>
		20	+ </li>
		21	+ <li>
		22	+ <span class="pig-safe-icon"></span>
		23	+ <span id="saved-resources">
		24	+ <strong class="saved-money">
		25	+ <%= number_to_currency(block.saved_resources, unit: 'R$ ',
		26	+ separator: ',', delimiter: '.') %>
		27	+ </strong>
		28	+ <%= _(' saved resources*') %>
		29	+ </span>
		30	+ </li>
7	</ul>	31	</ul>
8		32
9	-
10	- <div class="admin-estimation">* <%= _("Data estimated by the software administrator.") %></div>	33	+ <div class="admin-estimation">
		34	+ * <%= _("Data estimated by the software administrator.") %>
		35	+ </div>
11	</div>	36	</div>
1	<div class="aditional-informations">	1	<div class="aditional-informations">
2	<div class="comments-people-benefited">	2	<div class="comments-people-benefited">
3	- <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %>	3	+ <span><%=_("Benefited People")%> :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
4	</div>	4	</div>
5		5
6	<div class="comments-saved-value">	6	<div class="comments-saved-value">
7	- <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %>	7	+ <span><%=_("Saved Resources")%> :</span> <%= user_rating.saved_value unless user_rating.nil? %>
8	</div>	8	</div>
9	</div>	9	</div>
10		10
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	<% end %>	11	<% end %>
12		12
13	<div class="page-profile-header">	13	<div class="page-profile-header">
14	- <%= render "blocks/profile_info_actions/join_leave_community" %>	14	+ <%= render "blocks/profile_info_actions/join_leave_community" if profile.class == "Community" %>
15	<% if !user.nil? && user.has_permission?('edit_profile', profile) %>	15	<% if !user.nil? && user.has_permission?('edit_profile', profile) %>
16	<div class="control-panel-button">	16	<div class="control-panel-button">
17	<%= button :control_panel, _('Control Panel'), profile.admin_url %>	17	<%= button :control_panel, _('Control Panel'), profile.admin_url %>
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	<% if multiple_search?(@searches) %>	9	<% if multiple_search?(@searches) %>
10	<h3><%= @names[name] %></h3>	10	<h3><%= @names[name] %></h3>
11	<% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>	11	<% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
12	- <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>	12	+ <%= link_to(_("see all (%d)") % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
13	<% end %>	13	<% end %>
14	<% end %>	14	<% end %>
15		15