From e950208e386aabea37381d76996cb8b2ec7093aa Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 22 Jan 2015 22:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=20sina=E9=82=AE=E7=AE=B1IE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/_issue.html.erb              | 12 ++++++------
 app/views/mailer/issue_edit.html.erb.BASE.erb | 19 -------------------
 .../mailer/issue_edit.html.erb.LOCAL.erb      | 11 -----------
 .../mailer/issue_edit.html.erb.REMOTE.erb     | 19 -------------------
 4 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 app/views/mailer/issue_edit.html.erb.BASE.erb
 delete mode 100644 app/views/mailer/issue_edit.html.erb.LOCAL.erb
 delete mode 100644 app/views/mailer/issue_edit.html.erb.REMOTE.erb

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index d11248aff..cd5fbc091 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -6,10 +6,10 @@
   <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;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url, :style=>'color:#1b55a7; font-weight:bold;') %></span></li>
-	<li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+	<li style="list-style-type:none; margin:0; padding:0;"><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;"><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;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
-		<span style="float: left; width: 500px">
+		<span style="float: left; width: 526px">
         	<% if @journal.nil? %>
                  <%= issue.description %>
             <% else %>
@@ -20,10 +20,10 @@
     <li style="list-style-type:none; margin:0; padding:0;">
 
       <% unless @issue.attachments.nil? %>
-        <span style="float: left; margin:0; padding:0;"> <strong><%= l(:mail_issue_attachments)%></strong></span>
-        <span style="float: left; width: 500px; margin:0; padding:0;">
+        <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong></span>
+        <span style="float: left; width: 526px; margin:0; padding:0;">
           <% @issue.attachments.each do |attach| %>
-          <p style="float: left; width: 500px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
+          <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 %>
 
diff --git a/app/views/mailer/issue_edit.html.erb.BASE.erb b/app/views/mailer/issue_edit.html.erb.BASE.erb
deleted file mode 100644
index 6fcb0ddb5..000000000
--- a/app/views/mailer/issue_edit.html.erb.BASE.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<div>
-  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
-
-  <ul>
-    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
-      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
-        <li><%= string %></li>
-      <% end %>
-    <% end %>
-  </ul>
-
-  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-</div>
-<div class="cl"></div>
-<hr/>
-
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
-
diff --git a/app/views/mailer/issue_edit.html.erb.LOCAL.erb b/app/views/mailer/issue_edit.html.erb.LOCAL.erb
deleted file mode 100644
index f7412402c..000000000
--- a/app/views/mailer/issue_edit.html.erb.LOCAL.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
-
-  
-</div>
-<div class="cl" style="margin-top: 15px; clear:both; overflow:hidden;"></div>
-<hr/>
-
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url, :style=>'font-size:12px; font-weight:normal; color:#1b55a7;')  %> </div>
-
diff --git a/app/views/mailer/issue_edit.html.erb.REMOTE.erb b/app/views/mailer/issue_edit.html.erb.REMOTE.erb
deleted file mode 100644
index af167cff5..000000000
--- a/app/views/mailer/issue_edit.html.erb.REMOTE.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<div>
-  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
-
-  <ul>
-    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
-      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
-        <li><%= string %></li>
-      <% end %>
-    <% end %>
-  </ul>
-
-  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-</div>
-<div class="cl"></div>
-
-
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
-