From 7d2bdbc93551348a8808602c1b1342aed584a868 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Wed, 9 Oct 2013 16:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8C=89=E9=92=AE=20=E5=9C=A8=E8=AF=BE=E7=A8=8B=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=85=B3=E6=B3=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=92=8C=E5=85=B3=E6=B3=A8=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_show.html.erb | 5 ++++- app/views/layouts/base_courses.html.erb | 13 +++++++++++-- app/views/projects/_project.html.erb | 20 ++++++++++++++------ app/views/users/_my_homework.html.erb | 6 +++++- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index 75b7ac846..5b3747b12 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -17,7 +17,10 @@ <% unless bid.reward_type == 3 %> - <%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>)<%= l(:label_x_bids_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>) + <% if bid.homework_type == 1%> + <%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %>) + <% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>)<% end %> + <%= l(:label_x_bids_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>) <% else %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 7d7f6f6c9..22929169b 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -52,8 +52,17 @@
<%= @project.name %>
<% unless @course.teacher.id == User.current.id%> - <%= join_in_course(@project, User.current)%> - <% end %> + +
+ <%= join_in_course(@project, User.current)%>
+ <% end %> + <% unless User.current.member_of?(@project) %> + +
+ <%= watcher_link(@project, User.current) %>
+ <% end %> + diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index dca67df5a..d5ced06d4 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -2,11 +2,11 @@
<% if(@project.project_type==1)%> - <% if get_avatar?(project)%> - <%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %> - <% else %> - <%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%> - <% end %> + <% if get_avatar?(project)%> + <%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %> + <% else %> + <%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%> + <% end %> <% else %> <%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
@@ -56,6 +56,7 @@ <% end %> <%= content_tag('span', files_count, :class => "info") %><%= content_tag('span', l(:label_x_data)) %>

+
<% end %> @@ -72,7 +73,7 @@ <% @admin = @project.project_infos%> <% if @admin.size > 0 %> - <%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %> + <%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe) %> <% end %> <% if(@project.project_type==1)%>    大学： @@ -86,6 +87,13 @@ <% unless User.current.member_of?(@project) %> <%= watcher_link(@project, User.current) %> <% end %> + + <% if @project.project_type == 1 %> + <% unless Course.find_by_extra(@project.identifier).tea_id == User.current.id%> + <%= join_in_course(@project, User.current)%> + <% end %> + <% end %> +
diff --git a/app/views/users/_my_homework.html.erb b/app/views/users/_my_homework.html.erb index 5ffdffba4..f34fed314 100644 --- a/app/views/users/_my_homework.html.erb +++ b/app/views/users/_my_homework.html.erb @@ -23,7 +23,11 @@ <% if bid.reward_type.nil? or bid.reward_type == 1 %> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%> <% elsif bid.reward_type == 2 %> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> <% end %> - <%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>)<%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) + + <% if bid.homework_type == 1%> + <%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %>) + <% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>)<% end %> + <%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) <%= format_time bid.created_on %>