From 193f83b7208d36e2703574b648e5c8bdd6eb274f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 3 Nov 2015 10:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=B8=BB=E9=A1=B5=20?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E4=BC=A0=20=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=B9=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_upload_course_files.erb | 2 +-
 app/views/layouts/base_courses.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 7eafcaabc..62d5c68e4 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -22,7 +22,7 @@
           <%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %>
           </div>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
 
       <% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 11eeb8659..39de4faeb 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -253,7 +253,7 @@
             $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_course_files',:locals => {:course => @course,:course_attachment_type => 1}) %>');
             showModal('ajax-modal', '513px');
             $('#ajax-modal').siblings().remove();
-            $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+            $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
             $('#ajax-modal').parent().css("top","").css("left","");
             $('#ajax-modal').parent().addClass("popbox_polls");
     }