From 25a39ed8280eec82cf792ab8b7850ec871ecbca9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 30 Sep 2017 18:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_index_tab.html.erb | 5 +++--
 app/views/exercise/_exercises_list.html.erb     | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/exercise/_exercise_index_tab.html.erb b/app/views/exercise/_exercise_index_tab.html.erb
index a9ae2f47a..8eaf28572 100644
--- a/app/views/exercise/_exercise_index_tab.html.erb
+++ b/app/views/exercise/_exercise_index_tab.html.erb
@@ -12,8 +12,9 @@
   <%= form_tag(exercise_index_path(:course_id => @course.id, :type => @type), :remote => true , :method => 'get', :id => 'exercise_search_form') do %>
       <div class="edu-find fr with95 mr20 pr">
         <div class="edu-find-input">
-          <input type="text" class="task-form-100 panel-box-sizing" name="search" placeholder="输入试卷名称进行搜索" value="<%= @search %>" id="exercise_name_search">
-          <i class="fa fa-close mr5 color-grey edu-close" onclick="close_searchbox();"></i>
+          <input type="text" class="with100 panel-box-sizing" name="search" placeholder="输入试卷名称进行搜索" value="<%= @search %>" id="exercise_name_search">
+          <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+          <span class="edu-close" onclick="colse_searchbox();" data-tip-down="关闭">×</span>
         </div>
         <a href="javascript:void(0);" onclick="$('#exercise_search_form').submit();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
       </div>
diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb
index 98732d61e..ed1030a52 100644
--- a/app/views/exercise/_exercises_list.html.erb
+++ b/app/views/exercise/_exercises_list.html.erb
@@ -26,10 +26,10 @@
               <% end %>
             </p>
           </div>
+          <% if @is_teacher %>
           <div class="fr edu-position edu-position-hidebox mr20 mt5">
             <a href="javascript:void(0);"><i class="fa fa-bars font-16"></i></a>
             <ul class="edu-position-hide undis">
-              <% if @is_teacher %>
                   <% if exercise.exercise_status == 1 %>
                       <li><%= link_to "编辑", edit_exercise_path(exercise) %></li>
                   <% end %>
@@ -43,11 +43,9 @@
                   <% end %>
                   <!--<li><a href="javascript:void(0)">加入题库</a></li>-->
                   <li><a href="javascript:void(0)" onclick="delete_confirm_box_3('<%= exercise_path(exercise) %>', '确定要删除该试卷吗？')">删除</a></li>
-              <% else %>
-
-              <% end %>
             </ul>
           </div>
+          <% end %>
         </div>
       <% end %>
     </div>