1.增加开启匿评之后学生能提交作业

2.修改学生作业编辑和删除样式

app/views/bids/_bid_homework_show.html.erb

@@ -58,16 +58,10 @@
                 <span style="float: right">
                   <% if User.current.logged? && is_cur_course_student(@course) %>
                      <% cur_user_homework = cur_user_homework_for_bid(bid) %>
-                      <% if cur_user_homework!= nil && cur_user_homework.empty? %>
+                      <% if cur_user_homework && cur_user_homework.empty? %>
-                          <% if bid.comment_status == 0 || bid.comment_status == 2%>
+                         <span class="span_wping">
-                            <span class="span_wping">
+                           <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
-                              <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
+                         </span>
-                            </span>
-                          <% else %>
-                            <span title="匿评阶段不可提交作业！" class="span_wping">
-                              <a style="width:80px; margin:20px 0 0 350px;background:#8e8e8e;">提交作业</a>
-                            </span>
-                          <% end %>
                       <% else %>
                           <span style="color: green; float: right">
                             <%= l(:lable_has_commit_homework)%>

app/views/courses/homework.html.erb

@@ -9,7 +9,9 @@
   <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @course.id).first.roles&Role.where(id: [3, 4, 7, 9] )).size >0))%>
     <%= link_to(l(:label_course_homework_new), {:controller => 'courses', :action => 'new_homework'}, :class => 'icon icon-add') %>
   <% else %>
-	<span class="font_lighter"><%= l(:label_coursejoin_tip) %></span>
+	<span class="font_lighter">
+      <%= l(:label_coursejoin_tip) %>
+    </span>
   <% end %>
 </div>
 <div id="bid-show">

app/views/homework_attach/_homework.html.erb

@@ -49,8 +49,8 @@
 <% else %>
     <!-- 是学生 -->
     <% if is_my_homework %>
-        <!-- 我的作品，显示为编辑和删除 -->
+        <!-- 我的作品，在未开启匿评和未使用匿评，显示为编辑和删除 -->
-        <% if @bid.comment_status == 0 %>
+        <% if @bid.comment_status == 0 || @bid.open_anonymous_evaluation == 0 %>
             <li class="wmine" style="padding-top: 4px;">
               <%= link_to l(:button_edit), edit_homework_attach_path(homework) %>
               <%  if homework.user == User.current || User.current.admin? %>
@@ -68,10 +68,14 @@
               <a style="color:#8e8e8e;"><%= l(:button_edit) %></a>
               <%  if homework.user == User.current || User.current.admin? %>
                   <!-- 作业创建者显示删除作业 -->
-                  <a style="color:#8e8e8e;"><%=l(:label_bid_respond_delete)%></a>
+                  <a style="color:#8e8e8e;">
+                    <%=l(:label_bid_respond_delete)%>
+                  </a>
               <% else %>
                   <!-- 作业参与者显示退出作业 -->
-                  <a style="color:#8e8e8e;"><%=l(:label_logout) %></a>
+                  <a style="color:#8e8e8e;">
+                    <%=l(:label_logout) %>
+                  </a>
               <% end %>
             </li>
         <% end %>
@@ -88,7 +92,9 @@
         <% elsif @bid.comment_status == 2%>
             <!-- 处于匿评已关闭阶段,不容许评分 -->
             <li class="wping" title="关闭匿评后不可继续评分">
-              <a style="background:#8e8e8e;"><%= l(:label_anonymous_comments) %></a>
+              <a style="background:#8e8e8e;">
+                <%= l(:label_anonymous_comments) %>
+              </a>
               <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
                   <span class="c_red">&nbsp;&nbsp;迟交！</span>
               <% end %>

app/views/homework_attach/_homeworks_list.html.erb

@@ -35,16 +35,9 @@
             </span>
           </li>
           <li class="c_red" style="margin:25px 0 0 20px;"> 您还没交作业，请创建作业！</li>
-          <% if @bid.comment_status == 0 ||  @bid.open_anonymous_evaluation == 0%>
-              <!-- 老师布置的作业在创建和开启匿评这段时间才允许创建作品 -->
               <li class="wping">
                 <%= link_to "提交作业", new_exercise_book_path(@bid), :style => "width:80px; margin:20px 0 0 350px;" %>
               </li>
-          <% else %>
-              <li class="wping" title="匿评阶段不可提交作业！">
-                <a style="width:80px; margin:20px 0 0 350px;background:#8e8e8e;">提交作业</a>
-              </li>
-          <% end %>
         </ul>
         <div class="cl"></div>
     <% end %>

public/stylesheets/css.css

@@ -55,7 +55,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-hei
 .c_grey{ color:#999; font-weight:normal;}
 .dis ul li.wname02 a{ width:200px; font-size:14px; color:#595959; padding:20px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
 .dis ul li.wmine{ margin:12px 0 0 10px;}
-.dis ul li.wmine a{ color:#3d7ec2; text-align:center; width:50px; font-weight: bold;}
+.dis ul li.wmine a{ color:#3d7ec2; text-align:center; width:50px; font-weight: bold;line-height: 1.9;}
 .wzan{ margin:15px 0 0 25px; width:32px; height:44px;}
 .wzan a{ display: block;text-align: center;}
 a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}