diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 7b3130026..8169a9b64 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -402,6 +402,9 @@ class CoursesController < ApplicationController @issue_category ||= IssueCategory.new @member ||= @course.members.new @trackers = Tracker.sorted.all + + @roles = Role.givable.all[3..5] + @members = @course.member_principals.includes(:roles, :principal).all.sort else render_403 end diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb new file mode 100644 index 000000000..a7c38038b --- /dev/null +++ b/app/views/courses/_course_members.html.erb @@ -0,0 +1,54 @@ +
+ +
+
+

添加成员

+
+ + 搜索 +
+ +
+ +
+ +
+ 新增成员 +
+
\ No newline at end of file diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb new file mode 100644 index 000000000..d2612d217 --- /dev/null +++ b/app/views/courses/_member.html.erb @@ -0,0 +1,13 @@ +<% @members.each do |member| %> +
  • + <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %> + + <%= h member.roles.sort.collect(&:to_s).join(', ') %> + + 编辑 + <%= delete_link membership_path(member), + :remote => true, + :class => "c_dblue w40 fl", + :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> +
    • +<% end%> \ No newline at end of file diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index 1562bedd5..569ae302b 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -70,52 +70,7 @@
    -
    - -
    -
    -

    添加成员

    -
    - 搜索 -
    -
      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    -
    - -
    -
      -
    • 角色：
      • -
      • -
      • -
      • -
    -
    - 新增成员 -
    -
    + <%= render :partial => "course_members" %>
    \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 11d94e9b2..005f53f2b 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -103,6 +103,7 @@ a:hover.grey_btn{ background:#717171; color:#fff;} .f_14{ font-size:14px;} .c_dblue{ color:#3e6d8e;} .w90{width:90px;} +.w40{width:40px;} .ml10{margin-left:10px;} .resource{ width:670px;} .re_top{width:660px; height:40px; background:#eaeaea; padding:5px;} @@ -240,6 +241,7 @@ a:hover.tijiao{ background:#0f99a9;} .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } .members_left ul li a{ float:left; text-align:center;} .members_left ul li span{ float:left; text-align:center; color:#484747;} + .w150{ text-align:center; width:150px;} .f_b{ font-weight: bold;} .members_right label{ margin-left:15px;}