diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 7216b60e..6244cb4e 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -9,42 +9,57 @@
<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
- + - - <% if User.current.id == @bid.author_id %> - <% end %> - + @@ -52,24 +67,12 @@ <%= b_project.created_at%> -
+ <%= link_to(b_project.project.name, project_path(b_project.project)) %> <%= l(:label_join_bidding)%> + + + <%if @bid.reward_type == 2%> <% if get_prize(b_project).nil? or get_prize(b_project) == "" %> 未评奖 <% else %> <% case get_prize(b_project) %> <% when '0' %> - 一等奖 + <%= image_tag("/images/bid/first_reward.png")%> <% when '1' %> - 二等奖 + <%= image_tag("/images/bid/second_reward.png")%> <% when '2' %> - 入围奖 + <%= image_tag("/images/bid/qualified.png")%> <%end%> <% end %> + <% end %> + <%= toggle_link '评价', b_project.id.to_s %> + +
<%= b_project.project.description %><%= b_project.project.description %>
- - - - + + + + +
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 009cfbd3..18294d0c 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -57,19 +57,17 @@
<% end %> - - <% else %> <% if User.current.logged? %> <% end %>
<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>) - <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> +
<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
- <% end %> +
diff --git a/app/views/bids/set_reward.js.erb b/app/views/bids/set_reward.js.erb index 1e469eb3..e7c048e6 100644 --- a/app/views/bids/set_reward.js.erb +++ b/app/views/bids/set_reward.js.erb @@ -5,11 +5,11 @@ $('#reward_result_<%= @biding_project_id %>').html('<%= j( else case get_prize(@b_p) when '0' - '一等奖' + image_tag("/images/bid/first_reward.png") when '1' - '二等奖' + image_tag("/images/bid/second_reward.png") when '2' - '入围奖' + image_tag("/images/bid/qualified.png") else '未评奖' end diff --git a/public/images/bid/award.png b/public/images/bid/award.png new file mode 100644 index 00000000..9f407fca Binary files /dev/null and b/public/images/bid/award.png differ diff --git a/public/images/bid/candidate.png b/public/images/bid/candidate.png new file mode 100644 index 00000000..a08e8bed Binary files /dev/null and b/public/images/bid/candidate.png differ diff --git a/public/images/bid/first_reward.png b/public/images/bid/first_reward.png new file mode 100644 index 00000000..06765279 Binary files /dev/null and b/public/images/bid/first_reward.png differ diff --git a/public/images/bid/obsolete.png b/public/images/bid/obsolete.png new file mode 100644 index 00000000..a907dd9e Binary files /dev/null and b/public/images/bid/obsolete.png differ diff --git a/public/images/bid/qualified.png b/public/images/bid/qualified.png new file mode 100644 index 00000000..6b3f1efd Binary files /dev/null and b/public/images/bid/qualified.png differ diff --git a/public/images/bid/second_reward.png b/public/images/bid/second_reward.png new file mode 100644 index 00000000..e7ab9d4e Binary files /dev/null and b/public/images/bid/second_reward.png differ