From 967fb6dc9a6d88ea70ff2e6a083de32cbe68464b Mon Sep 17 00:00:00 2001 From: nieguanghui Date: Tue, 17 Dec 2013 20:49:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=09=E5=AE=9E=E8=B7=B5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B->=E2=80=9C=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9C=E6=8F=90=E4=BA=A4=E6=83=85?= =?UTF-8?q?=E5=86=B5=E2=80=9D,=E2=80=9D=E4=BD=9C=E4=B8=9A=E2=80=9D?= =?UTF-8?q?=E5=90=8E=E5=BA=94=E8=AF=A5=E5=8A=A0=E6=95=B0=E9=87=8F=E3=80=90?= =?UTF-8?q?=E5=85=89=E8=BE=89=20=E5=91=A8=E4=BA=8C=E3=80=91=202=E3=80=81?= =?UTF-8?q?=09=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B->url=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AFcourse=E3=80=90=E5=85=89?= =?UTF-8?q?=E8=BE=89=20=E5=91=A8=E4=BA=8C=E3=80=91=203=E3=80=81=09?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E2=80=94=E5=8F=82=E4=B8=8E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=20=E5=8F=82=E4=B8=8E=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=AFUTC=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=B8=8E=E5=85=B6=E4=BB=96=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E4=B8=80=E8=87=B4=EF=BC=9B=E3=80=90?= =?UTF-8?q?=E5=91=A8=E4=BA=8C=20=E5=85=89=E8=BE=89=E3=80=91=204=E3=80=81?= =?UTF-8?q?=09=E5=88=9B=E6=96=B0=E7=AB=9E=E8=B5=9B=E2=80=94>=E5=8F=82?= =?UTF-8?q?=E4=B8=8E=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=B8=AD=E6=AF=8F?= =?UTF-8?q?=E4=B8=AA=E9=A1=B9=E7=9B=AE=E5=90=8D=E5=90=8E=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E2=80=9C=E5=8F=82=E4=B8=8E=E4=BA=86=E5=BA=94=E6=A0=87=E2=80=9C?= =?UTF-8?q?=E5=BA=94=E6=94=B9=E4=B8=BA=E2=80=9D=E5=8F=82=E4=B8=8E=E4=BA=86?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E2=80=9C=EF=BC=8C=E2=80=9C=E5=BA=94=E6=A0=87?= =?UTF-8?q?=E4=BA=BA=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E5=8F=82=E8=B5=9B?= =?UTF-8?q?=E4=BA=BA=E2=80=9D=E3=80=90=E5=85=89=E8=BE=89=E5=91=A8=E4=BA=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework_list.html.erb | 2 +- app/views/bids/_list_projects.html.erb | 38 ++++++++++++++++------- app/views/bids/_project_homework.html.erb | 2 +- app/views/projects/course.html.erb | 2 +- app/views/welcome/index.html.erb | 1 + config/locales/zh.yml | 3 ++ 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index f016eafc5..0bbdc1348 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -4,7 +4,7 @@
- + - +
<%= l(:label_task_plural)%><%= l(:label_task_plural)%>(<%= @homework_list.count%>)
<%= text_field_tag 'student_id', params[:student_id], :size => 30 %> diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 6947f8ceb..6663ab6e2 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -3,10 +3,7 @@
- - - - + <% else %> - - + <% end %>
<%= l(:label_task_plural)%><%= l(:label_task_plural)%>
<%= text_field_tag 'student_id', params[:student_id], :size => 30 %> @@ -19,9 +16,6 @@ <% end %> <% bidding_project.each do |b_project|%> <% if b_project.project %> - - - @@ -142,7 +144,7 @@
@@ -38,7 +32,15 @@ <%= link_to(b_project.project.name, project_path(b_project.project)) %> - <%= l(:label_join_bidding)%> + + <% if @bid.reward_type == 2 %> + <%= l(:label_join_contest)%> + <% end %> + <% if @bid.reward_type == 1 %> + <%= l(:label_join_bidding)%> + <% end %> + +
- <%= b_project.created_at%> + <%= format_time b_project.created_at%>
@@ -170,7 +172,13 @@
<%= l(:label_bidding_user) %> + + <% if @bid.reward_type == 2%> + <%= l(:label_contest_user) %> + <% end %> + <% if @bid.reward_type == 1 %> + <%= l(:label_bidding_user) %> + <% end %> <% unless b_project.user.nil? %> <%= b_project.user.lastname %><%= b_project.user.firstname %> <% end %> @@ -185,7 +193,15 @@
<%= l(:label_bidding_reason) %><%= b_project.description %> + + <% if @bid.reward_type == 2%> + <%= l(:label_contest_reason) %> + <% end %> + <% if @bid.reward_type == 1 %> + <%= l(:label_bidding_reason) %> + <% end %> + <%= b_project.description %>
diff --git a/app/views/bids/_project_homework.html.erb b/app/views/bids/_project_homework.html.erb index 5013e2a8d..952867b94 100644 --- a/app/views/bids/_project_homework.html.erb +++ b/app/views/bids/_project_homework.html.erb @@ -30,7 +30,7 @@
<%= b_project.project.description %>
<%= b_project.created_at%><%= b_project.created_at %>
diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index 8c1212c46..d7235aa3f 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -25,7 +25,7 @@ - <%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> + <%= link_to "forge.trustie.net/project/course", :controller => 'projects', :action => 'course', :project_type => 1 %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course', :project_type => 1 %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 99f9a5c31..5d142c4f4 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -263,6 +263,7 @@

    用户动态

    + <%= link_to "更多>>", { :controller => 'users', :action => 'index'} %>
    <% find_all_activities.each do |event| %>
  • diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 245f53ec0..15c957e42 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1748,3 +1748,6 @@ zh: label_project_module_forums: 公共贴吧 label_memo_locked: 帖子已被锁定 label_downloads_list: 进入附件列表 + label_join_contest: 参与了竞赛 + label_contest_user: 参赛人： + label_contest_reason: 参赛宣言： \ No newline at end of file