From fd28310e15c9d02deac70a24b30ff49ccf52a320 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 6 May 2015 16:37:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=AA=E9=95=BF=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course.html.erb | 4 ++--
 public/stylesheets/project.css     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb
index 0e1b5caa6..755dd63b0 100644
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@@ -58,14 +58,14 @@
 		<%= content_tag('span',  "#{garble @course.members.count}", :class => "info") %>
          <%= content_tag('span',  l(:label_x_member, :count => memberCount(@course))) %>
 	</p>
-	
+
 	<!--gcm-->
 	<p class="stats">
 		<%= content_tag('span',  link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %>
 		<%= content_tag('span',  l(:label_x_activity, :count => @course_activity_count[@course.id])) %>
 	</p>
 	<!--gcm-->
-	
+
 	<div class="buttons_for_course" style="margin-top:30px;margin-left:144px">
 		<span class="info"></span>
       <% if(course_endTime_timeout? @course) %>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 019ffa57a..c22c90bf8 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -76,7 +76,7 @@ a.problem_name{ color:#ff5722; }
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a.problem_tit02{ color:#0781b4;  font-weight:bold;max-width:400px;}
-.problem_tit_div{ color:#0781b4;  font-weight:bold;width:400px; }
+.problem_tit_div{ color:#0781b4;  font-weight:bold;max-width:400px; }
 a.problem_tit_a{ color:#0781b4;   }
 .problem_tit_a:hover{ color:#09658c;   }
 a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; }

From aabdd1a4d77e3d32b47cb60b0695cf5364e16102 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 6 May 2015 16:56:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=8A=B6=E6=80=81=E6=97=B6=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/trackers_controller.rb      | 13 +++++++------
 app/views/files/_project_file_list.html.erb |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 01bc47a2f..64ad9c83a 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -38,12 +38,13 @@ class TrackersController < ApplicationController
     @tracker ||= Tracker.new(params[:tracker])
     @trackers = Tracker.sorted.all
     @projects = Project.where("project_type = #{Project::ProjectType_project}").all
-    @courses = Course.all
-    @course_activity_count=Hash.new
-    @courses.each do |course|
-      @course_activity_count[course.id]=0
-    end
-    @course_activity_count=get_course_activity @courses,@course_activity_count
+    # 去掉原因，这块代码已经没有用到
+    # @courses = Course.all
+    # @course_activity_count=Hash.new
+    # @courses.each do |course|
+    #   @course_activity_count[course.id]=0
+    # end
+    # @course_activity_count=get_course_activity @courses,@course_activity_count
   end
 
   def create
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index a53ebabc7..3dd5134d7 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -31,7 +31,7 @@
                       <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
                 <% end %>
               <% else %>
-                  <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(frrrffcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc443333333333333333333),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
+                  <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
               <% end %>
           <% else %>
           <% end %>