diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index e3e75e7cc..5f41470e9 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -118,8 +118,8 @@ <% else %> <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
- <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %> - + +
<%= select( :name,:group_id, course_group_option(@course), { :include_blank => false,:selected => member.course_group_id}, diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 84aa054e0..4f9dbbe03 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -110,9 +110,16 @@ <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %> <% end %> + <% group_count = 1 %> + <% unless show_nav?(group_count) %> +
  • + 分班 + +
  • + <% end %> <% statistics_count = 0 %> <% unless show_nav?(statistics_count) %> -
  • +
  • 统计
  • diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index 579fe9c87..089365952 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -48,7 +48,7 @@ <% score = st.work_score %>
    <% if is_expand %> - 评分 + 评分 <% end %> <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%> diff --git a/public/images/sy/icons_sy.png b/public/images/sy/icons_sy.png index 645dc4e35..d9cf42db8 100644 Binary files a/public/images/sy/icons_sy.png and b/public/images/sy/icons_sy.png differ diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 760d5fbc9..12f3ecb6c 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -498,6 +498,11 @@ a:hover.sy_btn_orange{ .accordion li.sy_icons_exercise:target > a:before, .accordion li.ssy_icons_exercise > a.active:before { background-position: -23px -290px; } +.accordion li.sy_icons_group > a:before { background-position: 7px -570px; } +.accordion li.sy_icons_group:hover > a:before, +.accordion li.sy_icons_group:target > a:before, +.accordion li.sy_icons_group > a.active:before { background-position: -23px -570px; } + .accordion li.sy_icons_st > a:before { background-position: 5px -330px; } .accordion li.sy_icons_st:hover > a:before, .accordion li.sy_icons_st:target > a:before,