From 652f5fa6e130a1d316530557803a4716fb1a7672 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 18 Aug 2015 17:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E7=9A=84=E7=95=99=E8=A8=80=E5=88=97=E8=A1=A8=E3=80=81=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E3=80=81=E6=9C=80=E8=BF=91=E7=99=BB=E5=BD=95=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=9A=84=E7=BC=BA=E9=99=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/course_messages.html.erb    |  4 ++--
 app/views/admin/latest_login_users.html.erb |  6 +++---
 app/views/admin/leave_messages.html.erb     |  4 ++--
 app/views/admin/messages_list.html.erb      | 10 +++++++---
 app/views/admin/project_messages.html.erb   |  4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/course_messages.html.erb b/app/views/admin/course_messages.html.erb
index 3db0a3e11..c9e69357f 100644
--- a/app/views/admin/course_messages.html.erb
+++ b/app/views/admin/course_messages.html.erb
@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程ID)">
+        来源(课程ID)
       </th>
       <th style="width: 50px;">
         作者
diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index 838cc0dcb..89514726a 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -9,10 +9,10 @@
         <%= l(:label_filter_plural) %>
       </legend>
       <label style="float:left">开始日期：</label>
-      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange =>"regexDeadLine();", :style=>"float:left"%>
-      <%= calendar_for('startdate')%>
+      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange=>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('startdate')%><span style="float: left ">&nbsp;&nbsp;&nbsp;</span>
       <label style="float:left">结束日期：</label>
-      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"regexDeadLine();", :style=>"float:left"%>
+      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
       <%= calendar_for('enddate')%> &nbsp;
       <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
       <%= link_to l(:button_clear), {:controller => 'admin', :action => 'latest_login_users'}, :class => 'icon icon-reload' %>
diff --git a/app/views/admin/leave_messages.html.erb b/app/views/admin/leave_messages.html.erb
index 360e9b864..dee8b7443 100644
--- a/app/views/admin/leave_messages.html.erb
+++ b/app/views/admin/leave_messages.html.erb
@@ -13,8 +13,8 @@
       <th style="width: 50px;">
         类型
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(课程或用户ID)">
+        来源(课程或用户ID)
       </th>
       <th style="width: 50px;">
         留言人
diff --git a/app/views/admin/messages_list.html.erb b/app/views/admin/messages_list.html.erb
index e0c84279d..ca84baa24 100644
--- a/app/views/admin/messages_list.html.erb
+++ b/app/views/admin/messages_list.html.erb
@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(贴吧ID)">
+        来源(贴吧ID)
       </th>
       <th style="width: 50px;">
         作者
@@ -50,7 +50,11 @@
             <%= format_date(memo.created_at) %>
           </td>
           <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title='<%=memo.subject %>'>
-            <%= link_to(memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% if memo.parent_id.nil? || memo.subject.starts_with?('RE:')%>
+                <%= link_to(memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% else %>
+                <%= link_to("RE:"+memo.subject, forum_memo_path(memo.forum, memo)) %>
+            <% end %>
           </td>
           <td class="center">
             <%= link_to(memo.replies_count, forum_memo_path(memo.forum, memo)) %>
diff --git a/app/views/admin/project_messages.html.erb b/app/views/admin/project_messages.html.erb
index dc44a7cba..a5639eba7 100644
--- a/app/views/admin/project_messages.html.erb
+++ b/app/views/admin/project_messages.html.erb
@@ -11,8 +11,8 @@
       <th style="width: 30px;">
         序号
       </th>
-      <th style="width: 30px;">
-        来源
+      <th style="width: 30px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="来源(项目ID)">
+        来源(项目ID)
       </th>
       <th style="width: 50px;">
         作者