个人主页动态

app/controllers/users_controller.rb

@@ -537,7 +537,7 @@ class UsersController < ApplicationController
     #if @user == User.current
 
       @user_activities = UserActivity.where("(container_type='Course' and container_id in (select course_id FROM members WHERE user_id=#{@user.id})) or (container_type='Project' and container_id in (SELECT project_id FROM members WHERE user_id=#{@user.id}))").order('created_at desc')
-
+      @user_activities = paginateHelper @user_activities,500
       #SELECT * FROM user_activities WHERE (container_type='Course' AND container_id IN (SELECT course_id FROM members WHERE user_id=4)) OR (container_type='Project' AND container_id IN (SELECT project_id FROM members WHERE user_id=4))
     #else
     #end

app/views/users/_course_homework.html.erb

@@ -2,22 +2,22 @@
   <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-      <!--<a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><!--<a href="javascript:void(0);" class="newsBlue mr15">尹教授</a>-->
+      <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
-        <a href="javascript:void(0);" class="newsBlue ml15"><%= activity.course.name %>(课程名称)</a>
+        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle">
-        <a href="javascript:void(0);" class="postGrey"><%= activity.name %>（作业名称）</a></div>
+        <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey" %>
+      </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
-          <a href="javascript:void(0);" class="c_blue">提交（<%= activity.student_works.count %>）</a>
+          <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(activity.id), :class=> "c_blue" %>
         </div>
         <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
       </div>

app/views/users/_course_message.html.erb

@@ -1,21 +1,25 @@
-<% if activity.parent_id.nil? %>
     <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"><!--<a href="javascript:void(0);" class="newsBlue mr15">尹教授</a>-->
+          <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
-            <a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.course.name %>(课程讨论区)</a>
+            <%= link_to activity.course.name.to_s+"(课程讨论区)", course_path(activity.course), :class => "newsBlue ml15 mr5" %>
           </div>
           <div class="homepagePostTitle">
-            <a href="javascript:void(0);" class="postGrey"><%= activity.subject %>（讨论区内容）</a></div>
+            <% if activity.parent_id.nil? %>
+              <%= link_to activity.subject.to_s.html_safe+"(讨论区内容)", course_boards_path(Board.where('id=?',activity.board_id).first.course_id), :class=> "postGrey" %>
+            <% else %>
+                <%= link_to activity.parent.subject.to_s.html_safe+"(讨论区内容)", course_boards_path(Board.where('id=?',activity.board_id).first.course_id), :class=> "postGrey" %>
+            <% end %>
+          </div>
           <div class="homepagePostSubmitContainer">
             <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
           </div>
@@ -35,8 +39,14 @@
       </div>
       <div class="homepagePostReply">
         <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=activity.replies_count %>）</div>
-          <div class="homepagePostReplyBannerTime">2015-07-31</div>
+          <div class="homepagePostReplyBannerCount">回复（
+             <% if activity.parent_id.nil? %>
+                <%=activity.replies_count %>
+            <% else %>
+                <%=activity.parent.replies_count %>
+            <% end %>
+            ）</div>
+          <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
           <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
           </div>
         </div>
@@ -51,32 +61,35 @@
           </div>
           <div class="cl"></div>
         </div>
+        <% activity= activity.parent_id.nil? ? activity:activity.parent%>
+        <% activity.children.reorder("created_on desc").each do |reply| unless activity.children.nil?%>
         <div class="homepagePostReplyContainer">
           <div class="homepagePostReplyPortrait">
-            <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像"/></a>
+            <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
           </div>
           <div class="homepagePostReplyDes">
             <div class="homepagePostReplyPublisher">
-              <a href="javascript:void(0);" class="newsBlue mr10 f14">黄井泉 学生</a>
-              2015-08-01<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><!--<a href="javascript:void(0);" class="newsBlue fr">回复</a>-->
+              <% if reply.try(:author).try(:realname) == ' ' %>
+                  <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+              <% else %>
+                  <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+              <% end %>
+              <%=format_date(reply.created_on)%>
+              <%= link_to(
+                          l(:button_delete),
+                          {:controller => 'messages', :action => 'destroy',  :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
+                          :method => :post,
+                          :data => {:confirm => l(:text_are_you_sure)},
+                          :title => l(:button_delete),
+                          :class => 'replyGrey fr ml10'
+                  ) if reply.course_destroyable_by?(User.current) %>
+              <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
             </div>
-            <div class="homepagePostReplyContent">很开心！</div>
-          </div>
-          <div class="cl"></div>
-        </div>
-        <div class="homepagePostReplyContainer borderBottomNone">
-          <div class="homepagePostReplyPortrait">
-            <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="45" height="45" alt="用户头像"/></a>
-          </div>
-          <div class="homepagePostReplyDes">
-            <div class="homepagePostReplyPublisher">
-              <a href="javascript:void(0);" class="newsBlue mr10 f14">陈正东 学生</a>
-              2015-08-02<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a><!--<a href="javascript:void(0);" class="newsBlue fr">回复</a>-->
-            </div>
-            <div class="homepagePostReplyContent">假期好热，没出去。</div>
+            <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
           </div>
           <div class="cl"></div>
         </div>
+        <% end %>
+        <% end %>
       </div>
     </div>
-<% end %>

app/views/users/_course_news.html.erb

@@ -11,10 +11,12 @@
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO
-        <a href="javascript:void(0);" class="newsBlue ml15"><%= activity.course.name %>(课程名称)</a>
+        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course), :class => "newsBlue ml15" %>
+       <!-- <a href="javascript:void(0);" class="newsBlue ml15"><%= activity.course.name %>(课程名称)</a>-->
       </div>
       <div class="homepagePostTitle">
