meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-26 18:31:14 +00:00
Code Issues Releases Wiki Activity

trunk: revert r14300 (#16535, #20466, #20641)

Browse Source 
Set a max width to html email content.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14541 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2015-09-01 00:15:13 +00:00
parent 0dc3c2fe1c
commit d90de96def
4 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/layouts/mailer.html.erb
View File

@ -5,8 +5,6 @@ body {
font-family: Verdana, sans-serif;
font-size: 0.8em;
color:#484848;
background: #f6f6f6;
padding: 0.5em;
}
h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
h1 { font-size: 1.2em; }
@ -18,7 +16,6 @@ fieldset.attachments {border-width: 1px 0 0 0;}
hr {
width: 100%;
height: 1px;
margin: 1em 0;
background: #ccc;
border: 0;
}
@ -26,28 +23,9 @@ span.footer {
font-size: 0.8em;
font-style: italic;
}
#content {
max-width: 60em;
margin: 0 auto;
padding: 1em;
border: 1px solid #e4e4e4;
border-radius: 4px;
background: #fff;
}
.description, .note {
margin: 2em 0;
color: #484848;
}
.author {
background: #f6f6f6;
border-radius: 3px;
padding: 3px;
margin: 0;
}
</style>
</head>
<body>
<div id="content">
<% if Setting.emails_header.present? -%>
<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
<% end -%>
@ -56,6 +34,5 @@ span.footer {
<% if Setting.emails_footer.present? -%>
<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
<% end -%>
</div>
</body>
</html>

2
app/views/mailer/_issue.html.erb
View File

@ -2,7 +2,7 @@
<%= render_email_issue_attributes(issue, users.first, true) %>
<div class="description"><%= textilizable(issue, :description, :only_path => false) %></div>
<%= textilizable(issue, :description, :only_path => false) %>
<% if issue.attachments.any? %>
<fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend>

2
app/views/mailer/issue_add.html.erb
View File

@ -1,3 +1,3 @@
<p class="author"><%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %></p>
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
<hr />
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>

4
app/views/mailer/issue_edit.html.erb
View File

@ -1,7 +1,7 @@
<% if @journal.private_notes? %>
(<%= l(:field_private_notes) %>)
<% end %>
<p class="author"><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %></p>
<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
<ul>
<% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
@ -9,6 +9,6 @@
<% end %>
</ul>
<div class="note"><%= textilizable(@journal, :notes, :only_path => false) %></div>
<%= textilizable(@journal, :notes, :only_path => false) %>
<hr />
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>