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

app/helpers/application_helper.rb

@@ -2366,6 +2366,8 @@ module ApplicationHelper
           end
         end
       end
+    else
+      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
     end
 
   end

app/views/users/_course_homework.html.erb

@@ -24,12 +24,10 @@
           <span class="grey_btn_cir ml10">匿评已结束</span>
       <% end%>
       <div class="homepagePostSubmitContainer">
-        <% if User.current.member_of_course?(activity.course) %>
+        <div class="homepagePostSubmit">
-            <div class="homepagePostSubmit">
+          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
-              <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
+          <%= user_for_homework_common activity,is_teacher %>
-              <%= user_for_homework_common activity,is_teacher %>
+        </div>
-            </div>
-        <% end %>
 
         <% if activity.homework_type == 2 && is_teacher%>
             <div class="homepagePostSubmit">