From c743f5810443a915c82d01ac099e76be17912148 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 15:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E2=80=9D=20=E8=AE=A8=E8=AE=BA=E5=8C=BA=E4=B8=AD=20=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=86=85=E5=AE=B9=E6=A1=86=E6=B2=A1=E6=9C=89=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=EF=BC=8C=E4=B8=94=E6=98=AF=E5=90=A6=E4=B8=BA=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=20#1524?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_form.html.erb | 11 ++++++-----
 config/locales/zh.yml             |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 55aa829c8..047f7d660 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -27,14 +27,15 @@
   <p><label><%= l(:label_board) %></label><br />
     <%# modify by nwb%>
     <% if @message.project %>
-        <%= f.select :board_id, boards_options_for_select(@message.project.boards) %></p>
+        <%= f.select :board_id, boards_options_for_select(@message.project.boards) %>
     <% elsif @message.course %>
-        <%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p>
+        <%= f.select :board_id, boards_options_for_select(@message.course.boards) %>
     <% end %>
+  </p>
 <% end %>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-
-  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <p><label for="message_subject"><%= l(:field_description) %><span class="required"> *&nbsp;&nbsp;</span></label>
+    <%= text_area :quote,:quote,:style => 'display:none' %>
+  </p>
 <p>
 <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
 <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %></p>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 224190060..54585e314 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -276,6 +276,7 @@ zh:
   field_is_default: 默认值
   field_tracker: 跟踪
   field_subject: 主题
+  field_quote: 描述
   field_due_date: 计划完成日期
   field_assigned_to: 指派给
   field_priority: 优先级