From 4641f8cd6374559a4587277f600a0b91dc529435 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Thu, 26 Sep 2013 10:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E7=94=A8=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=B8=AD=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_fork_form.html.erb       | 2 +-
 app/views/layouts/base_homework.html.erb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/bids/_fork_form.html.erb b/app/views/bids/_fork_form.html.erb
index 2fbc10b3b..b84404527 100644
--- a/app/views/bids/_fork_form.html.erb
+++ b/app/views/bids/_fork_form.html.erb
@@ -2,7 +2,7 @@
 <%= error_messages_for 'bid' %>
 <!--[form:project]-->
 <p><%= l(:label_homeworks_form_new_description) %></p>
-<p><%= select_tag 'course', course_options_for_select(@courses) %></p>
+<p>选择课程<%= select_tag 'course', course_options_for_select(@courses) %></p>
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :value => @bid.name %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;">
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index a20f4e6f4..52c2fe3c8 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -49,7 +49,13 @@
 											</tr>
 											<tr>
 												<td><%= l(:label_limit_time) %>： <%= @bid.deadline %></td>
-											</tr>											
+											</tr>
+											<% unless @bid.parent_id.nil?%>
+											<tr>
+												<td><div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; -o-text-overflow: ellipsis; width:200px">
+													作业来源：<%= link_to(Bid.find(@bid.parent_id).name, respond_path(Bid.find(@bid.parent_id))) %></div></td>
+											</tr>
+											<% end %>											
 										</table>
 									</div>