Simplify the default layout of notification emails

* Less margin: the content appears as the text of the message. * Streamlined footer: everything on one line, with a small separator. * Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display the content of the message. Switching to a simpler layout fixes the issue.

Simplify the default layout of notification emails
* Less margin: the content appears as the text of the message. * Streamlined footer: everything on one line, with a small separator. * Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display the content of the message. Switching to a simpler layout fixes the issue.
Pierre de La Morinerie
1 parent 7959455f
Showing 3 changed files with 21 additions and 16 deletions Show diff stats
app/views/layouts/notify.html.haml
app/views/notify/new_merge_request_email.html.haml
app/views/notify/note_merge_request_email.html.haml
@@ -3,17 +3,24 @@
     %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
       %title
         GitLab
+  :css
+    p.details {
+      font-style:italic;
+      color:#777
+    }
+    .footer p {
+      font-size:small;
+      color:#777
+    }
  
   %body
-    %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
-      %tr
-        %td{align: "left", style: "margin: 0; padding: 10px;"}
-          = yield
-      %tr
-        %td{align: "left", style: "margin: 0; padding: 10px;"}
-          %p{style: "font-size:small;color:#777"}
-            - if @project
-              You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
-              %br
-            - if @target_url
-              #{link_to "View in GitLab", @target_url}
+    %div.content
+      = yield
+    %div.footer{style: "margin-top: 10px;"}
+      %p
+        \—
+        %br
+        - if @project
+          You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
+        - if @target_url
+          #{link_to "View in GitLab", @target_url}
-%p
-  = "New Merge Request ##{@merge_request.iid}"
-%p
+%p.details
   != merge_path_description(@merge_request, '&rarr;')
  
 - if @merge_request.assignee_id.present?
-%p
+%p.details
   - if @note.for_diff_line?
     = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
   - else
...	...	@@ -3,17 +3,24 @@
3	3	%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
4	4	%title
5	5	GitLab
	6	+ :css
	7	+ p.details {
	8	+ font-style:italic;
	9	+ color:#777
	10	+ }
	11	+ .footer p {
	12	+ font-size:small;
	13	+ color:#777
	14	+ }
6	15
7	16	%body
8		- %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
9		- %tr
10		- %td{align: "left", style: "margin: 0; padding: 10px;"}
11		- = yield
12		- %tr
13		- %td{align: "left", style: "margin: 0; padding: 10px;"}
14		- %p{style: "font-size:small;color:#777"}
15		- - if @project
16		- You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
17		- %br
18		- - if @target_url
19		- #{link_to "View in GitLab", @target_url}
	17	+ %div.content
	18	+ = yield
	19	+ %div.footer{style: "margin-top: 10px;"}
	20	+ %p
	21	+ \—
	22	+ %br
	23	+ - if @project
	24	+ You're receiving this notification because you are a member of the #{link_to @project.name_with_namespace, project_url(@project)} project team.
	25	+ - if @target_url
	26	+ #{link_to "View in GitLab", @target_url}
...	...
1		-%p
2		- = "New Merge Request ##{@merge_request.iid}"
3		-%p
	1	+%p.details
4	2	!= merge_path_description(@merge_request, '→')
5	3
6	4	- if @merge_request.assignee_id.present?
...	...
1		-%p
	1	+%p.details
2	2	- if @note.for_diff_line?
3	3	= link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
4	4	- else
...	...