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:
cxt 2016-09-30 17:04:25 +08:00
parent 23f1c3175c 7d3847656b
commit bcd76d2b9f
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,8 +118,8 @@
<% else %> <% else %>
<%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %> <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
<div class="select-class-option"> <div class="select-class-option">
<span class=""><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span> <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="编辑"></a> <a href="javascript:void(0)" class="sy_icons_edit pic_edit_icon" alt="编辑" style="background-position:0 5px;"></a>
</div> </div>
<%= select( :name,:group_id, course_group_option(@course), <%= select( :name,:group_id, course_group_option(@course),
{ :include_blank => false,:selected => member.course_group_id}, { :include_blank => false,:selected => member.course_group_id},

9
app/views/layouts/base_courses.html.erb
View File

@ -110,9 +110,16 @@
<%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %> <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
</li> </li>
<% end %> <% end %>
<% group_count = 1 %>
<% unless show_nav?(group_count) %>
<li id="sy_09" class="sy_icons_group">
<a href="<%=course_member_path(@course, :role => 2) %>">分班<span></span></a>
<!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
</li>
<% end %>
<% statistics_count = 0 %> <% statistics_count = 0 %>
<% unless show_nav?(statistics_count) %> <% unless show_nav?(statistics_count) %>
<li id="sy_09" class="sy_icons_st"> <li id="sy_10" class="sy_icons_st">
<a href="<%=statistics_course_course_path(@course) %>">统计<span></span></a> <a href="<%=statistics_course_course_path(@course) %>">统计<span></span></a>
<!--<a href="javascript:void(0);" class="sy_class_add"></a>--> <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
</li> </li>

2
app/views/student_work/_evaluation_un_group_member_work.html.erb
View File

@ -48,7 +48,7 @@
<% score = st.work_score %> <% score = st.work_score %>
<div class="<%= score_color score%> student_final_scor_info ml35 pr" style="display: inline"> <div class="<%= score_color score%> student_final_scor_info ml35 pr" style="display: inline">
<% if is_expand %> <% if is_expand %>
<span style="position: absolute;top: -33px; color: #3b94d6" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</span> <span style="position: absolute;top: -33px; color: #3b94d6; white-space:nowrap;" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</span>
<% end %> <% end %>
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
<% unless score.nil?%> <% unless score.nil?%>

BIN
public/images/sy/icons_sy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

5
public/stylesheets/syllabus.css
View File

@ -498,6 +498,11 @@ a:hover.sy_btn_orange{
.accordion li.sy_icons_exercise:target > a:before, .accordion li.sy_icons_exercise:target > a:before,
.accordion li.ssy_icons_exercise > a.active:before { background-position: -23px -290px; } .accordion li.ssy_icons_exercise > a.active:before { background-position: -23px -290px; }
.accordion li.sy_icons_group > a:before { background-position: 7px -570px; }
.accordion li.sy_icons_group:hover > a:before,
.accordion li.sy_icons_group:target > a:before,
.accordion li.sy_icons_group > a.active:before { background-position: -23px -570px; }
.accordion li.sy_icons_st > a:before { background-position: 5px -330px; } .accordion li.sy_icons_st > a:before { background-position: 5px -330px; }
.accordion li.sy_icons_st:hover > a:before, .accordion li.sy_icons_st:hover > a:before,
.accordion li.sy_icons_st:target > a:before, .accordion li.sy_icons_st:target > a:before,