From 10da3e1e53e2930002ce612cb7a94b8752ef15b4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Mar 2016 16:11:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A2=98=E5=BA=93=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_homework_repository_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb
index 56259d6b8..99e6d4e27 100644
--- a/app/views/users/_homework_repository_list.html.erb
+++ b/app/views/users/_homework_repository_list.html.erb
@@ -1,7 +1,7 @@
 <ul class="subject-list-banner">
   <li class="subject-list-name fl hidden"><span style="padding-left:15px;">作业名称</span></li>
   <li class="subject-list-from fl">
-    <%= link_to "来源",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "course_name", :sort => @r_sort),:class => "fl ml30",:remote => true%>
+    <%= link_to "来源",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "course_name", :sort => @r_sort),:class => "fl ml55",:remote => true%>
     <% if @order == "course_name"%>
         <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "course_name", :sort => @r_sort),:class => "#{@r_sort == 'desc' ? 'st_up' : 'st_down'} mt12 fl" ,:remote => true%>
     <% end%>

From 602864bd71f55b4b38dc01bab2635fda199ccfa7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Mar 2016 16:17:33 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8:=201=E3=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E6=9C=9F=E4=BF=A1=E6=81=AF=202=E3=80=81?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_courses.html.erb | 2 +-
 app/views/layouts/new_base_user.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index 30a911d09..872d842be 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -1,7 +1,7 @@
 <% courses.each do |course|%>
     <li class="homepageLeftMenuCoursesLine pr">
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
-      <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+      <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
                   :id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
         <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index eaf58ed7e..dd83ec968 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -193,7 +193,7 @@
               <% end%>
           <% end%>
         </div>
-        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
+        <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
         <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
           <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>

From 1489c8d9245692d9a7ef9c7d604f7be1802f021a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 17 Mar 2016 16:22:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=86=85=E5=AE=B9=E5=B0=B1=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index f382a433c..098cd39fd 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -227,6 +227,7 @@
         </ul>
     <% end %>
 
+    <% if @course.description && !@course.description.blank? %>
       <div class="project_intro">
         <div id="course_description" class="course_description">
           <h4 ><%= l(:label_course_brief_introduction)%>：</h4>
@@ -241,6 +242,7 @@
           </span>
         </div>
       </div><!--项目简介 end-->
+    <% end %>
       <div class="project_Label">
         <h4 class="mb5" ><%= l(:label_tag)%>：</h4>
         <div class="tag_h" >

From cefa6efc1ba3de2ac6b41789786a16a7713096ee Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 17 Mar 2016 16:36:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=AD=E5=8A=A0=E5=85=A5=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        | 45 ++-----------------
 .../projects/_project_activities.html.erb     |  2 +-
 app/views/users/_project_attachment.html.erb  | 36 ++++++++++-----
 3 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 05c80a9fc..2ced977be 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -300,66 +300,27 @@ class ProjectsController < ApplicationController
     end
     # 统计访问量
     @project.update_attribute(:visits, @project.visits.to_i + 1)
-=begin
-    cond = @project.project_condition(Setting.display_subprojects_issues?)
-    has = {
-      "show_issues" => true ,
-      "show_files" => true,
-      "show_documents" => true,
-      "show_messages" => true,
-      "show_news" => true,
-      "show_bids" => true,
-      "show_contests" => true,
-      "show_wiki_edits"=>true,
-      "show_journals_for_messages" => true
-    }
-    # 读取项目默认展示的动态时间天数
-    @days = Setting.activity_days_default.to_i
-    @date_to ||= Date.today + 1
-    # 时间跨度不能太大，不然很慢，所以删掉了-1.years
-    @date_from = @date_to - @days
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-=end
-
     @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
-    # 决定显示所用用户或单个用户活动
-=begin
-    @activity = Redmine::Activity::Fetcher.new(User.current,
-                                                   :project => @project,
-                                                   :with_subprojects => @with_subprojects,
-                                                   :author => @author)
-    @activity.scope_select {|t| !has["show_#{t}"].nil?}
-=end
-
     @page = params[:page] ? params[:page].to_i + 1 : 0
     # 根据私密性，取出符合条件的所有数据
     if User.current.member_of?(@project) || User.current.admin?
       case params[:type]
         when nil
-          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo')",@project).order("updated_at desc").limit(10).offset(@page * 10)
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'issue'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'news'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10)
         when 'message'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10)
+        when 'attachment'
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Attachment'",@project).order("updated_at desc").limit(10).offset(@page * 10)
       end
-
-      #events = @activity.events(@date_from, @date_to)
     else
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public
                                                     = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc")
                                                           .page(params['page'|| 1]).per(10);
-     # @events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
-
-=begin
-    @events_pages = Paginator.new events.count, 10, params['page']
-    # 总的数据中取出某一页
-    events = events.slice(@events_pages.offset,10)
-    # 按天分组
-    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-=end
     boards = @project.boards.includes(:last_message => :author).all
     @topic_count = @project.boards.count
     # 根据对应的请求，返回对应的数据
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 7e0832257..c694393f3 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -78,7 +78,7 @@
             <% end %>
             <!--Attachment   -->
         <% when "Attachment" %>
-            <%= render :partial => 'users/course_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
+            <%= render :partial => 'users/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
             <!--<div class="problem_main">-->
               <!--<a class="problem_pic fl"><%#= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %></a>-->
 
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb
index b98356c7b..deb0cb4c6 100644
--- a/app/views/users/_project_attachment.html.erb
+++ b/app/views/users/_project_attachment.html.erb
@@ -1,18 +1,32 @@
+
+
 <div class="resources mt10">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+  <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="50" height="50" alt="用户头像"/></a></div>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+    </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo mt-4"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
-        <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
-        <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）</a></div>
-      <div class="homepagePostSubmitContainer">
-        <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
-        <div class="homepagePostDeadline">截止时间：2015-08-20</div>
+      <div class="homepagePostTo break_word mt-4">
+        <% 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.project.name.to_s+" | 项目资源", project_files_path(activity.course), :class => "newsBlue ml15" %>
       </div>
-      <div class="homepagePostIntro">（作业描述）系统中有多个ckeditor，且每个ckeditor的id未知，怎么样做到当光标聚焦某个ckeditor的文本框中，该编辑器的默认值应自动消失的处理；网络拓扑图开发；</div>
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+      <div class="homepagePostTitle break_word" >
+        <%= link_to activity.filename, project_files_path(activity.course), :class => "postGrey" %>
+      </div>
+      <div class="homepagePostSubmitContainer">
+        <div class="homepagePostDeadline mr15">
+          文件大小：
+          <%= number_to_human_size activity.filesize%>
+        </div>
+        <div class="homepagePostDeadline">上传时间：<%= format_time(activity.created_on) %></div>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">