From 04d4fee17ec8735603583b8b8c0a2957760b2c79 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 16 Jun 2015 09:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=AE=9E=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=EF=BC=9A=E6=96=B0=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=9C=A8=E9=82=AE=E4=BB=B6=E4=B8=AD=E4=BD=93=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/_issue.html.erb              | 31 +++++++++----------
 .../mailer/send_for_user_activities.html.erb  |  1 -
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 5145dbb2c..49f137df5 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,46 +1,43 @@
 <!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
 <p>
-
-      <span class="c_blue" style="color:#1b55a7;">
+    <span class="c_blue" style="color:#1b55a7;">
         <%= link_to(h("#{@author.login}(#{@author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
-     </span><%= l(:mail_issue_title_userin)%>
-  <span class="c_blue" style="color:#1b55a7;"><%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></span><%= l(:mail_issue_title_active)%></p>
+    </span><%= l(:mail_issue_title_userin)%>
+    <span class="c_blue" style="color:#1b55a7;"><%= link_to(h("#{@issue.project.name}"), @project_url, :style=>'color:#1b55a7; font-weight:bold;') %></span><%= l(:mail_issue_title_active)%>
+</p>
 <div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
-<ul style="list-style-type:none; margin:0; padding:0;">
-	<li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
-	<li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
-	<li style="list-style-type:none; margin:0; padding:0; float: left; "><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 526px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+    <li style="list-style-type:none; margin:0; padding:0;float: left; "><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 526px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+    <li style="list-style-type:none; margin:0; padding:0; float: left; "><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
 
         	<% if @journal.nil? %>
-                 <%= issue.description=='' ? l(:label_none) : issue.description %>
+                 <%= issue.description=='' ? l(:label_none) : issue.description.html_safe %>
             <% else %>
-            	<%= @journal.notes=='' ? l(:label_none) : @journal.notes %>
+            	<%= @journal.notes=='' ? l(:label_none) : @journal.notes.html_safe %>
            <% end%>
         </span>
     </li>
     <li style="list-style-type:none; margin:0; padding:0;float: left; ">
       <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong></span>
       <% if @issue.attachments.count == 0 %>
-        <%= l(:label_none)%>
+          <%= l(:label_none)%>
       <% else %>
         <span style="float: left; width: 526px; margin:0; padding:0;">
           <% @issue.attachments.each do |attach| %>
           <p style="float: left; width: 526px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
         <% end %></span>
       <% end %>
-
-
     </li>
-</ul>
+  </ul>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
   <label  class="mail_reply">
-  	<%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
-  	</label>
+    <%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
-
 <li><%#=l(:field_status)%>: <%#=h issue.status %></li>
 <li><%#=l(:field_priority)%>: <%#=h issue.priority %></li>
 <li><%#=l(:field_assigned_to)%>: <%#=h issue.assigned_to %></li>
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 5c89be1b8..9c64af22e 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -97,7 +97,6 @@
                     </li>
                 <% end %>
             <% end %>
-
             <div class="cl"></div>
           </ul><!--作业动态 end-->
       <% end %>