Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

ReadMe.txt

@@ -1,4 +1,4 @@
-app\models\setting.rb :165
+app/models/setting.rb :165
   # fixed domain url in development. tantantan's bug
   if Rails.env.development?
     methods.map do |m|
@@ -9,6 +9,10 @@ app\models\setting.rb :165
   为了开发方便，使之功能在development模式下失效。 
   # => nyan
 ================================================================================
+app/controller/projects_controller.rb ===> projects#fake
+  fake filter: 修改了传到页面中的Count后缀的数量
+  改为正确的数量，删掉fake过滤器即可
+================================================================================
 #导航栏匹配域名显示和改变
 app\helper\application_helper.rb
 # rewrite navigation 

app/views/layouts/base_homework.html.erb

@@ -82,6 +82,9 @@
 											<tr>
 												<td><%= l(:label_limit_time) %>: <%= @bid.deadline %></td>
 											</tr>
+											<tr>
+												<td>作业类型: <%=@bid.homework_type==Bid::HomeworkFile ? "提交文件" : "提交项目"%></td>
+											</tr>
 											<% unless @bid.parent_id.nil?%>
 											<tr>
 												<td>