diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 909661a00..556eb0385 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -34,6 +34,9 @@
+ + + @@ -51,12 +54,13 @@
<%= "课程作业" %>
<%= h @bid.name %>
- - - + + + + diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 14b3556e5..3daeeb116 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -16,11 +16,19 @@ <% case e.act_type %> <% when 'Bid' %> + <% if act.reward_type ==3 %> + <% if e.user == User.current%> + + <% else %> + + <% end %> + <% else %> <% if e.user == User.current%> <% else %> <% end %> + <% end %>
<%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %>
<%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %>
<%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %>
<%= l(:label_limit_time) %>： <%= @bid.deadline %>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %><%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %><%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e302272d2..ecd2ee508 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1434,6 +1434,7 @@ zh: label_project_tool_response: 用户反馈 label_tags_search_result: 搜索结果 label_active_call: 需求 + label_active_homework: 作业 label_tags_call: 需求 label_user_extensions: 其他信息 label_boy: 男