From c365f32a17f597db753f39be539bd7df5ffc7ce7 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 10 Oct 2015 14:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=89=E4=BA=9B=E9=82=AE=E4=BB=B6=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailer/send_for_user_activities.html.erb  | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 3f761fbd4..23cbe6176 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -224,13 +224,15 @@
                   <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name",
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_issue_update) %></span>
-                  <% if issues_journal.notes.blank? || issues_journal.notes.nil? %>
-                      <%= link_to truncate(issues_journal.issue.subject.html_safe, length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
-                                  :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  <% else %>
-                      <%= link_to truncate(issues_journal.notes.html_safe, length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value),
-                                  :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  <% end %>
+                  <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue,  :token => @token.value),
+                              :style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;",
+                              :onmouseover =>"message_titile_show($(this),event)",
+                              :onmouseout => "message_titile_hide($(this))"
+                %>
+                  <div  style="display: none">
+                    <div class="fl"><strong>更新内容：</strong></div>
+                    <div class="ml60"><%=  issues_journal.notes.html_safe  %></div>
+                  </div>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(issues_journal.created_on) %></span>
                 </li>
             <% end %>
@@ -290,9 +292,9 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_wiki_mail_notification) %></span>
                   <% unless wikicontent.page.nil? %>
-                    <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value),
+                    <%= link_to wikicontent.text.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value),
                               :class => 'wmail_info',
-                              :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
+                              :style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                    <% end %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(wikicontent.updated_on) %></span>
                 </li>
@@ -520,3 +522,15 @@
 </div>
 </div>
 
+<script>
+    function message_titile_show(obj,e)
+    {
+        obj.next("div").show();
+        obj.next("div").css("top",e.pageY).css("left",e.pageX).css("position","absolute");
+    }
+    function message_titile_hide(obj)
+    {
+        obj.next("div").hide();
+    }
+</script>
+