diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb index b7e08b2..da07102 100644 --- a/app/controllers/public/profile_controller.rb +++ b/app/controllers/public/profile_controller.rb @@ -64,15 +64,8 @@ class ProfileController < PublicController end def members - @profiles_focus = [] - if is_cache_expired?(profile.members_cache_key(params)) @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count) - if session[:invited_members] - @profiles_focus = session[:invited_members] - - session.delete :invited_members - end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e9f7892..05bf735 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -589,24 +589,14 @@ module ApplicationHelper trigger_class = 'enterprise-trigger' end end - - extra_info_tag = '' - img_class = 'profile-image' - - if extra_info.is_a? Hash - extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class]) - img_class +=' '+extra_info[:class] - else - extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' ) - end - #extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' ) + extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' ) links = links_for_balloon(profile) content_tag('div', content_tag(tag, (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{CGI::escapeHTML(links.to_json)}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") + link_to( - content_tag( 'span', profile_image( profile, size ), :class => img_class ) + + content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) + content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) + - extra_info_tag + profile_sex_icon( profile ) + profile_cat_icons( profile ), + extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ), profile.url, :class => 'profile_link url', :help => _('Click on this icon to go to the %s\'s home page') % profile.name, diff --git a/app/views/profile/members.html.erb b/app/views/profile/members.html.erb index 921c64a..8744462 100644 --- a/app/views/profile/members.html.erb +++ b/app/views/profile/members.html.erb @@ -9,7 +9,7 @@ of a community --> <% @members.each do |member| %> - <%= profile_image_link(member, :portrait, 'li', @profiles_focus.include?(member.user_id) ? {:value =>_('New'), :class => 'new-profile'}:'') %> + <%= profile_image_link(member) %> <% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e8f7bf9..c01682f 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2205,21 +2205,6 @@ a.button.disabled, input.disabled { .profile-list .extra_info { font-size: 9px; } - -/* New members of community added -* by admin of environment feature -* #issue 227 -*/ -.profile-list .extra_info.new-profile { - margin-top: 5px; - color: #0A0; - font-weight: bold; -} - -span.new-profile img{ - border-top: solid 2px #0A0; - margin-top: -2px; -} /* ==> blocks/recent-documents-block.css <<= */ #content .recent-documents-block { -- libgit2 0.21.2