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

app/helpers/application_helper.rb

@@ -2349,22 +2349,25 @@ module ApplicationHelper
 
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
-    if is_teacher #老师显示作品数量
-      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
-    else #学生显示提交作品、修改作品等按钮
-      work = cur_user_works_for_homework homework
-      if work.nil?
-        link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
-      else
-        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品已交",  "javascript:void(0)", :class => 'c_blue', :title => "开启匿评后不可修改作品"
-        elsif homework.homework_type == 2 #编程作业不能修改作品
-          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+    if User.current.member_of_course?(homework.course)
+      if is_teacher #老师显示作品数量
+        link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      else #学生显示提交作品、修改作品等按钮
+        work = cur_user_works_for_homework homework
+        if work.nil?
+          link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
-          link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+          if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+            link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
+          elsif homework.homework_type == 2 #编程作业不能修改作品
+            link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          else
+            link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
+          end
         end
       end
     end
+
   end
 
   def student_anonymous_comment homework

app/views/student_work/_add_score.html.erb

@@ -16,7 +16,7 @@
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
       <%end%>
-      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();">提交</a>
+      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= @work.id%>').html('');">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>

app/views/student_work/_evaluation_un_work.html.erb

@@ -3,7 +3,7 @@
   <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
     <ul>
       <li class="hworkPortrait mt15 mr10">
-        <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
+        <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
       </li>
       <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
         <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">

app/views/student_work/_evaluation_work.html.erb

@@ -13,7 +13,7 @@
               <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
             </div>
           </li>
-          <li>
+          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <ul class="mt10 fl">
               <li class="hworkStName mr10 mt16" title="姓名">
                 <%= student_work.user.show_name%>
@@ -32,7 +32,7 @@
               <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
             </div>
           </li>
-          <li>
+          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
             <ul class="mt10 fl">
               <li class="hworkStName mr10 mt16" title="姓名">
                 匿名
@@ -46,7 +46,7 @@
 
     </ul>
   </li>
-  <li class="hworkList130 c_grey">
+  <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
     <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
         <span class="c_red">[迟交]</span>

app/views/student_work/index.html.erb

@@ -6,17 +6,17 @@
   });
 
     // 匿评弹框提示
-  <% if @is_evaluation && !@stundet_works.empty?%>
-      $(function(){
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/praise_alert') %>');
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-          "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-          $('#ajax-modal').parent().css("top","").css("left","");
-          $('#ajax-modal').parent().addClass("anonymos");
-      });
-  <% end%>
+  <%# if @is_evaluation && !@stundet_works.empty?%>
+//      $(function(){
+//          $('#ajax-modal').html('<%#= escape_javascript(render :partial => 'student_work/praise_alert') %>');
+//          showModal('ajax-modal', '500px');
+//          $('#ajax-modal').siblings().remove();
+//          $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+//          "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+//          $('#ajax-modal').parent().css("top","").css("left","");
+//          $('#ajax-modal').parent().addClass("anonymos");
+//      });
+  <%# end%>
 
   //设置评分规则
   function set_score_rule(){

app/views/users/_course_homework.html.erb

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