-        <a href="javascript:void(0);" class="postGrey"><%= activity.title %>（通知标题）</a></div>
+        <%=link_to activity.title.to_s+"(通知标题)", news_path(activity), :class=> "postGrey" %>
+        <!--<a href="javascript:void(0);" class="postGrey"><%= activity.title %>（通知标题）</a>--></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">发布时间：<%= format_date(activity.created_on) %></div>
       </div>
@@ -33,4 +35,24 @@
     </div>
     <div class="cl"></div>
   </div>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复（<%=activity.comments_count %>）</div>
+      <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerMore"><a href="javascript:void(0);" class="replyGrey">点击展开更多回复</a>
+      </div>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <textarea class="homepagePostReplyInput" placeholder="请输入回复"></textarea>
+    </div>
+    <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyEmotion"><a href="javascript:void(0);" class="replyGrey">表情</a></div>
+      <div class="homepagePostReplyCancel"><a href="javascript:void(0);" class="postReplyCancel">取消</a>
+      </div>
+      <div class="homepagePostReplySubmit"><a href="javascript:void(0);" class="postReplySubmit">发送</a>
+      </div>
+      <div class="cl"></div>
+    </div>
+    
+  </div>
 </div>

app/views/users/_project_issue.html.erb

@@ -20,13 +20,38 @@
         </div>
         <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
       </div>
-      <div class="homepagePostIntro">（缺陷描述）<%=activity.description.html_safe %></div>
-      <div class="mt10">
+      <div class="homepagePostIntro" style="word-break:break-all;">（缺陷描述）<%=activity.description.html_safe %></div>
+      <div class="attachments" style="font-weight:normal;">
+        <% if activity.attachments.any? %>
+            <% activity.attachments.each do |attachment| %>
+                <div style="float:left;">
+                  <p style="height:14px;line-height:12px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                  <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
+                <span title="<%= attachment.filename %>" id="attachment_">
+                  <%= link_to_short_attachment attachment, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
+                </span>
+                  </div>
+                  <% if attachment.is_text? %>
+                      <%= link_to image_tag('magnifier.png'),
+                                  :controller => 'attachments',
+                                  :action => 'show',
+                                  :id => attachment,
+                                  :filename => attachment.filename %>
+                  <% end %>
+                  <span class="postAttSize">
+                    <%= number_to_human_size attachment.filesize %>
+                  </span>
+                  </p>
+                </div>
+            <% end %>
+        <% end %>
+      </div>
+      <!--<div class="mt10">
         <a href="javascript:void(0);" class="homepagePostFileAtt newsBlue">文件附件.zip</a><span class="postAttSize">(123KB)</span>
       </div>
       <div>
         <a href="javascript:void(0);" class="homepagePostImageAtt newsBlue">图片附件.png</a><span class="postAttSize">(123KB)</span>
-      </div>
+      </div>-->
       <div class="homepagePostSetting" id="act-<%=user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">

app/views/users/show.html.erb

@@ -30,6 +30,7 @@
   <% case user_activity.act_type.to_s %>
     <% when 'CourseActivity' %>
       <% @course_act= CourseActivity.where("id=#{user_activity.act_id}").first %>
+      <% unless @course_act.nil?  %>
       <% case @course_act.course_act_type.to_s %>
         <% when 'HomeworkCommon' %>
           <% @activity=HomeworkCommon.where("id=#{@course_act.course_act_id}").first %>
@@ -41,6 +42,7 @@
           <% @activity=Message.where("id=#{@course_act.course_act_id}").first %>
             <%= render :partial => 'course_message', :locals => {:activity => @activity,:user_activity =>user_activity} %>
        <% end %>
+       <% end %>
     <% when 'ForgeActivity' %>
       <% @project_act= ForgeActivity.where("id=#{user_activity.act_id}").first %>
       <% case @project_act.forge_act_type.to_s %>