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

Gemfile

@@ -45,10 +45,10 @@ end
 group :test do
   # shoulda的版本做了改动
   #gem "shoulda", "~> 3.3.2"
-  gem "shoulda", "> 3.3.2"
+  #gem "shoulda", "> 3.3.2"
-  gem "mocha", "~> 0.13.3"
+  #gem "mocha", "~> 0.13.3"
-  gem 'capybara', '~> 2.0.0'
+  #gem 'capybara', '~> 2.0.0'
-  gem 'nokogiri', '< 1.6.0'
+  #gem 'nokogiri', '< 1.6.0'
 end
 
 platforms :mri, :mingw do
@@ -56,7 +56,7 @@ platforms :mri, :mingw do
     # RMagick 2 supports ruby 1.9
     # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
     # different requirements for the same gem on different platforms
-    gem "rmagick", ">= 2.0.0"
+    #gem "rmagick", ">= 2.0.0"
   end
 end
 

Gemfile.lock

@@ -52,15 +52,6 @@ GEM
       rails (>= 3, < 5)
     arel (3.0.2)
     builder (3.0.0)
-    capybara (2.0.3)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -73,7 +64,6 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     fastercsv (1.5.0)
-    ffi (1.9.3-x86-mingw32)
     hike (1.2.3)
     i18n (0.6.1)
     journey (1.0.4)
@@ -84,14 +74,10 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.4)
     mime-types (1.23)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
     multi_json (1.7.6)
     mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
-    nokogiri (1.5.11-x86-mingw32)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -121,25 +107,12 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    rmagick (2.13.2)
     ruby-openid (2.1.8)
-    rubyzip (1.1.4)
     sass (3.2.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.42.0)
-      childprocess (>= 0.5.0)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.6.1)
-      activesupport (>= 3.0.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -154,9 +127,6 @@ GEM
     uglifier (1.0.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    websocket (1.0.7)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   x86-mingw32
@@ -167,22 +137,17 @@ DEPENDENCIES
   acts-as-taggable-on (= 2.4.1)
   better_errors!
   builder (= 3.0.0)
-  capybara (~> 2.0.0)
   coderay (~> 1.0.6)
   coffee-rails (~> 3.2.1)
   fastercsv (~> 1.5.0)
   i18n (~> 0.6.0)
   jquery-rails (~> 2.0.2)
-  mocha (~> 0.13.3)
+  mysql2 (= 0.3.11)
-  mysql2 (~> 0.3.11)
   net-ldap (~> 0.3.1)
-  nokogiri (< 1.6.0)
   rack-mini-profiler!
   rack-openid
   rails (= 3.2.13)
-  rmagick (>= 2.0.0)
   ruby-openid (~> 2.1.4)
   sass-rails (~> 3.2.3)
   seems_rateable!
-  shoulda (> 3.3.2)
   uglifier (>= 1.0.3)

app/controllers/projects_controller.rb

@@ -372,6 +372,9 @@ class ProjectsController < ApplicationController
       @bids = @bids.offset(@offset).limit(@limit).all.reverse
     else
       limit = @bid_count % @limit
+      if limit == 0
+        limit = 10
+      end
       @bids = @bids.offset(@offset).limit(limit).all.reverse
     end
     render :layout => 'base_courses'

app/views/layouts/base_users.html.erb

@@ -121,7 +121,7 @@
 														</td>
 													</tr>
                                                   <!-- end -->
-                                                  <tr><td class="score">
+                                                  <!-- <tr><td class="score">
                                                     <%= l(:label_user_grade)%>:
                                                     <%= link_to(format("%.2f" , finall_user_score).to_f, {:controller => 'users',
                                                                                                           :action => 'show_score',
@@ -130,7 +130,7 @@
                                                     }, :style => 'color :#E8770D;') %>
                                                   </td>
                                                   </tr>
-													<!-- end -->
+													-->
 												
 												</table></td>
 											</tr>

public/file_not_found.html

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<title>文件未找到</title>
+<title>File not found</title>
 <style>
 body{
 font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
@@ -16,8 +16,8 @@ font-size:0.8em;
 }
 </style>
 <body>
-  <h1>文件已经损坏</h1>
+  <h1>Sorry, this file can not be downloaded now. </h1>
-  <p>抱歉，因文件已经损坏，请重新上传此文件.</p>
+  <p>Trustie Team.</p>
   <p><a href="javascript:history.back()">Back</a></p>
 </body>
 </html>