From e8234092ec3a2239d9c70d9f39ffadee36eebae3 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 26 Feb 2016 11:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=AD=A6=E6=9C=9F=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb | 17 ++++++++---------
 app/views/courses/copy_course.js.erb    |  2 +-
 db/schema.rb                            |  4 ++--
 public/stylesheets/public.css           |  1 +
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index 0cd8804d9..68184d352 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -92,22 +92,21 @@
       <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
       <div class="cl"></div>
     </li>
-    <li class="ml58">
+    <li class="ml85">
       <label class="fl">复制&nbsp;&nbsp;：</label>
-      <ul class="fl" id="copyResource">
-        <li class="sendCourseName fl mr15 ml5">
-          <label>
+      <ul class="fl" id="copyResource" style="width:544px;">
+        <li class="sendCourseName fl ml5">
+          <label class="fl">
             <input name="course_content_type[]" type="checkbox" value="0" class="resourceCopy"/>
             作业</label>
+            <span class="c_red ml5 fl mb10 w490">复制到新课中的作业将在1个月后发布、2个月后提交截止，请您调整作业的发布时间、截止时间等时间节点。</span>
         </li>
-        <span class="c_red ml5 fl mb10">复制到新课中的作业将在1个月后发布、2个月后提交截止，请您调整作业的发布时间、截止时间等时间节点。</span>
-        <div class="cl"></div>
-        <li class="sendCourseName fl mr15">
-          <label>
+        <li class="sendCourseName fl ml5">
+          <label class="fl">
             <input name="course_content_type[]" type="checkbox" value="1" class="resourceCopy"/>
             资源</label>
+            <span class="c_red ml5 fl mb10">复制到新课的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
         </li>
-        <span class="c_red ml5 fl mb10">复制到新课的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
       </ul>
       <!--<ul class="fl" id="copyResource2">
         <li class="sendCourseName fl mr15">
diff --git a/app/views/courses/copy_course.js.erb b/app/views/courses/copy_course.js.erb
index ca9e3c1f2..83dc80717 100644
--- a/app/views/courses/copy_course.js.erb
+++ b/app/views/courses/copy_course.js.erb
@@ -3,7 +3,7 @@ if(document.getElementById("popbox02")) {
 }
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'copy_course') %>');
 showModal('ajax-modal', '730px');
-$('#ajax-modal').css('height','530px').css('width','730px');
+$('#ajax-modal').css('height','auto').css('width','730px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
 "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");
diff --git a/db/schema.rb b/db/schema.rb
index 99804e63f..61585b59d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -99,6 +99,8 @@ ActiveRecord::Schema.define(:version => 20160225024759) do
     t.integer  "quotes"
     t.integer  "version"
     t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
   end
 
   create_table "attachments", :force => true do |t|
@@ -1276,7 +1278,6 @@ ActiveRecord::Schema.define(:version => 20160225024759) do
     t.text     "description"
     t.integer  "creator_id"
     t.integer  "home_id"
-    t.string   "domain"
     t.boolean  "is_public"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
@@ -1384,7 +1385,6 @@ ActiveRecord::Schema.define(:version => 20160225024759) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 7112bd3f3..8df561d1a 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -157,6 +157,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w430{ width:470px;}
 .w455{width:455px !important;}
 .w465{width:465px !important;}
+.w490{width:490px;}
 .w520{ width:520px;}
 .w543{ width:543px;}
 .w557{ width:557px;}