From 0a5013edd1d078ad4839f45509461b34511da7f6 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Thu, 10 Oct 2013 22:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=9C=A8=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=81=9A=EF=BC=88=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9C=80=E6=B1=82=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_homework.html.erb | 10 +++++++--- app/views/users/show.html.erb | 8 ++++++++ config/locales/zh.yml | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) 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: 男