From 26550bf0a042824359bc15f78724d8c883debad4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 9 Oct 2014 09:07:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9B=BD=E9=99=85=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=202.=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=9C=81=E7=95=A5=E5=8F=B7=E5=87=BA=E7=8E=B0=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_form.html.erb   | 4 ++--
 app/views/messages/_project_show.html.erb | 6 +++---
 config/locales/zh.yml                     | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 036ce2912..1b1c86b64 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -41,7 +41,7 @@
                   <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
                     <span class="required"> *&nbsp;&nbsp;</span></span>
                   <span class="info" style="width: 10px;">
-                    <%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %>
+                    <%= text_field_tag :class_period, @course.class_period, :placeholder => "#{l(:lable_input_class)}", :maxlength => 5 %>
                   </span>
                   <span>&nbsp;<strong><%= l(:label_class_hour) %></strong></span>
                 </td>
@@ -56,7 +56,7 @@
               <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
                 <span class="required"> *&nbsp;&nbsp;</span></span>
               <span class="info" style="width: 10px;">
-                <%= text_field_tag :class_period, nil, :placeholder => "在此输入课时", :maxlength => 5 %>
+                <%= text_field_tag :class_period, nil, :placeholder => "#{l(:lable_input_class)}", :maxlength => 5 %>
               </span>
               <strong><%= l(:label_class_hour) %></strong>
             </td>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index ad55e9be7..028be4b83 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -96,11 +96,11 @@
     </p>
   </div>
   <div class="memo-section" style="width: 100%;word-break: break-all;word-wrap: break-word;">
-    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
+    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 53%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(29, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(29,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index aeaa344e9..7ddff7d04 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2143,3 +2143,5 @@ zh:
   lable_bar_active: 贴吧动态
   lable_student_list_visable: 学生列表是否公开
   lable_sure_exit_project: 是否确认退出该项目
+  lable_input_class: 在此输入课时
+  lable_input_class_vilidate: 学时只能为整数