From d115a97f785d0a242aace0866d2cc95369b91da0 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 4 Dec 2015 16:49:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/courses.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index c2132c3fa..54e550426 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1213,5 +1213,4 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
 .mb10 {margin-bottom: 10px}
 .mb15 {margin-bottom: 15px}
-div.disable_link {background-color: #c1c1c1 !important;}
-div.disable_link :hover {background-color: #c1c1c1}
\ No newline at end of file
+div.disable_link {background-color: #c1c1c1 !important;}
\ No newline at end of file

From 19c34de6432a72d54c1c5b562654da2533eeabd7 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Dec 2015 17:29:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=97=B6=E5=BC=B9=E5=87=BA=E7=9A=84=E4=BD=9C=E5=93=81=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=A1=86=E4=B8=8D=E6=8F=90=E4=BE=9B=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_work_edit_information.html.erb           | 33 +++++++++++++++++++
 app/views/student_work/update.js.erb          |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 app/views/student_work/_work_edit_information.html.erb

diff --git a/app/views/student_work/_work_edit_information.html.erb b/app/views/student_work/_work_edit_information.html.erb
new file mode 100644
index 000000000..38670d9e4
--- /dev/null
+++ b/app/views/student_work/_work_edit_information.html.erb
@@ -0,0 +1,33 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
+    <p class="f14 mt5">
+      <span class="fb">作品名称：</span><%=@student_work.name%>
+    </p>
+    <p class="f14 mt5">
+      <span class="fb">作品描述：</span><%=@student_work.description%>
+    </p>
+    <p class="mt5">
+      <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
+      <% if @student_work.attachments.empty? %>
+          <span class="fl c_red"><%= "无附件"%></span>
+      <% else %>
+          <div class="fl grey_c">
+            <%= render :partial => 'work_attachments_status', :locals => {:attachments => @student_work.attachments, :status => 2} %>
+          </div>
+      <% end %>
+      </p>
+      <div class="cl"></div>
+      <div class="ni_btn mt10">
+        <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
+          确&nbsp;&nbsp;定
+        </a>
+      </div>
+      </div>
+</div>
+
+<script type="text/javascript">
+    function clickOK() {
+        window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/student_work/update.js.erb b/app/views/student_work/update.js.erb
index 79733db31..f485cb8cc 100644
--- a/app/views/student_work/update.js.erb
+++ b/app/views/student_work/update.js.erb
@@ -1,5 +1,5 @@
 <% if @submit_result%>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_edit_information') %>');
 showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +