From d2482b64e1aeeb577997c93dc0137e992f146d1f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 5 Sep 2017 09:28:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=97=B6=E4=BC=81=E4=B8=9A=E9=82=AE=E7=AE=B1=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/edu/application.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js
index b462fd9ea..0ee9b8d35 100644
--- a/public/javascripts/edu/application.js
+++ b/public/javascripts/edu/application.js
@@ -194,8 +194,10 @@ function gotoEmail($mail) {
         return 'mail.wo.com.cn/smsmail';
     } else if ($t == '139.com') {
         return 'mail.10086.cn';
+    } else if ($t == 'educoder.net'){
+        return 'qiye.aliyun.com'
     } else {
-        return '';
+        return 'qiye.aliyun.com';
     }
 };
 

From e7c3bb3457d05431f81e0babf7835c28c18aa8c3 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 5 Sep 2017 10:58:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/settings.html.erb  | 32 +++++++++++++++++++---------
 public/stylesheets/css/edu-class.css |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index ae7c6deb5..e70411ce5 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -33,40 +33,52 @@
                   <label class="panel-form-label label fl"><span class="color-orange mr5">*</span>课程名称&nbsp;&nbsp;&nbsp;&nbsp;
                   </label>
                   <div class="pr fl with75">
-                    <input type="text" name="course[course_list]" autocomplete="off" style="width: 100%;" id="edit_course_list" value="<%= @course.course_list_name %>" class="task task-height-40 panel-box-sizing fl color-grey" maxlength="100" placeholder="例如：计算机基础">
+                    <input type="text" name="course[course_list]" autocomplete="off" style="width: 100%;" id="edit_course_list" value="<%= @course.course_list_name %>" class="task task-height-40 panel-box-sizing fl color-grey" maxlength="100" placeholder="例如：数据结构">
                     <ul class="course_list_ul">
                     </ul>
                   </div>
                   <div class="cl"></div>
                   <span class="color-orange fl none" id="edit_course_syllabus_notice" style="margin-left:25%;"><i class="fa fa-exclamation-circle mr5" ></i>请先输入课程</span>
                 </li>
-                <li class="pt20 clearfix">
+                <li class="pt20 clearfix mb40">
                   <label class="panel-form-label label fl"><span class="color-orange mr5">*</span>课堂名称&nbsp;&nbsp;&nbsp;&nbsp;
                   </label>
-                  <input type="text" name="course[name]" id="edit_course_name" value="<%= @course.name %>" class="task task-height-40 panel-box-sizing fl color-grey" maxlength="100" placeholder="例如：软件工程计算机系2016秋季A班" onkeyup="regex_course_name('edit');">
+                  <input type="text" name="course[name]" id="edit_course_name" value="<%= @course.name %>" class="task task-height-40 panel-box-sizing fl color-grey" maxlength="100" placeholder="例如：数据结构2016秋季班级" onkeyup="regex_course_name('edit');">
                   <div class="cl"></div>
                   <span class="color-orange fl none" id="edit_course_name_notice" style="margin-left:25%;"><i class="fa fa-exclamation-circle mr5" ></i>课堂名称不能为空且至少有两个字符</span>
                   <div class="cl"></div>
-                <li class="ml125 mb5 fontGrey3" style="margin-left:25%;"><i class="fa fa-check-circle color-light-green mr5"></i>正确示例：软件工程计算机系2016秋季A班</li>
-                <li class="ml125 fontGrey3" style="margin-left:25%;"><i class="fa fa-times-circle color-orange mr5"></i>错误示例：计算机系2016秋季A班</li>
+                <!--<li class="ml125 mb5 fontGrey3" style="margin-left:25%;"><i class="fa fa-check-circle color-light-green mr5"></i>正确示例：软件工程计算机系2016秋季A班</li>
+                <li class="ml125 fontGrey3" style="margin-left:25%;"><i class="fa fa-times-circle color-orange mr5"></i>错误示例：计算机系2016秋季A班</li>-->
+
+                  <div class="tusi" style="left:108% ">
+                    <div class="entry">
+                      <em></em>
+                      <span class="after"></span>
+                      <p class="color-grey mt10" style="height: 26px;line-height: 26px;">注意：1、课堂名称 = 课程名称 + 学期信息 + 其它</p>
+                      <p class="color-grey ml50" style="height: 26px;line-height: 26px;margin-left: 55px;"><i class="fa fa-check-circle color-light-green mr5"></i>正确示例：数据结构2016秋季班级</p>
+                      <p class="color-grey" style="height: 26px;line-height: 26px;margin-left: 55px;"><i class="fa fa-times-circle color-orange mr5"></i>错误示例：数据结构班级</p>
+                      <p class="color-grey" style="height: 26px;line-height: 26px;margin-left: 42px;">2、如果本学期包含多个班级，只需创建一个课堂</p>
+                      <p class="color-grey mb10" style="height: 26px;line-height: 26px;margin-left: 65px;">然后在课堂内部建立不同的分班</p>
+                    </div>
+                  </div>
                 </li>
                 <li class="pt20 clearfix">
                   <label class="panel-form-label label fl">总学时&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" name="period" id="edit_class_period" value="<%= @course.class_period %>" class="task task-height-40 panel-box-sizing fl cut color-grey" onkeyup="regex_course_class_period('edit');" placeholder="例如&nbsp;&nbsp;30" maxlength="6">
