Changeset - ae81bcb8a93d
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Thomas De Schampheleire - 8 years ago 2018-02-06 21:34:48
thomas.de_schampheleire@nokia.com
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.
3 files changed with 12 insertions and 24 deletions:
kallithea/templates/email_templates/pull_request.html
1
2
kallithea/templates/email_templates/pull_request_comment.html
1
2
kallithea/tests/models/test_dump_html_mails.ref.html
10
20
0 comments (0 inline, 0 general)
kallithea/templates/email_templates/pull_request.html
➞
Show inline comments
 
@@ -13,26 +13,25 @@
 
                <a style="${link_text_style}"
 
                   href="${pr_source_repo}">${pr_source_repo}</a>
 
                ${_('at')}
 
                <span style="${data_style}">${pr_source_branch}</span>
 
                ${_('to')}
 
                <a style="${link_text_style}"
 
                   href="${pr_target_repo}">${pr_target_repo}</a>
 
                ${_('at')}
 
                <span style="${data_style}">${pr_target_branch}</span>
 
            </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>
 
        </td>
 
    </tr>
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
        <td>
 
            <div>
 
                ${_('Description')}:
 
            </div>
 
        </td>
kallithea/templates/email_templates/pull_request_comment.html
➞
Show inline comments
 
@@ -21,25 +21,24 @@
 
                <a style="${link_text_style}"
 
                   href="${pr_source_repo}">${pr_source_repo}</a>
 
                ${_('branch')}
 
                <span style="${data_style}">${pr_source_branch}</span>
 
                ${_('to')}
 
                <a style="${link_text_style}"
 
                   href="${pr_target_repo}">${pr_target_repo}</a>
 
                ${_('branch')}
 
                <span style="${data_style}">${pr_target_branch}</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<%include file="button.html" args="url=pr_comment_url,title=_('View Comment'),padding_bottom=False"/>\
 
        </td>
 
    </tr>
 
</table>
kallithea/tests/models/test_dump_html_mails.ref.html
➞
Show inline comments
 
@@ -960,26 +960,25 @@ View Pull Request: http://pr.org/7
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                at
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                at
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>
 
            </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>
 
        </td>
 
    </tr>
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
        <td>
 
            <div>
 
                Description:
 
            </div>
 
        </td>
 
@@ -1149,26 +1148,25 @@ View Pull Request: http://pr.org/7
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                at
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                at
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>
 
            </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>
 
        </td>
 
    </tr>
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
        <td>
 
            <div>
 
                Description:
 
            </div>
 
        </td>
 
@@ -1368,26 +1366,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -1533,26 +1530,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -1716,26 +1712,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -1899,26 +1894,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -2081,26 +2075,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -2263,26 +2256,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -2451,26 +2443,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
 
@@ -2639,26 +2630,25 @@ View Comment: http://pr.org/comment
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>:
 
            </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>
 
        </td>
 
    </tr>
 
    <tr>
 
        <td>
 
<center>
 
    <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
 
        <tr>
 
            <td height="25px" style="height:25px"></td>
 
        </tr>
0 comments (0 inline, 0 general)
Server instance: clio-1946 This site is powered by Kallithea 0.7.0, which is © 2010–2025 by various authors & licensed under GPLv3. – Support