changeset 7164:ae81bcb8a93d

HTML email templates: make pullrequest title a hyperlink This commit makes the entirety of PR nice id _and_ PR title clickable, rather than only the PR nice id.
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Tue, 06 Feb 2018 21:34:48 +0100
parents 51906236eed3
children 67e561f832b2
files kallithea/templates/email_templates/pull_request.html kallithea/templates/email_templates/pull_request_comment.html kallithea/tests/models/test_dump_html_mails.ref.html
diffstat 3 files changed, 12 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/email_templates/pull_request.html	Tue Feb 06 21:28:13 2018 +0100
+++ b/kallithea/templates/email_templates/pull_request.html	Tue Feb 06 21:34:48 2018 +0100
@@ -22,8 +22,7 @@
             </div>
             <div>
                 <a style="${link_style}"
-                   href="${pr_url}">${pr_nice_id}</a>
-                "<span style="color:${color_link}">${pr_title}</span>"
+                   href="${pr_url}">${pr_nice_id} "${pr_title}"</a>
                 ${_('by')}
                 <span style="${data_style}">${pr_owner.full_name_and_username}</span>.
             </div>
--- a/kallithea/templates/email_templates/pull_request_comment.html	Tue Feb 06 21:28:13 2018 +0100
+++ b/kallithea/templates/email_templates/pull_request_comment.html	Tue Feb 06 21:34:48 2018 +0100
@@ -30,8 +30,7 @@
             </div>
             <div>
                 <a style="${link_style}"
-                   href="${pr_url}">${pr_nice_id}</a>
-                "<span style="color:${color_link}">${pr_title}</span>"
+                   href="${pr_url}">${pr_nice_id} "${pr_title}"</a>
                 ${_('by')}
                 <span style="${data_style}">${pr_owner.full_name_and_username}</span>.
             </div>
--- a/kallithea/tests/models/test_dump_html_mails.ref.html	Tue Feb 06 21:28:13 2018 +0100
+++ b/kallithea/tests/models/test_dump_html_mails.ref.html	Tue Feb 06 21:34:48 2018 +0100
@@ -969,8 +969,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -1158,8 +1157,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -1377,8 +1375,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -1542,8 +1539,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -1725,8 +1721,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -1908,8 +1903,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -2090,8 +2084,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -2272,8 +2265,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -2460,8 +2452,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>
@@ -2648,8 +2639,7 @@
             </div>
             <div>
                 <a style="color:#395fa0;text-decoration:none"
-                   href="http://pr.org/7">#7</a>
-                "<span style="color:#395fa0">The Title</span>"
+                   href="http://pr.org/7">#7 "The Title"</a>
                 by
                 <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
             </div>