+                  <input type="text" name="period" id="edit_class_period" value="<%= @course.class_period %>" class="task task-height-40 panel-box-sizing fl color-grey" onkeyup="regex_course_class_period('edit');" placeholder="例如&nbsp;&nbsp;30" maxlength="6">
                   <div class="cl"></div>
                   <span class="color-orange fl none" id="edit_course_class_period_notice" style="margin-left:25%;"><i class="fa fa-exclamation-circle mr5" ></i>请输入正整数</span>
                 </li>
                 <li class="pt20 clearfix">
                   <label class="panel-form-label label fl">学分&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" id="edit_course_credit" value="<%= @course.credit %>" name="credit" maxlength="4" class="task task-height-40 panel-box-sizing fl cut color-grey" onkeyup="regex_course_credit('edit');" placeholder="例如&nbsp;&nbsp;4">
+                  <input type="text" id="edit_course_credit" value="<%= @course.credit %>" name="credit" maxlength="4" class="task task-height-40 panel-box-sizing fl color-grey" onkeyup="regex_course_credit('edit');" placeholder="例如&nbsp;&nbsp;4">
                   <div class="cl"></div>
                   <span class="color-orange fl none" id="edit_course_credit_notice" style="margin-left:25%;"><i class="fa fa-exclamation-circle mr5" ></i>请输入正整数或保留一位小数的浮点数</span>
                 </li>
                 <li class="pt20 clearfix">
                   <label class="panel-form-label label fl">结束时间&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" id="edit_course_end_date" value="<%= @course.end_date %>" class="task task-height-40 panel-box-sizing fl cut color-grey" name="end_date" placeholder="请选择结束日期">
+                  <input type="text" id="edit_course_end_date" value="<%= @course.end_date %>" class="task task-height-40 panel-box-sizing fl color-grey" name="end_date" placeholder="请选择结束日期">
                   <div class="cl"></div>
-                  <div class="tusi">
+                  <div class="tusi"style="left:108% ">
                     <div class="entry">
                       <em></em>
                       <span class="after"></span>
@@ -83,7 +95,7 @@
                 </li>
                 <li class="mt20 clearfix pb20">
                   <label class="panel-form-label label fl">&nbsp;&nbsp;</label>
-                  <a href="javascript:void(0);" class="task-btn task-btn-blue fl mr10" onclick="submit_edit_course(<%= @course.id%>);">保存</a>
+                  <a href="javascript:void(0);" class="task-btn task-btn-blue fl mr20" onclick="submit_edit_course(<%= @course.id%>);">保存</a>
                   <%= link_to '取消', course_path(@course), :class => 'task-btn fl ' %>
                 </li>
               </ul>
diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css
index ac7d9d50f..27701f752 100644
--- a/public/stylesheets/css/edu-class.css
+++ b/public/stylesheets/css/edu-class.css
@@ -178,7 +178,7 @@ em{font-style:normal;}
 .stud-class-set .news  .container .basic .bottom ul input.check{width:14px;height:14px;margin-left:126px;}
 .stud-class-set .news  .container .basic .bottom ul li{position:relative;}
 .stud-class-set .news  .container .basic .bottom ul li .tusi{position:absolute;top:20px;left:120%;width:450px;}
-.stud-class-set .news  .container .basic .bottom ul li .tusi .entry {background-color: #FFFEF4;height: 40px;line-height: 40px;border: 1px solid #F3DDB3;width:400px;margin:0 auto;position:relative;
+.stud-class-set .news  .container .basic .bottom ul li .tusi .entry {background-color: #FFFEF4;line-height: 40px;border: 1px solid #F3DDB3;width:400px;margin:0 auto;position:relative;
     text-indent:10px;}
 .stud-class-set .news  .container .basic .bottom ul li .tusi .entry em,.after{display: block;border-width: 9px;
     position: absolute;top: 10px;left: -18px;border-style: dashed solid dashed dashed;border-color: transparent #F3DDB3 transparent transparent;font-size: 0;line-height: 0;}