Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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

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) %>

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 %>

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; }