diff options
Diffstat (limited to 'gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy')
-rw-r--r-- | gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy | 71 |
1 files changed, 39 insertions, 32 deletions
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy index 59790dcef3..870ad46412 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy @@ -20,7 +20,6 @@ * @param commentFiles * @param commentCount * @param email - * @param fromName * @param labels * @param patchSet * @param patchSetCommentBlocks @@ -38,7 +37,17 @@ {let $ulStyle kind="css"} list-style: none; - padding-left: 20px; + padding: 0; + {/let} + + {let $fileLiStyle kind="css"} + margin: 0; + padding: 0; + {/let} + + {let $commentLiStyle kind="css"} + margin: 0; + padding: 0 0 0 16px; {/let} {let $voteStyle kind="css"} @@ -63,55 +72,53 @@ background-color: #ddd; {/let} - <p> - {$fromName} <strong>posted comments</strong> on this change. - </p> + {if $patchSetCommentBlocks} + {call .WikiFormat}{param content: $patchSetCommentBlocks /}{/call} + {/if} - {if $email.changeUrl} + {if length($labels) > 0} <p> - {call .ViewChangeButton data="all" /} + Patch set {$patchSet.patchSetId}: + {foreach $label in $labels} + {if $label.value > 0} + <span style="{$positiveVoteStyle}"> + {$label.label}{sp}+{$label.value} + </span> + {elseif $label.value < 0} + <span style="{$negativeVoteStyle}"> + {$label.label}{sp}{$label.value} + </span> + {else} + <span style="{$neutralVoteStyle}"> + -{$label.label} + </span> + {/if} + {/foreach} </p> {/if} - <p> - Patch set {$patchSet.patchSetId}: - {foreach $label in $labels} - {if $label.value > 0} - <span style="{$positiveVoteStyle}"> - {$label.label}{sp}+{$label.value} - </span> - {elseif $label.value < 0} - <span style="{$negativeVoteStyle}"> - {$label.label}{sp}{$label.value} - </span> - {else} - <span style="{$neutralVoteStyle}"> - -{$label.label} - </span> - {/if} - {/foreach} - </p> - - {if $patchSetCommentBlocks} - {call .WikiFormat}{param content: $patchSetCommentBlocks /}{/call} + {if $email.changeUrl} + <p> + {call .ViewChangeButton data="all" /} + </p> {/if} {if $commentCount == 1} - <p>(1 comment)</p> + <p>1 comment:</p> {elseif $commentCount > 1} - <p>({$commentCount} comments)</p> + <p>{$commentCount} comments:</p> {/if} <ul style="{$ulStyle}"> {foreach $group in $commentFiles} - <li> + <li style="{$fileLiStyle}"> <p> <a href="{$group.link}">{$group.title}:</a> </p> <ul style="{$ulStyle}"> {foreach $comment in $group.comments} - <li> + <li style="{$commentLiStyle}"> {if $comment.isRobotComment} <p style="{$commentHeaderStyle}"> Robot Comment from{sp} |