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

1.作业排序按钮显示顺序 

2.配置课程->配置   关闭课程 -> 关闭  加入课程->加入
This commit is contained in:
sw 2014-11-04 16:19:52 +08:00
parent cc69b06616
commit 13c362b08d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/watchers_helper.rb
View File

@ -99,7 +99,7 @@ module WatchersHelper
# 主讲教师不允许退出课程 # 主讲教师不允许退出课程
return '' if user.id == course.tea_id || course.is_public == 0 return '' if user.id == course.tea_id || course.is_public == 0
joined = user.member_of_course?(course) joined = user.member_of_course?(course)
text = joined ? l(:label_exit_course) : l(:label_join_course) text = joined ? l(:label_exit_course) : l(:label_new_join)
url_t = join_path(:object_id => course.id) url_t = join_path(:object_id => course.id)
url_f = try_join_path(:object_id => course.id) url_f = try_join_path(:object_id => course.id)
method = joined ? 'delete' : 'post' method = joined ? 'delete' : 'post'

15
app/views/homework_attach/_homeworks_list.html.erb
View File

@ -9,14 +9,15 @@
(<font color="#CC0000"> (<font color="#CC0000">
<%= homework_count%> <%= homework_count%>
</font>) </font>)
</span><span class="fr"> </span>
<span class="fr">
按&nbsp; 按&nbsp;
<%= link_to l(:label_teacher_score), sort_homework_path(@bid, 't_socre', @direction), {:remote => true}%> <%= link_to l(:label_anonymous_comments), sort_homework_path(@bid, 's_socre', @direction), {:remote => true}%>
&nbsp;/&nbsp; &nbsp;/&nbsp;
<%= link_to l(:label_anonymous_comments), sort_homework_path(@bid, 's_socre', @direction), {:remote => true}%> <%= link_to l(:label_teacher_score), sort_homework_path(@bid, 't_socre', @direction), {:remote => true}%>
&nbsp;/&nbsp; &nbsp;/&nbsp;
<%= link_to l(:label_time), sort_homework_path(@bid, 'time', @direction), {:remote => true}%> <%= link_to l(:label_time), sort_homework_path(@bid, 'time', @direction), {:remote => true}%>
&nbsp;<%= l(:label_sort) %> &nbsp;<%= l(:label_sort) %>
</span> </span>
</div> </div>
<% end %> <% end %>

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

@ -88,7 +88,7 @@
<div id="join_in_course"> <div id="join_in_course">
<% if User.current.logged? %> <% if User.current.logged? %>
<% if User.current.allowed_to?(:as_teacher,@course) %> <% if User.current.allowed_to?(:as_teacher,@course) %>
<%= link_to l(:label_course_modify_settings), {:controller => 'courses', :action => 'settings', :id => @course} %> <%= link_to l(:button_configure), {:controller => 'courses', :action => 'settings', :id => @course} %>
<%= render :partial => 'courses/set_course_time', :locals => {:course => @course} %> <%= render :partial => 'courses/set_course_time', :locals => {:course => @course} %>
<% else %> <% else %>
<%= join_in_course(@course, User.current) %> <%= join_in_course(@course, User.current) %>

2
config/locales/zh.yml
View File

@ -1886,7 +1886,7 @@ zh:
label_bids_task_list: 作业列表 label_bids_task_list: 作业列表
label_join_course: 加入课程 label_join_course: 加入课程
label_exit_course: 退出课程 label_exit_course: 退出
label_new_join: 加入 label_new_join: 加入
label_new_course_password: 课程密码 label_new_course_password: 课程密码
label_new_course_school: 开课学校 label_new_course_school: 开课学校