jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
huang 2016-11-11 17:57:45 +08:00
parent bb871b5a77 6ee9b12c5d
commit e6354c82cf
6 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/courses/_new_member_list.html.erb
View File

@ -1,6 +1,6 @@
<% is_teacher = User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
<% if members.any? %>
<table class="sy_new_table clear sy_new_table_width" cellpadding="0" cellspacing="0">
<table class="sy_new_table clear sy_new_table_width" cellpadding="0" cellspacing="0" id="student_list_table">
<thead>
<tr class="clear">
<th class="sy_th6">序号</th>
@ -123,7 +123,7 @@
<%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id, :group_id => @group && @group != -1 ? @group.id : -1},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
<div class="select-class-option">
<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>
<a href="javascript:void(0)" class="sy_icons_edit pic_edit_icon fr mt9 options_show_or_hide" alt="编辑" style="background-position:0 5px;"></a>
</div>
<%= select( :name,:group_id, course_group_option(@course),
{ :include_blank => false,:selected => member.course_group_id},
@ -136,7 +136,7 @@
</td>
<% if is_teacher %>
<td>
<a href="javascript:void(0)" onClick="delete_confirm_box('<%=delete_member_course_path(@course, :member_id => member.id) %>', '确认删除该成员吗？');" class="sy_icons_del fl"></a>
<a href="javascript:void(0)" onClick="delete_confirm_box('<%=delete_member_course_path(@course, :member_id => member.id) %>', '确认删除该成员吗？');" class="sy_icons_del fl options_show_or_hide"></a>
</td>
<% end %>
</tr>
@ -159,6 +159,11 @@
<script>
$(document).ready(function(){
// $("#student_list_table").mouseover(function(){
// $(".options_show_or_hide").show();
// }).mouseout(function(){
// $(".options_show_or_hide").hide();
// });
$(".pic_edit_icon").click(function(){
$(this).parent().hide();
$(this).parent().next().show();

1
app/views/courses/delete_member.js.erb
View File

@ -2,3 +2,4 @@ hideModal();
$("#member_li_<%=params[:member_id] %>").html("");
$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>");
$("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>");
$("#student_number").html("<%= studentCount(@course) %>");

3
app/views/courses/updategroupname.js.erb
View File

@ -2,4 +2,5 @@
* Created by Administrator on 2014/12/3.
*/
$("#st_groups").html("<%= escape_javascript( render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
$("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>");

4
app/views/poll/_other_poll.html.erb
View File

@ -17,8 +17,9 @@
</li>
<% end %>
</div>
<p class="none c_red" style="margin-left: 33px;" id="error_show"></p>
<div class="cl"></div>
<a href="javascript:void(0);" class="fr sy_btn_blue mr35" onclick="submit_quote();">导&nbsp;&nbsp;入</a>
<a href="javascript:void(0);" class="fr sy_btn_blue mr35" id="submit_quote" onclick="submit_quote();">导&nbsp;&nbsp;入</a>
<a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="hideModal();">取&nbsp;&nbsp;消</a>
<% end -%>
</div>
@ -38,6 +39,7 @@
closeModal();
}else{
$('#error_show').html('您没有选择任何问卷');
$('#error_show').show();
}
}
</script>

7
app/views/syllabuses/new.html.erb
View File

@ -11,7 +11,10 @@
<span class="c_red ml80" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
</li>
<div class="cl"></div>
<li class="ml125 fontGrey3"><span class="success-icon mr25">正确示例：软件工程</span><span class="error-icon">错误示例：2016软件工程</span></li>
<li class="ml125 fontGrey3"><span class="success-icon mr70">正确示例：</span><span class="error-icon">错误示例：</span></li>
<li class="ml125 mt5 fontGrey3"><span class="ml25 mr70">软件工程</span><span style="margin-left: 37px;">2016软件工程</span></li>
<li class="ml125 mt5 fontGrey3"><span class="ml25 mr70">统计学原理</span><span style="margin-left: 25px;">统计学原理计算机系</span></li>
<li class="ml125 mt5 fontGrey3"><span class="ml25 mr70">并行处理</span><span style="margin-left: 36px;">并行处理2016秋季A班</span></li>
<li class="mt10 ml45">
<label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
<input type="text" name="eng_name" id="new_syllabus_eng_name" placeholder="例如：Software Engineering" class="name_input" maxlength="100">
@ -29,7 +32,7 @@
<em style="top: 9px;"></em>
<span style="top: 9px;"></span>
<p>
课程是针对一个具体的学科方向开展的教学内容与进程安排。<br/>本质上，一门课程就是一个教学计划。
课程是针对一个具体的学科方向开展的教学内容与进程安排<br/>本质上，一门课程就是一个教学计划<br/><br/>班级是实行教学任务的群体，创建班级后才能开展在线教学
</p>
</div>
</div><!--talknew end-->

1
public/stylesheets/css/common.css
View File

@ -195,6 +195,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.mt6{ margin-top:6px;}
.mt7 {margin-top:7px;}
.mt8{ margin-top:8px !important;}
.mt9{ margin-top:9px !important;}
.mt10{ margin-top:10px !important;}
.mt12 { margin-top:12px !important;}
.mt15 {margin-top:15px;}