Merge branch 'cxt_course' into develop

app/views/courses/_delete_member_group.html.erb

@@ -1,5 +1,5 @@
 <br>
-<div style='width:360px;text-align:center;font-family: "微软雅黑","宋体"' class="f14">
+<div style='width:380px;text-align:center;font-family: "微软雅黑","宋体"' class="f14">
   <% if count == 0 %>
       确定删除分班吗？
   <% else %>

app/views/courses/deletegroup.js.erb

@@ -1,3 +1,4 @@
 hideModal();
 $("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
 $("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
+$("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>");

app/views/courses/new.html.erb

@@ -12,12 +12,15 @@
               <span><%=@syllabus.title %></span>
               <input style="display: none;" name="syllabus_id" value="<%=@syllabus.id %>" />
           <% end %>
+          <div class="cl"></div>
+          <span class="c_red ml80" id="new_course_syllabus_notice" style="display: none;">请先选择课程</span>
         </li>
         <div class="cl"></div>
         <li class="mt10 ml45">
           <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
           <input  type="text" name="course[name]" id="new_course_name" class="courses_input w289" maxlength="100" placeholder="例如：计算机系2016秋季A班" onkeyup="regex_course_name('new');">
-          <span class="c_red" id="new_course_name_notice" style="display: none;">班级名称不能为空且至少有两个字符</span>
+          <div class="cl"></div>
+          <span class="c_red ml80" id="new_course_name_notice" style="display: none;">班级名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li class="ml125 mb5 fontGrey3"><span class="success-icon mr25">正确示例：计算机系2016秋季A班</span></li>

app/views/layouts/_group_children_list.html.erb

@@ -4,7 +4,7 @@
           <li id="course_group_<%=group.id %>">
             <% count = group.members.count %>
             <a href="<%= group_member_course_path(course, :group_id => group.id) %>"><font class="hidden dis" style="max-width: 120px;"><%=group.name %></font><span style="vertical-align: top;"><%=count %></span></a>
-            <% if is_teacher %>
+            <% if User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
               <%= link_to '', search_not_group_member_course_path(@course,:group_id => group.id),:remote => true, :class => "sy_class_add", :title => "添加成员" %>
             <% end %>
           </li>

app/views/syllabuses/new.html.erb

@@ -7,7 +7,8 @@
         <li class="ml45">
           <label><span class="c_red">*</span>&nbsp;课程名称&nbsp;&nbsp;：</label>
           <input type="text" name="title" id="new_syllabus_name" class="name_input" placeholder="例如：软件工程" maxlength="100" onkeyup="regex_syllabus_name();">
-          <span class="c_red" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
+          <div class="cl"></div>
+          <span class="c_red ml80" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
         </li>
         <div class="cl"></div>
         <li class="ml125 fontGrey3"><span class="success-icon mr25">正确示例：软件工程</span><span class="error-icon">错误示例：2016软件工程</span></li>

public/javascripts/course.js

@@ -189,11 +189,14 @@ function regex_syllabus_option(str) {
         var obj = document.getElementById(str + "_syllabus_id");
         var syllabus = obj.options[obj.selectedIndex];
         if(parseInt(syllabus.value) == 0) {
+            $("#"+str+"_course_syllabus_notice").show();
             return false;
         } else{
+            $("#"+str+"_course_syllabus_notice").hide();
             return true;
         }
     } else {
+        $("#"+str+"_course_syllabus_notice").hide();
         return true;
     }
 }