Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
commit
ab7fd7bc8f
@ -0,0 +1,39 @@
|
|||||||
|
<div class="resources mt15">
|
||||||
|
<div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
|
||||||
|
<div class="homepagePostPortrait">
|
||||||
|
<!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
|
||||||
|
<%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostDes">
|
||||||
|
<div class="homepagePostTo">
|
||||||
|
<% if activity.try(:author).try(:realname) == ' ' %>
|
||||||
|
<%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
|
||||||
|
<% end %>
|
||||||
|
TO
|
||||||
|
<%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.container_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
|
||||||
|
<!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostTitle">
|
||||||
|
<a href="javascript:void(0);" class="postGrey"><%=activity.filename.to_s(附件名称)%></a>
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostSubmitContainer">
|
||||||
|
<div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostIntro">（附件描述）<%=activity.description.to_s%></div>
|
||||||
|
<div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
|
||||||
|
<ul>
|
||||||
|
<li class="homepagePostSettingIcon">
|
||||||
|
<ul class="homepagePostSettiongText">
|
||||||
|
<li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
|
||||||
|
<li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
|
||||||
|
<li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
<div class="resources mt15">
|
||||||
|
<div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
|
||||||
|
<div class="homepagePostPortrait">
|
||||||
|
<!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
|
||||||
|
<%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostDes">
|
||||||
|
<div class="homepagePostTo">
|
||||||
|
<% if activity.try(:user).try(:realname) == ' ' %>
|
||||||
|
<%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
|
||||||
|
<% end %>
|
||||||
|
TO
|
||||||
|
<%= link_to Course.find(activity.polls_group_id).name.to_s+"(课程名称)", course_path(activity.polls_group_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
|
||||||
|
<!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostTitle">
|
||||||
|
<a href="javascript:void(0);" class="postGrey"><%=activity.polls_name.to_s%>(问卷名称)</a>
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostSubmitContainer">
|
||||||
|
<div class="homepagePostDeadline">时间：<%= format_date(activity.created_at) %></div>
|
||||||
|
</div>
|
||||||
|
<div class="homepagePostIntro">（问卷描述）<%=activity.polls_description.to_s%></div>
|
||||||
|
<div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
|
||||||
|
<ul>
|
||||||
|
<li class="homepagePostSettingIcon">
|
||||||
|
<ul class="homepagePostSettiongText">
|
||||||
|
<li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
|
||||||
|
<li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
|
||||||
|
<li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
<% user_activities.each do |user_activity|
|
||||||
|
unless user_activities.nil? %>
|
||||||
|
<% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
|
||||||
|
<% case user_activity.container_type.to_s %>
|
||||||
|
<% when 'Course' %>
|
||||||
|
<% if act %>
|
||||||
|
<% case user_activity.act_type.to_s %>
|
||||||
|
<% when 'HomeworkCommon' %>
|
||||||
|
<%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<% when 'News' %>
|
||||||
|
<%= render :partial => 'course_news', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<% when 'Message'%>
|
||||||
|
<%= render :partial => 'course_message', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'Course'%>
|
||||||
|
<%#= render :partial => 'course_create', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'Attachment' %>
|
||||||
|
<%#= render :partial => 'course_attachment', :locals => {:activity => act, :user_activity => user_activity} %>
|
||||||
|
<%# when 'JournalsForMessage' %>
|
||||||
|
<%#= render :partial => 'course_journalsformessage', :locals => {:activity => act, :user_activity => user_activity} %>
|
||||||
|
<%# when 'Poll' %>
|
||||||
|
<%#= render :partial => 'course_poll', :locals => {:activity => act, :user_activity => user_activity} %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% when 'Project' %>
|
||||||
|
<% case user_activity.act_type.to_s %>
|
||||||
|
<% when 'Issue' %>
|
||||||
|
<%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<% when 'Message' %>
|
||||||
|
<%= render :partial => 'project_message', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'Journal' %>
|
||||||
|
<%#= render :partial => 'project_journal', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'News' %>
|
||||||
|
<%#= render :partial => 'project_news', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'Document' %>
|
||||||
|
<%#= render :partial => 'project_document', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'Attachment' %>
|
||||||
|
<%#= render :partial => 'project_attachment', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<%# when 'ProjectCreateInfo' %>
|
||||||
|
<%#= render :partial => 'project_create', :locals => {:activity => act,:user_activity =>user_activity} %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<input type="hidden" value="<%= page%>" id="show_more_activities" />
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page} )%>");
|
||||||
|
<% if @user_activities.count < 10%>
|
||||||
|
$(window).off("scroll", scrollHandler);
|
||||||
|
<% end%>
|
||||||
Loading…
Reference in new issue