From ef441d3bcad2f6709ee682fe26870eb74ac4d6b0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Jan 2016 19:43:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_course_homework.html.erb | 2 +-
 app/views/users/_course_homework.html.erb             | 2 +-
 app/views/users/_user_homework_detail.html.erb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 658fa82e6..18277fece 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -147,7 +147,7 @@
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
         <div class="mt10">
           <% projects = activity.student_work_projects.where("is_leader = 1") %>
-          <div class="fl mr20 fontGrey3 w80">
+          <div class="fl mr20 fontGrey3">
             已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
           </div>
           <div class="cl"></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 99315d5af..7a357b11c 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -147,7 +147,7 @@
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
       <div class="mt10">
         <% projects = activity.student_work_projects.where("is_leader = 1") %>
-        <div class="fl mr20 fontGrey3 w80">
+        <div class="fl mr20 fontGrey3">
           已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index d2420491c..05077eb26 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -150,7 +150,7 @@
       <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
           <div class="mt10">
             <% projects = homework_common.student_work_projects.where("is_leader = 1") %>
-            <div class="fl mr20 fontGrey3 w80">
+            <div class="fl mr20 fontGrey3">
               已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
             </div>
             <div class="cl"></div>

From 75e2eecc3709fea14b97de121f181816e952196e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Jan 2016 20:23:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E7=82=B9=E5=87=BB=E5=BC=80=E8=AF=BE=E5=AD=A6=E6=9C=9F?=
 =?UTF-8?q?=E6=88=96=E7=BB=93=E6=9D=9F=E5=AD=A6=E6=9C=9F=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E2=80=9C=E5=A4=8D=E5=88=B6=E5=AD=A6=E6=9C=9F?=
 =?UTF-8?q?=E2=80=9D=E5=85=A5=E5=8F=A3=E8=A6=81=E5=BC=80=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_term_select.html.erb | 5 +++--
 app/views/courses/copy_course.js.erb    | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_term_select.html.erb b/app/views/courses/_term_select.html.erb
index e295e7c94..0bada4c11 100644
--- a/app/views/courses/_term_select.html.erb
+++ b/app/views/courses/_term_select.html.erb
@@ -12,13 +12,14 @@
     </div>
     <div class="cl"></div>
     <div class="mt15 grey_c lh22">
+      <%= link_to "复制学期", copy_course_course_path(@course.id),:remote=>true, :class => "term_btn fl" %>
       <!--<a href="javascript:" class="term_btn fl" onclick="copyTerm();">
         复制学期
       </a>-->
-      <div class="disable_btn fl">
+      <!--<div class="disable_btn fl">
         <span style="display: inline-block">复制学期</span>
         <span style="display: inline-block">(开发中...)</span>
-      </div>
+      </div>-->
       复制学期将为您创建一个新的课程学期，新学期将继承本学期的相关资源，具体您稍后可以选择。
     </div>
     <div class="cl"></div>
diff --git a/app/views/courses/copy_course.js.erb b/app/views/courses/copy_course.js.erb
index e31e423ba..ca9e3c1f2 100644
--- a/app/views/courses/copy_course.js.erb
+++ b/app/views/courses/copy_course.js.erb
@@ -1,3 +1,6 @@
+if(document.getElementById("popbox02")) {
+    hideModal("#popbox02");
+}
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'copy_course') %>');
 showModal('ajax-modal', '730px');
 $('#ajax-modal').css('height','530px').css('width','730px');