From f13665959aa9b10e46c3ecca1f24734ce21512ac Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 8 Nov 2013 17:26:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20=E9=A1=B9=E7=9B=AE=E6=96=B0?= =?UTF-8?q?=E9=97=BB=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_homework_show.html.erb | 66 +++++++++------------- app/views/bids/contest.html.erb | 7 +-- app/views/news/index.html.erb | 2 +- app/views/projects/homework.html.erb | 2 - app/views/users/index.html.erb | 7 +-- public/stylesheets/application.css | 5 ++ 6 files changed, 37 insertions(+), 52 deletions(-) diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index f77f90c86..042ab0401 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -1,19 +1,16 @@ - + <% bids.each do |bid|%> - - - - +
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %>
+
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> - +
- + ) %> <% end %> - + + - + + + - - - - -
<%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author)) %> - <%= l(:label_user_create_project_homework) %>:   + <%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author)) %> + <%= l(:label_user_create_project_homework) %> <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %> - <%= l(:field_deadline) %> : <%=bid.deadline %> - - <% if (User.current.admin?||User.current.id==bid.author_id)%> + + <% if (User.current.admin?||User.current.id==bid.author_id) %> <%= link_to( l(:button_edit), {:action => 'edit', :controller=>'bids', :project_id =>@project.id, :bid_id => bid.id}, @@ -25,12 +22,19 @@ :method => :post, :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del' - ) %>
- +
+ <% 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) %>) <% if betweentime(bid.deadline) < 0 %> <%= l(:label_commit_limit)%> @@ -40,44 +44,28 @@ <% else %> <% end %> <% end %> -
- - - - + -
<% if bid.reward_type.nil? or bid.reward_type == 1 %> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %> + <% 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 %>
- <% 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) %>)<%= bid.description %>
<%= l(:label_create_time) %> : <%=format_time bid.created_on %>
-
- - - + + -
<%= bid.description%> <%= l(:label_create_time) %> : <%=format_time bid.created_on %> <%= l(:field_deadline) %> : <%=bid.deadline %>
-
+ <% end %> +