##// END OF EJS Templates
jro_apps » redmine
RSS
trunk: revert r14300 (#16535, #20466, #20641)...
Toshi MARUYAMA -
r14159:d90de96def26
parent child
Show More
Side by Side Unified
Context file:
r14159:d90de96def26 Loading diff...:
Show file before | Show file after | Hide comments
@@ -5,8 +5,6 body {
5 font-family: Verdana, sans-serif;
5 font-family: Verdana, sans-serif;
6 font-size: 0.8em;
6 font-size: 0.8em;
7 color:#484848;
7 color:#484848;
8 background: #f6f6f6;
9 padding: 0.5em;
10 }
8 }
11 h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
9 h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
12 h1 { font-size: 1.2em; }
10 h1 { font-size: 1.2em; }
@@ -18,7 +16,6 fieldset.attachments {border-width: 1px 0 0 0;}
18 hr {
16 hr {
19 width: 100%;
17 width: 100%;
20 height: 1px;
18 height: 1px;
21 margin: 1em 0;
22 background: #ccc;
19 background: #ccc;
23 border: 0;
20 border: 0;
24 }
21 }
@@ -26,28 +23,9 span.footer {
26 font-size: 0.8em;
23 font-size: 0.8em;
27 font-style: italic;
24 font-style: italic;
28 }
25 }
29 #content {
30 max-width: 60em;
31 margin: 0 auto;
32 padding: 1em;
33 border: 1px solid #e4e4e4;
34 border-radius: 4px;
35 background: #fff;
36 }
37 .description, .note {
38 margin: 2em 0;
39 color: #484848;
40 }
41 .author {
42 background: #f6f6f6;
43 border-radius: 3px;
44 padding: 3px;
45 margin: 0;
46 }
47 </style>
26 </style>
48 </head>
27 </head>
49 <body>
28 <body>
50 <div id="content">
51 <% if Setting.emails_header.present? -%>
29 <% if Setting.emails_header.present? -%>
52 <span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
30 <span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
53 <% end -%>
31 <% end -%>
@@ -56,6 +34,5 span.footer {
56 <% if Setting.emails_footer.present? -%>
34 <% if Setting.emails_footer.present? -%>
57 <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
35 <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
58 <% end -%>
36 <% end -%>
59 </div>
60 </body>
37 </body>
61 </html>
38 </html>
Show file before | Show file after | Hide comments
@@ -2,7 +2,7
2
2
3 <%= render_email_issue_attributes(issue, users.first, true) %>
3 <%= render_email_issue_attributes(issue, users.first, true) %>
4
4
5 <div class="description"><%= textilizable(issue, :description, :only_path => false) %></div>
5 <%= textilizable(issue, :description, :only_path => false) %>
6
6
7 <% if issue.attachments.any? %>
7 <% if issue.attachments.any? %>
8 <fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend>
8 <fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend>
Show file before | Show file after | Hide comments
@@ -1,3 +1,3
1 <p class="author"><%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %></p>
1 <%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
2 <hr />
2 <hr />
3 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
3 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
Show file before | Show file after | Hide comments
@@ -1,7 +1,7
1 <% if @journal.private_notes? %>
1 <% if @journal.private_notes? %>
2 (<%= l(:field_private_notes) %>)
2 (<%= l(:field_private_notes) %>)
3 <% end %>
3 <% end %>
4 <p class="author"><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %></p>
4 <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
5
5
6 <ul>
6 <ul>
7 <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
7 <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
@@ -9,6 +9,6
9 <% end %>
9 <% end %>
10 </ul>
10 </ul>
11
11
12 <div class="note"><%= textilizable(@journal, :notes, :only_path => false) %></div>
12 <%= textilizable(@journal, :notes, :only_path => false) %>
13 <hr />
13 <hr />
14 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
14 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
General Comments 0
You need to be logged in to leave comments. Login now