Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

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 %>
                       <div class="select-class-option">
-                        <span class=""><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
-                        <a href="javascript:void(0)" class="sy_icons_edit pic_edit_icon" alt="编辑"></a>
+                        <span class="hidden" style="display:inline-block; vertical-align:middle; max-width:70px;"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                        <a href="javascript:void(0)" class="sy_icons_edit pic_edit_icon" alt="编辑" style="background-position:0 5px;"></a>
                       </div>
                       <%= select( :name,:group_id, course_group_option(@course),
                                   { :include_blank => false,:selected => member.course_group_id},

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 %>
               </li>
           <% end %>
+          <% group_count = 1 %>
+          <% unless show_nav?(group_count) %>
+              <li id="sy_09" class="sy_icons_group">
+                <a href="<%=course_member_path(@course, :role => 2) %>">分班<span></span></a>
+                <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
+              </li>
+          <% end %>
           <% statistics_count = 0 %>
           <% unless show_nav?(statistics_count) %>
-              <li id="sy_09" class="sy_icons_st">
+              <li id="sy_10" class="sy_icons_st">
                 <a href="<%=statistics_course_course_path(@course) %>">统计<span></span></a>
                 <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
               </li>

app/views/student_work/_evaluation_un_group_member_work.html.erb

@@ -48,7 +48,7 @@
           <% score = st.work_score %>
           <div class="<%= score_color score%> student_final_scor_info ml35 pr" style="display: inline">
             <% if is_expand %>
-                <span style="position: absolute;top: -33px; color: #3b94d6" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</span>
+                <span style="position: absolute;top: -33px; color: #3b94d6; white-space:nowrap;" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</span>
             <% end %>
             <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
             <% unless score.nil?%>

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,