成员管理
This commit is contained in:
parent
f5be8c5fe9
commit
c04cc8d889
|
|
@ -1,15 +1,86 @@
|
|||
<div class="homepageRightBanner user_bg_shadow bor-grey-e mb10" style="width:973px;" >
|
||||
<div class="NewsBannerName">
|
||||
<%= get_acts_list_type @type %>
|
||||
<div class="homepageRightBanner user_bg_shadow bor-grey-e mb10" style="width:1003px;padding: 0px" >
|
||||
<div class="clearfix bor-bottom-greyE padding10">
|
||||
<div class="NewsBannerName">
|
||||
<%= get_acts_list_type @type %>
|
||||
</div>
|
||||
<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
|
||||
<div class="fr activities_btn">
|
||||
<% if false %>
|
||||
<li class="activities_item">
|
||||
<%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %>
|
||||
<% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %>
|
||||
<% if apply_count > 0 %>
|
||||
<span class="ml10" style="cursor: pointer"><a href="<%= members_course_path(@course) %>" class="edu-cir-orange" data-tip-down="有<%= apply_count %>名助教或教师申请加入课堂，请审批"><%= apply_count %></a></span>
|
||||
<% end %>
|
||||
</li>
|
||||
<% end %>
|
||||
<div class="ml10 edu-dropdown">
|
||||
<span class="mr10 color-orange03">+ 新建</span><i class="fa fa-sort-down fl fr mt3 color-orange03"></i>
|
||||
<ul class="edu-dropdown-menu" id="all_status_list" style="top:29px;left: 4px">
|
||||
<li>
|
||||
<%= link_to '普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-grey" %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to '实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-grey", :remote => true %>
|
||||
</li>
|
||||
<li>
|
||||
<a class="color-grey" onclick="course_files_upload();" style="cursor: pointer">资源</a>
|
||||
</li>
|
||||
<li>
|
||||
<% course_board = @course.boards.where("parent_id is NULL").first %>
|
||||
<%= link_to '帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-grey" %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="fr mt3">
|
||||
<div class="clearfix padding10">
|
||||
<%= link_to "全部", {:controller => "courses", :action => "show", :type => nil}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type.nil? ? 'active' : ''} fl"%>
|
||||
<%= link_to "普通作业", {:controller => "courses", :action => "show", :type => "common_homework"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'common_homework' ? 'active' : ''} fl"%>
|
||||
<%= link_to "实训作业", {:controller => "courses", :action => "show", :type => "shixun_homework"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'shixun_homework' ? 'active' : ''} fl"%>
|
||||
<%= link_to "资源", {:controller => "courses", :action => "show", :type => "attachment"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'attachment' ? 'active' : ''} fl"%>
|
||||
<%= link_to "讨论", {:controller => "courses", :action => "show", :type => "message"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'message' ? 'active' : ''} fl"%>
|
||||
<%= link_to "成员管理", {:controller => "courses", :action => "show", :type => "message"}, :remote => true, :class =>"edu-filter-cir-grey mr15 font-12 #{@type == 'message' ? 'active' : ''} fl"%>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% if false %>
|
||||
<!--TO成员管理-->
|
||||
<div class="resources mt10 user_bg_shadow bor-grey-e">
|
||||
<div class="homepagePostBrief">
|
||||
<div class="homepagePostPortrait">
|
||||
<a href="/images/avatars/User/15739?1501123240" alt="用户头像"><img alt="0" class="bor-radius-all" height="50" src="/images/avatars/User/0" width="50"></a>
|
||||
</div>
|
||||
<div class="homepagePostDes">
|
||||
<div class="homepagePostTitle break_word">
|
||||
<a href="javascript:void(0)" class="color-grey3 fl">蔡世申请加入课堂</a>
|
||||
<span class="post_status_btn post_btn_red ml5 mt5">待处理</span>
|
||||
<span class="post_status_btn post_btn_green ml5 mt5">已处理</span>
|
||||
<a class="fr white-btn orange-btn">同意</a>
|
||||
<a class="fr white-btn orange-btn mr10">拒绝</a>
|
||||
</div>
|
||||
<div class="homepagePostTo break_word clearfix" style="margin-bottom:10px">
|
||||
<a href="/users/DSuperFunGuy" class="newsBlue mr15 color-grey-b">蔡世</a>
|
||||
TO
|
||||
<a href="/courses/792/files" class="newsBlue ml15 color-grey-b">成员管理</a>
|
||||
</div>
|
||||
<div class="fl"><span>提交时间:2017-09-28 15:44</span></div>
|
||||
<div class="fr">
|
||||
<span class="mr20">胡莎莎<span class="color-light-green"> 已同意</span><span class="color-red"> 已拒绝</span></span>
|
||||
<span>处理时间:2017-09-28 15:44</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cl"></div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<%= render :partial => 'courses/course_activity', :locals => {:course_activities => @course_activities,:page => 0,:type => @type} %>
|
||||
|
||||
<script>
|
||||
$(function(){
|
||||
$(".edu-dropdown").hover(function(){
|
||||
$(this).find(".edu-dropdown-menu").show();
|
||||
},function(){
|
||||
$(this).find(".edu-dropdown-menu").hide();
|
||||
})
|
||||
})
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -8,20 +8,22 @@
|
|||
|
||||
<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
|
||||
<div class="homepageRight mt0 " style="width:85%; float:left;">
|
||||
<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
|
||||
<ul class="with100 mb20 ml15 clearfix df activities_btn font-16" style="width:1003px;">
|
||||
<li><%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %>
|
||||
<% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %>
|
||||
<% if apply_count > 0 %>
|
||||
<span class="ml10" style="cursor: pointer"><a href="<%= members_course_path(@course) %>" class="edu-cir-orange" data-tip-down="有<%= apply_count %>名助教或教师申请加入课堂，请审批"><%= apply_count %></a></span>
|
||||
<% end %>
|
||||
</li>
|
||||
<li><%= link_to '+ 发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %></li>
|
||||
<li><%= link_to '+ 发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %></li>
|
||||
<li><a class="color-orange03" onclick="course_files_upload();" style="cursor: pointer">+ 发布资源</a></li>
|
||||
<% course_board = @course.boards.where("parent_id is NULL").first %>
|
||||
<li><%= link_to '+ 发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %></li>
|
||||
</ul>
|
||||
<% if false %>
|
||||
<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
|
||||
<ul class="with100 mb20 ml15 clearfix df activities_btn font-16" style="width:1003px;">
|
||||
<li><%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %>
|
||||
<% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %>
|
||||
<% if apply_count > 0 %>
|
||||
<span class="ml10" style="cursor: pointer"><a href="<%= members_course_path(@course) %>" class="edu-cir-orange" data-tip-down="有<%= apply_count %>名助教或教师申请加入课堂，请审批"><%= apply_count %></a></span>
|
||||
<% end %>
|
||||
</li>
|
||||
<li><%= link_to '+ 发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %></li>
|
||||
<li><%= link_to '+ 发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %></li>
|
||||
<li><a class="color-orange03" onclick="course_files_upload();" style="cursor: pointer">+ 发布资源</a></li>
|
||||
<% course_board = @course.boards.where("parent_id is NULL").first %>
|
||||
<li><%= link_to '+ 发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %></li>
|
||||
</ul>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<div id="course_activities_content">
|
||||
<%= render :partial => 'courses/course_activity_content', :locals => {:course_activities => @course_activities} %>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,15 @@
|
|||
<input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_collaborators" placeholder="输入用户的真实姓名进行搜索" type="text">
|
||||
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
|
||||
</div>
|
||||
<p style="width:560px;background: #f7f9fd;height: 25px">
|
||||
<input id="all_student_select" type="checkbox" name="all_student_select" class="fl mt7 mr5 magic-checkbox" value="">
|
||||
<label for="all_student_select" class="ml10">
|
||||
<span class="span1 edu-txt-w120 task-hide font-bd">姓名</span>
|
||||
<span class="span3 edu-txt-w120 task-hide font-bd">用户ID</span>
|
||||
<span class="span2 edu-txt-w100 task-hide font-bd">职位</span>
|
||||
<span class="span3 edu-txt-w160 task-hide font-bd">单位</span>
|
||||
</label>
|
||||
</p>
|
||||
<div class="clearfix mb15">
|
||||
<ul class="upload_select_box fl" style="overflow-y:auto;width:540px;" id="search_not_teachers_list">
|
||||
<%#= render :partial => 'courses/settings/search_not_teachers_list' %>
|
||||
|
|
|
|||
|
|
@ -6,10 +6,11 @@
|
|||
<!--<i class="fa fa-check-square-o color-blue blue fl" style="display:none;" aria-hidden="true"></i>-->
|
||||
<input id="choose_course_teacher_<%= user.id %>" type="checkbox" class="fl mt7 mr5 magic-checkbox" style="top:0px" name="membership[user_ids][]" value="<%= user.id %>">
|
||||
<label for="choose_course_teacher_<%= user.id %>" style="top:0px">
|
||||
<a href="<%= user_path(user) %>" target="_blank" class="task-hide fl span1 edu-txt-w100"><%= user.show_real_name %>(<%= user.login %>)</a>
|
||||
<span class="fl color-grey span2 ml10"><%= user.identity %></span>
|
||||
<span class="span3 fl ml10 edu-txt-w140 task-hide" style="width: 189px"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
|
||||
</label>
|
||||
<a href="<%= user_path(user) %>" target="_blank" class="task-hide color-grey3 fl span1 edu-txt-w120"><%= user.show_real_name %></a>
|
||||
<span class="task-hide fl color-grey edu-txt-w120 span2"><%= user.login %></span>
|
||||
<span class="task-hide fl color-grey edu-txt-w100 span2"><%= user.identity %></span>
|
||||
<span class="span3 color-grey fl edu-txt-w160 task-hide"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
|
||||
</label>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="task_popup_con">
|
||||
<div class="clearfix mb10 bor-bottom-greyE pb10">
|
||||
<p class="fl mt5">
|
||||
<%= link_to @shixun.owner.try(:show_real_name), user_path(@shixun.owner), :class => "link-name-dark fl", :target => "_blank" %>
|
||||
<%= link_to @shixun.owner.try(:show_real_name), user_path(@shixun.owner), :class => "color-grey3 fl", :target => "_blank" %>
|
||||
<span class="fl mr5 ml3">/</span>
|
||||
<%= link_to @shixun.name, shixun_path(@shixun), :class => "edu-info-dark fl", :target => "_blank" %>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -235,8 +235,12 @@ a:hover.link-name-dark{ color:#5faee3;}
|
|||
.edu-txt-w280{ width:280px; display: block;}
|
||||
.edu-txt-w320{ width:320px; display: block;}
|
||||
.edu-txt-w200{ width:200px; display: block;}
|
||||
a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;}
|
||||
a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;}
|
||||
a.edu-txt-w190,.edu-txt-w190{ width:190px; display: inline-block;text-align: center}
|
||||
a.edu-txt-w160,.edu-txt-w160{ width:160px; display: inline-block;text-align: center}
|
||||
a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;text-align: center}
|
||||
a.edu-txt-w130,.edu-txt-w130{ width:130px; display: inline-block;text-align: center}
|
||||
a.edu-txt-w120,.edu-txt-w120{ width:120px; display: inline-block;text-align: center}
|
||||
a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;text-align: center}
|
||||
.edu-txt-w50{ width:50px;}
|
||||
.edu-w245{ width: 245px; }
|
||||
.overellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ $colors: #fff, #0072B5, #2C3E50;
|
|||
.edu-dropdown-menu{ background-color:#fff; text-align: center; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; top:25px; left:0px; z-index: 999; display:none;}
|
||||
.edu-dropdown-menu li{ height:30px; line-height:30px; display: block; padding:0 15px; text-align: left;}
|
||||
.edu-dropdown-menu li label{ cursor: pointer;}
|
||||
.edu-dropdown-menu li:hover{ color: #5faee3!important;}
|
||||
.edu-dropdown-menu li:hover{ color: #FF7500!important;}
|
||||
/*.edu-dropdown:hover .edu-dropdown-menu{ display: block;}*/
|
||||
.animate{ -webkit-transition: all .3s; -moz-transition: all .3s; -ms-transition: all .3s; -ms-transition: all .3s;
|
||||
transition: all .3s; backface-visibility:hidden; -webkit-backface-visibility:hidden; /* Chrome and Safari */ -moz-backface-visibility:hidden; /* Firefox */ -ms-backface-visibility:hidden; /* Internet Explorer */}
|
||||
|
|
|
|||
|
|
@ -535,10 +535,8 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
|
|||
.flex-cell_homepage:hover{ background-color:#3b94d6;}
|
||||
|
||||
.feedback_error p{display: inline;}
|
||||
.activities_btn{border: 1px solid #FF7500;}
|
||||
.activities_btn li{flex: 1;height: 50px;line-height: 50px;float: left;text-align: center;border-right: 1px solid #FF7500;}
|
||||
.activities_btn li:last-child{border: none;}
|
||||
.activities_btn li:hover{color:#fff!important;background: #FF7500;}
|
||||
.activities_btn li:hover .color-orange03{color: #fff!important;}
|
||||
.activities_btn li .edu-cir-orange{color: #fff!important;}
|
||||
.activities_btn li:hover .edu-cir-orange{background: #fff;color: #FF7500!important;}
|
||||
.activities_btn .activities_item,.activities_btn div{float: left;text-align: center;border-radius: 4px;border: 1px solid #FF7500;padding: 1px 16px;}
|
||||
.activities_btn .activities_item:hover{color:#fff!important;background: #FF7500;}
|
||||
.activities_btn .activities_item:hover .color-orange03{color: #fff!important;}
|
||||
.activities_btn .activities_item .edu-cir-orange{color: #fff!important;}
|
||||
.activities_btn .activities_item:hover .edu-cir-orange{background: #fff;color: #FF7500!important;}
|
||||
Loading…
Reference in New Issue