diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 87a5184f7..2e3f42784 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -225,6 +225,8 @@ class CoursesController < ApplicationController group.name = params[:group_name] group.save end + @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' + @is_remote = true @course_groups = @course.course_groups end def join_group @@ -233,6 +235,7 @@ class CoursesController < ApplicationController member.course_group_id = group.id member.save @group = group + search_group_members group end def unjoin_group @@ -241,6 +244,7 @@ class CoursesController < ApplicationController member.course_group_id = 0 member.save @group = group + search_group_members group end def searchgroupmembers diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 6818b4859..8acd0b577 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -126,13 +126,16 @@ module WatchersHelper text = l(:label_exit_course) if joined - link_to text, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'delete', :id => "#{group.id}", :confirm => l(:text_are_you_sure_out_group), :class => []+options + link_to text, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, + :remote => true, :method => 'delete', + :id => "#{group.id}", :style => "padding: 8px 8px 4px;", + :confirm => l(:text_are_you_sure_out_group), :class => 'group_in' end else text = l(:label_new_join) form_tag({:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'post') do - submit_tag text, class: "submit f_l", style: "width: 43px;height: 21px;" + submit_tag text, class: "group_in", style: "width: 43px;height: 21px;" end end end diff --git a/app/views/courses/_groups_name.html.erb b/app/views/courses/_groups_name.html.erb index 32f85ba21..de8425b45 100644 --- a/app/views/courses/_groups_name.html.erb +++ b/app/views/courses/_groups_name.html.erb @@ -16,10 +16,11 @@ <% if course_groups.any? %> <% course_groups.each do |group| %> + <% group_display = group.name + "(" + group.members.count.to_s + "人)" %>
  • <%= form_tag(searchgroupmembers_course_path(@course,:group_id => group.id), method: 'get', remote: true) do %> <%#= text_field_tag "group_id", params[:group_id] %> - <%= submit_tag group.name, :onclick => "$asign_id(#{group.id})",:style => "background: #f8df8c; border:0px; color: black; float:left;"%> + <%= submit_tag group_display, :onclick => "$asign_id(#{group.id})",:style => "background: #f8df8c; border:0px; color: black; float:left;"%> <% if @canShowCode %> 编辑班级 <% end %> @@ -36,12 +37,13 @@
  • <% end %> <% end %> + <% if @canShowCode %>
  • +添加分班
  • + <% end %> diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index c915587c1..cba88b141 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -1,9 +1,9 @@ -
    +
    <% if @group %> <% if !@canShowCode %> <%= join_in_course_group(@course.course_groups,@group, User.current) %> <% end %>    - <%= @group.name %><%= @subPage_title %> + <%= @group.name %><%= @subPage_title %> <% end %>
    diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css index 81e9f68e4..10d69f384 100644 --- a/public/stylesheets/course_group.css +++ b/public/stylesheets/course_group.css @@ -79,4 +79,18 @@ a:hover.st_add{ color:#ff8e15;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .submit_2{height:21px;border:0; cursor:pointer; background:url(../images/btn1.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } -.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} \ No newline at end of file +.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} +.group_in { + width:60px !important; + height:28px !important; + color:#fff !important; + margin-right:5px !important; + border:none !important; + margin-left:0px !important; + box-shadow: none !important; + + border-radius: 0 !important; + text-shadow: none !important; + border:1px solid #1c9ec7; + background:#1c9ec7; +} \ No newline at end of file