Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanxd
commit
abe52df8d0
|
|
@ -44,7 +44,10 @@
|
|||
<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"> <%= watcher_link(@bid, User.current) %> <%= link_to("选为作业", fork_path(@bid)) %></td>
|
||||
<td align="center"> <%= watcher_link(@bid, User.current) %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
|
|
@ -66,7 +69,8 @@
|
|||
<td><%= l(:label_investment_time_limit) %><%= @bid.deadline%></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><div style="color: rgb(255, 0, 0); font-size: 14px">该需求已经被 <%= link_to(Bid.where('parent_id = ?', @bid.id).count, show_course_path(@bid), :class => 'reference') %> 个课程引用为作业</div></td>
|
||||
<td><div style="color: rgb(255, 0, 0); font-size: 14px"><%= l(:label_has_been)%> <%= link_to(Bid.where('parent_id = ?', @bid.id).count, show_course_path(@bid), :class => 'reference') %>
|
||||
<%= l(:label_course_userd_by)%></div></td>
|
||||
</tr>
|
||||
</table>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@
|
|||
<td>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>:
|
||||
<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong> </span> <span style="float: right"> <%= link_to(
|
||||
<td colspan="2"><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>
|
||||
在课程: <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %>
|
||||
中布置了作业： <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<span style="float: right">
|
||||
<%= link_to(
|
||||
l(:button_delete),
|
||||
{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
|
||||
:method => :post,
|
||||
|
|
@ -30,9 +32,13 @@
|
|||
<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> <!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %> <%= bid.budget%> <%= l(:label_bids_credit_number) %></span></strong> --> <% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span class="font_lighter"> <% if bid.homework_type == 1%>
|
||||
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
|
||||
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %> </span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
|
||||
<td><span class="font_lighter">
|
||||
<% if bid.homework_type == 1%>
|
||||
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><span style="font-size: 19px"><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></span></strong>)
|
||||
<% else %>
|
||||
<%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><span style="font-size: 19px"><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></span></strong>)</span>
|
||||
<% end %>
|
||||
<span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><span style="font-size: 19px"><%= link_to bid.commit, respond_path(bid) %></span></strong>)</span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@
|
|||
<td>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>
|
||||
<%= l(:label_create_homework)%><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
|
||||
|
||||
<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %> </strong></td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -504,6 +504,7 @@ zh:
|
|||
label_requirement: 需求
|
||||
label_new_course: 课程
|
||||
label_new_homework: 作业
|
||||
label_create_homework: 布置了作业：
|
||||
label_new_contest: 竞赛
|
||||
label_requirement_focus: 关注需求
|
||||
label_developer: 用户
|
||||
|
|
@ -1629,3 +1630,5 @@ zh:
|
|||
label_new_join_order: 请输入课程密码
|
||||
label_task_submit_form_accessory: 作业最终以附件形式提交
|
||||
label_task_submit_form_project: 作业最终以项目形式提交
|
||||
label_has_been: 已经被
|
||||
label_course_userd_by: 个课程引用
|
||||
Loading…
Reference in New Issue