From 5bdcdc607f1424a2e1064db32f3ccbbb34a5f214 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 26 Nov 2015 14:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise.html.erb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index d7a457047..ba82fbf82 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -12,16 +12,6 @@
       </div>
     </li>
 
-    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
-
-    <% if exercise.exercise_status == 1 %>
-        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
-        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
-    <% else%>
-        <li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
-        <li class="polls_date fr">已发布</li>
-    <% end%>
-
     <%# if exercise.exercise_status == 2 %>
         <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
     <%# else %>
@@ -47,6 +37,16 @@
         <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
     <% end%>
 
+    <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
+
+    <% if exercise.exercise_status == 1 %>
+        <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%></li>
+        <li class="polls_date fr"><%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%></li>
+    <% else%>
+        <li class="polls_de_grey fr ml10" title="未发布的试卷才能进行编辑">编辑</li>
+        <li class="polls_date fr">已发布</li>
+    <% end%>
+
 <% else%>
     <% if exercise.exercise_status == 2%>
         <%# if has_commit%>