Skip to content

G
gitlab-ce
Commit b1e42551 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

restyle and cleanup emails

parent 7367f1cf
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 266 deletions
app/views/layouts/notify.html.haml
View file @ b1e42551
...@@ -4,29 +4,19 @@ ...@@ -4,29 +4,19 @@
%title %title
GitLab GitLab
%body{bgcolor: "#EAEAEA", style: "margin: 0; padding: 0; background: #EAEAEA"} %body
%table{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 35px 0; background: #EAEAEA;", width: "100%"} %h1{style: "background: #EEE; border-bottom: 1px solid #DDD; color: #474D57; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
%tr GitLab
%td{align: "center", style: "margin: 0; padding: 0; background: #EAEAEA;"}
%table.header{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background:#333", width: "600"}
%tr
%td{style: "font-size: 0px;", width: "20"}
\ 
%td{align: "left", style: "padding: 10px 0", width: "580"}
%h1{style: "color: #BBBBBB; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"}
GITLAB
- if @project - if @project
\/ #{@project.name_with_namespace} \|
%table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"} = link_to @project.name_with_namespace, project_url(@project), style: 'color: #29B; text-decoration: none'
%tr= yield %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
%tr %tr
%td{align: "left", colspan: "2", height: "3", style: "padding: font-size: 0; line-height: 0; height: 3px;", width: "600"} %td{align: "left", style: "margin: 0; padding: 10px;"}
%table.footer{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; line-height: 10px;", width: "600"} = yield
%tr
%td{align: "center", style: "padding: 5px 0 10px; font-size: 11px; color:#7d7a7a; margin: 0; line-height: 1.2;font-family: Helvetica, Arial, sans-serif;", valign: "top"}
%br %br
%p{style: "font-size: 11px; color:#7d7a7a; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;"} %tr
You're receiving this notification because you are a member of the %td{align: "left", style: "margin: 0; padding: 10px;"}
%p{style: "font-size:small;color:#777"}
- if @project - if @project
#{@project.name_with_namespace} You're receiving this notification because you are a member of the #{@project.name_with_namespace} project team.
project team.
app/views/notify/_note_message.html.haml 0 → 100644
View file @ b1e42551
%p
%strong #{@note.author_name}
left next message:
%cite{style: 'color: #666'}
= markdown(@note.note)
app/views/notify/issue_status_changed_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{width: "21"}
%td
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= "Issue was #{@issue_status} by #{@updated_by.name}" = "Issue was #{@issue_status} by #{@updated_by.name}"
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %p
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}
= "Issue ##{@issue.id}" = "Issue ##{@issue.id}"
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
%br
app/views/notify/new_issue_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{width: "21"}
%td
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
New Issue was created and assigned to you. New Issue was created and assigned to you.
%td{width: "21"} %p
%tr
%td{width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}
= "Issue ##{@issue.id}" = "Issue ##{@issue.id}"
= link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
%br
app/views/notify/new_merge_request_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= "New Merge Request !#{@merge_request.id}" = "New Merge Request !#{@merge_request.id}"
%p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "} %p
= link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request) = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %p
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{style: "padding: 15px 0 15px;", valign: "top"}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch} Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} %p
Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
%td
app/views/notify/new_user_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
Hi #{@user['name']}! Hi #{@user['name']}!
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} %p
- if Gitlab.config.gitlab.signup_enabled - if Gitlab.config.gitlab.signup_enabled
Account has been created successfully. Account has been created successfully.
- else - else
Administrator created account for you. Now you are a member of company GitLab application. Administrator created account for you. Now you are a member of company GitLab application.
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %p
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{style: "padding: 15px 0 15px;", valign: "top"}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}
login.......................................... login..........................................
%code= @user['email'] %code= @user['email']
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "} %p
- unless Gitlab.config.gitlab.signup_enabled - unless Gitlab.config.gitlab.signup_enabled
password.................................. password..................................
%code= @password %code= @password
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} %p
= link_to "Click here to login", root_url = link_to "Click here to login", root_url
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
app/views/notify/note_commit_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= "New comment for Commit #{@commit.short_id}" = "New comment for Commit #{@commit.short_id}"
= link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}") = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} = render 'note_message'
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{style: "padding: 15px 0 15px;", valign: "top"}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
%a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
left next message:
%br
%table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
%tr
%td{valign: "top"}
%div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= markdown(@note.note)
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
app/views/notify/note_issue_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= "New comment for Issue ##{@issue.id}" = "New comment for Issue ##{@issue.id}"
= link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}") = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} = render 'note_message'
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{style: "padding: 15px 0 15px;", valign: "top"}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
%a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
left next message:
%br
%table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
%tr
%td{valign: "top"}
%div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= markdown(@note.note)
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
app/views/notify/note_merge_request_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{width: "21"}
%td
%h2{style: "color:#646464; font-weight: normal;"}
- if @note.for_diff_line? - if @note.for_diff_line?
= link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")
- else - else
= link_to "New comment", project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") = link_to "New comment", project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")
for Merge Request ##{@merge_request.id} for Merge Request ##{@merge_request.id}
%cite "#{truncate(@merge_request.title, length: 20)}" %cite "#{truncate(@merge_request.title, length: 20)}"
%td{width: "21"} = render 'note_message'
%tr
%td{width: "21"}
%td
%p
%strong #{@note.author_name}
left next message:
%br
%table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
%tr
%td{valign: "top"}
%div{ style: "background:#f5f5f5; padding:10px 20px;border:1px solid #ddd" }
= markdown(@note.note)
%td{width: "21"}
app/views/notify/note_wall_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
New message on New message on
= link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}") = link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%tr = render 'note_message'
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{style: "padding: 15px 0 15px;", valign: "top"}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
%a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
left next message:
%br
%table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
%tr
%td{valign: "top"}
%div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= markdown(@note.note)
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
app/views/notify/project_access_granted_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{width: "21"}
%td
%h2{style: "color:#646464;" }
= "You have been granted #{@users_project.project_access_human} access to project" = "You have been granted #{@users_project.project_access_human} access to project"
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %p
%tr
%td{width: "21"}
%td
%h3
= link_to project_url(@project) do = link_to project_url(@project) do
= @project.name_with_namespace = @project.name_with_namespace
%br
app/views/notify/project_was_moved_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #555; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{width: "21"}
%td
%h2
= "Project was moved to another location" = "Project was moved to another location"
%td{width: "21"} %p
%tr
%td{width: "21"}
%td
%p
The project is now located under The project is now located under
= link_to project_url(@project) do = link_to project_url(@project) do
= @project.name_with_namespace = @project.name_with_namespace
%p %p
To update the remote url in your local repository run: To update the remote url in your local repository run:
%br %p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
%table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
%tr
%td{valign: "top"}
%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
git remote set-url origin #{@project.ssh_url_to_repo} git remote set-url origin #{@project.ssh_url_to_repo}
%br %br
%td{ width: "21"}
app/views/notify/reassigned_issue_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= "Reassigned Issue ##{@issue.id}" = "Reassigned Issue ##{@issue.id}"
= link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue) = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %p
%tr Assignee changed from
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %strong #{@previous_assignee.name}
%td{style: "padding: 15px 0 15px;", valign: "top"} to
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} %strong #{@issue.assignee_name}
Assignee changed from #{@previous_assignee.name} to #{@issue.assignee_name}
%td
app/views/notify/reassigned_merge_request_email.html.haml
View file @ b1e42551
%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %p
%table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
%td{align: "left", style: "padding: 20px 0 0;"}
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
= "Reassigned Merge Request !#{@merge_request.id}" = "Reassigned Merge Request !#{@merge_request.id}"
= link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request) = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request)
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %p
%tr Assignee changed from
%td{style: "font-size: 1px; line-height: 1px;", width: "21"} %strong #{@previous_assignee.name}
%td{style: "padding: 15px 0 15px;", valign: "top"} to
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} %strong #{@merge_request.assignee_name}
Assignee changed from #{@previous_assignee.name} to #{@merge_request.assignee_name}
%td
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7