From 6867a88a94a2540ca99a5e2ac35b843e76661408 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 16:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=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   | 2 +-
 app/views/courses/new.html.erb            | 4 ++--
 app/views/courses/settings.html.erb       | 4 ++--
 app/views/layouts/_syllabus_info.html.erb | 2 +-
 app/views/syllabuses/edit.html.erb        | 2 +-
 public/stylesheets/syllabus.css           | 4 +++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index c1c4d1c2f..139fa81f1 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -98,7 +98,7 @@
     <li class=" mb5 ml85">
       <label >公开&nbsp;&nbsp;：</label>
       <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox" value="<%=@course.is_public.to_i %>">
-      <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
+      <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
       <div class="cl"></div>
     </li>
     <li class="ml85">
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 7e054e7c8..7a14fd572 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -58,13 +58,13 @@
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="course_is_public" name="course[is_public]"  type="checkbox" value="1">
-          <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
+          <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
           <label >学生列表公开&nbsp;&nbsp;：</label>
           <input id="course_open_student" name="course[open_student]"  type="checkbox" value="1">
-          <span class="c_grey">（选中后班级外用户可见学生列表，否则仅对班级内成员可见）</span>
+          <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
           <div class="cl"></div>
         </li>
         <li class=" mb5 ml30">
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index b4ed33d62..cee69fd75 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -76,13 +76,13 @@
           <li class=" mb5 ml80">
             <label >公开&nbsp;&nbsp;：</label>
             <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox">
-            <span class="c_grey">（选中后班级外用户可见该班级，否则仅对班级内成员可见）</span>
+            <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生列表公开&nbsp;&nbsp;：</label>
             <input <%= @course.open_student == 1 ? 'checked' : ''%> id="course_open_student" name="course[open_student]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（选中后班级外用户可见学生列表，否则仅对班级内成员可见）</span>
+            <span class="c_grey">（选中后对所有用户可见，否则仅对本班级成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
index 61aa011c3..b67cb4c4d 100644
--- a/app/views/layouts/_syllabus_info.html.erb
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -5,7 +5,7 @@
   <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %>
 </div>
 <div class="fl ml15">
-  <p class="homepageImageName mb5" title="<%=@syllabus.title %>"><%=@syllabus.title %></p>
+  <p class="homepageSyllabusName mb5" title="<%=@syllabus.title %>"><%=@syllabus.title %></p>
   <div class="cl"></div>
 </div>
 <div class="cl"></div>
diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
index 395fa1c5b..a23bf9cb8 100644
--- a/app/views/syllabuses/edit.html.erb
+++ b/app/views/syllabuses/edit.html.erb
@@ -5,7 +5,7 @@
   <p >课程信息</p>
 </div>
 <div class="HomeWork">
-  <p class="f16 mb10">课程信息</p>
+  <p class="f16 mb10"><%=@syllabus.title %>课程大纲</p>
   <div class="HomeWorkCon">
     <%= labelled_form_for @syllabus, :url =>syllabus_path(@syllabus),
                           :html => {:nhname=>'form',:multipart => true, :id => 'syllabus-form'} do |f| %>
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 88c8cebbf..bc4fef274 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -153,4 +153,6 @@ a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap
 a:hover.course-title{ color:#269ac9;}
 
 /*新建页面*/
-.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
\ No newline at end of file
+.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
+
+.homepageSyllabusName {font-size:16px; color:#484848; height:25px; float:left; font-weight: bold; max-width:120px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;}