kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs 

Conflicts:
	app/views/courses/settings/_search_not_students_list.html.erb
This commit is contained in:
cxt 2017-09-22 20:38:55 +08:00
parent 5fc722a5cd 85071cb1ae
commit d230ac9511
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/courses/settings/_add_teachers.html.erb
View File

@ -1,5 +1,5 @@
<!-------------------添加教师\助教--------------------------->
<div class="task-popup newteacher" style="width:600px;">
<div class="task-popup newteacher" style="width:688px;">
<div class="task-popup-title clearfix task-popup-bggrey">
<h3 class="fl ">添加教师/助教</h3>
<a href="javascript:void(0);" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
@ -7,8 +7,8 @@
<div class="task_popup_con">
<div class="newupload_conbox clearfix">
<%= form_tag url_for(course_memberships_path(@course)), :remote => true, :method => :post, :id => 'add_teacher_form' do |f| %>
<div class="left fl" style="width:415px;">
<div class="mb10 edu-position" style="width:400px;">
<div class="left fl" style="width:535px;">
<div class="mb10 edu-position" style="width:520px;">
<input type="hidden" value="<%= @course.id %>" id="course_search_not_teacher_id">
<input class="task-form-100 task-height-40 panel-box-sizing" id="search_not_teacher" placeholder="输入用户的真实姓名进行搜索" type="text">
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
@ -19,7 +19,7 @@
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
</div>
<div class="clearfix mb15">
<ul class="upload_select_box fl" style="overflow-y:auto;width:380px;" id="search_not_teachers_list">
<ul class="upload_select_box fl" style="overflow-y:auto;width:500px;" id="search_not_teachers_list">
<%#= render :partial => 'courses/settings/search_not_teachers_list' %>
</ul>
</div>

14
app/views/courses/settings/_search_not_teachers_list.html.erb
View File

@ -1,4 +1,12 @@
<% unless @users.empty? %>
<p>
<input id="add_student" type="checkbox" class="fl mt7 mr5 magic-checkbox" name="membership[user_ids][]" value="">
<label for="add_student">
<span class="span1 edu-name-dark edu-txt-w140 task-hide font-bd" style="text-align: center">姓名</span>
<span class="span2 ml10 edu-txt-w140 task-hide font-bd" style="text-align: center">学号</span>
<span class="span3 ml10 edu-txt-w140 task-hide font-bd" style="text-align: center">用户ID</span>
</label>
</p>
<% @users.each do |user| %>
<% if user && user.user_extensions %>
<li class="clearfix">
@ -6,9 +14,9 @@
<!--<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>
<a href="<%= user_path(user) %>" target="_blank" class="task-hide fl span1 edu-txt-w140"><%= user.show_real_name %>(<%= user.login %>)</a>
<span class="span2 ml10 edu-txt-w140 task-hide" style="text-align: center"><%= user.identity %></span>
<span class="span3 ml10 edu-txt-w140 task-hide" style="text-align: center"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
</label>
</li>
<% end %>