|
|
|
@ -50,7 +50,7 @@
|
|
|
|
|
<% end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<% if act.container_type == 'OrgSubfield' %>
|
|
|
|
|
<% if act.org_act_type == 'Message' and act.org_act_id and Message.where("id=#{act.org_act_id}").count > 0 %>
|
|
|
|
|
<% if act.org_act_type == 'Message' and act.org_act_id %>
|
|
|
|
|
<% message = Message.find(act.org_act_id) %>
|
|
|
|
|
<% if !message.board.course_id.nil? %>
|
|
|
|
|
<%= render :partial => 'org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
|
|
|
|
@ -62,21 +62,10 @@
|
|
|
|
|
<% end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<% end %>
|
|
|
|
|
<!--<ul class="wlist" style=" border:none; padding-top: 15px;">-->
|
|
|
|
|
<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
|
|
|
|
|
<!--</ul>-->
|
|
|
|
|
|
|
|
|
|
<% end %>
|
|
|
|
|
|
|
|
|
|
<% if org_act_count == 10 %>
|
|
|
|
|
<!--<div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>-->
|
|
|
|
|
<%= link_to "点击展开更多",organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
|
|
|
|
|
<% end%>
|
|
|
|
|
|
|
|
|
|
<!--
|
|
|
|
|
<script>
|
|
|
|
|
$(function(){
|
|
|
|
|
$("#show_more_activities").mouseover(function(){
|
|
|
|
|
$("#more_org_activities_link").click();
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|