Download as
Browse Code »

Commit a70da834e6637220f3ded797d7f082067c853394

Authored by Michel Felipe
1 parent 2e14e80a
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Move new member highligth feature to another branch in another moment.This will … 

…be checked by created_at field in role_assignment entity
Showing 4 changed files with 4 additions and 36 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @a70da83
... ... @@ -64,15 +64,8 @@ class ProfileController < PublicController
64 64 end
65 65  
66 66 def members
67   - @profiles_focus = []
68   -
69 67 if is_cache_expired?(profile.members_cache_key(params))
70 68 @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
71   - if session[:invited_members]
72   - @profiles_focus = session[:invited_members]
73   -
74   - session.delete :invited_members
75   - end
76 69 end
77 70 end
78 71  
... ...
app/helpers/application_helper.rb
  Diff comments   View file @a70da83
... ... @@ -589,24 +589,14 @@ module ApplicationHelper
589 589 trigger_class = 'enterprise-trigger'
590 590 end
591 591 end
592   -
593   - extra_info_tag = ''
594   - img_class = 'profile-image'
595   -
596   - if extra_info.is_a? Hash
597   - extra_info_tag = content_tag( 'span', extra_info[:value], :class => 'extra_info '+extra_info[:class])
598   - img_class +=' '+extra_info[:class]
599   - else
600   - extra_info_tag = content_tag( 'span', extra_info, :class => 'extra_info' )
601   - end
602   - #extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
  592 + extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
603 593 links = links_for_balloon(profile)
604 594 content_tag('div', content_tag(tag,
605 595 (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) : "") +
606 596 link_to(
607   - content_tag( 'span', profile_image( profile, size ), :class => img_class ) +
  597 + content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
608 598 content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
609   - extra_info_tag + profile_sex_icon( profile ) + profile_cat_icons( profile ),
  599 + extra_info + profile_sex_icon( profile ) + profile_cat_icons( profile ),
610 600 profile.url,
611 601 :class => 'profile_link url',
612 602 :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
... ...
app/views/profile/members.html.erb
  Diff comments   View file @a70da83
... ... @@ -9,7 +9,7 @@
9 9 of a community
10 10 -->
11 11 <% @members.each do |member| %>
12   - <%= profile_image_link(member, :portrait, 'li', @profiles_focus.include?(member.user_id) ? {:value =>_('New'), :class => 'new-profile'}:'') %>
  12 + <%= profile_image_link(member) %>
13 13 <% end %>
14 14 </ul>
15 15  
... ...
public/stylesheets/application.css
  Diff comments   View file @a70da83
... ... @@ -2205,21 +2205,6 @@ a.button.disabled, input.disabled {
2205 2205 .profile-list .extra_info {
2206 2206 font-size: 9px;
2207 2207 }
2208   -
2209   -/* New members of community added
2210   -* by admin of environment feature
2211   -* #issue 227
2212   -*/
2213   -.profile-list .extra_info.new-profile {
2214   - margin-top: 5px;
2215   - color: #0A0;
2216   - font-weight: bold;
2217   -}
2218   -
2219   -span.new-profile img{
2220   - border-top: solid 2px #0A0;
2221   - margin-top: -2px;
2222   -}
2223 2208 /* ==> blocks/recent-documents-block.css <<= */
2224 2209  
2225 2210 #content .recent-documents-block {
... ...