Revision 1330:441b66f148b6 app

View differences:

app/helpers/activities_helper.rb
112 112 
      finish = Time.now
113 113 
      logger.info "render_active_colleagues: took #{finish-start}"
114 114
115 
      s
115 
      s.html_safe
116 116 
    end
117 117 
  end
118 118 

  		












  

    
      app/views/my/blocks/_colleagues.html.erb
    
  





  5
  5
  
    
<div id="activity">


  		




  6
  6
  
    
  <h3><%=l(:label_my_colleagues)%></h3>


  		




  7
  7
  
    
  <div class="activity box" id="active-colleagues">


  		




  8
  
  
    
    <%= render_active_colleagues(colleagues) %>


  		




  
  8
  
    
    <%= render_active_colleagues(colleagues).html_safe %>


  		




  9
  9
  
    
  </div>


  		




  10
  10
  
    
</div>


  		




  11
  11
  
    
<% end %>


  		












Also available in:  Unified diff