Simplify change email styles
Return the "View Change" link to looking like a link (rather than a blue
button). No longer set author and reviewer names in bold.
Change-Id: Idb1d2205fac5d8d76e413e2e755f289272241390
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
index 7844827..e3b4613 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
@@ -24,8 +24,7 @@
*/
{template .AbandonedHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> abandoned{sp}
- <strong>{$change.subject}</strong>.
+ {$fromName} abandoned <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
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 2fea214..3042287 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
@@ -44,8 +44,7 @@
{/let}
<p>
- <strong>{$fromName}</strong> posted comments on{sp}
- <strong>{$change.subject}</strong>.
+ {$fromName} posted comments on <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -62,7 +61,7 @@
{foreach $group in $commentFiles}
<li>
<p>
- <strong><a href="{$group.link}">{$group.title}:</a></strong>
+ <a href="{$group.link}">{$group.title}:</a>
</p>
<ul style="{$ulStyle}">
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
index 6f9bdb7..6817fbd 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
@@ -24,10 +24,10 @@
*/
{template .DeleteReviewerHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> removed{sp}
+ {$fromName} removed{sp}
{foreach $reviewerName in $email.reviewerNames}
{if not isFirst($reviewerName)},{sp}{/if}
- <strong>{$reviewerName}</strong>
+ {$reviewerName}
{/foreach}{sp}
from <strong>{$change.subject}</strong>.
</p>
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
index 1a7e317..bfcd8d5 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
@@ -24,8 +24,7 @@
*/
{template .DeleteVoteHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> removed a vote from{sp}
- <strong>{$change.subject}</strong>.
+ {$fromName} removed a vote from <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
index 70ab6b3..257f522 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
@@ -23,7 +23,7 @@
*/
{template .MergedHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> merged <strong>{$change.subject}</strong>.
+ {$fromName} merged <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
index 1fc35c4..63d3462 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
@@ -26,17 +26,16 @@
{template .NewChangeHtml autoescape="strict" kind="html"}
<p>
{if $email.reviewerNames}
- <strong>{$fromName}</strong> would like{sp}
+ {$fromName} would like{sp}
{foreach $reviewerName in $email.reviewerNames}
{if not isFirst($reviewerName)}
{if isLast($reviewerName)}{sp}and{else},{/if}{sp}
{/if}
- <strong>{$reviewerName}</strong>
+ {$reviewerName}
{/foreach}{sp}
to review <strong>{$change.subject}</strong>.
{else}
- <strong>{$fromName}</strong> uploaded{sp}
- <strong>{$change.subject}</strong> for review.
+ {$fromName} uploaded <strong>{$change.subject}</strong> for review.
{/if}
</p>
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Private.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Private.soy
index 707ebd5..88cd8d0 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Private.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Private.soy
@@ -25,16 +25,7 @@
* @param email
*/
{template .ViewChangeButton private="true" autoescape="strict" kind="html"}
- {let $visitButtonStyle kind="css"}
- background: #4d90fe;
- border: 1px solid #3079ed;
- border-radius: 4px;
- color: #fff;
- display: inline-block;
- margin-right: 8px;
- padding: 6px 12px;
- {/let}
- <a style="{$visitButtonStyle}" href="{$email.changeUrl}">View Change</a>
+ <a href="{$email.changeUrl}">View Change</a>
{/template}
/**
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
index 7e39f19..0163732 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
@@ -25,8 +25,7 @@
*/
{template .ReplacePatchSetHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> uploaded patch set{sp}
- <strong>#{$patchSet.patchSetId}</strong> to{sp}
+ {$fromName} uploaded patch set #{$patchSet.patchSetId} to{sp}
<strong>{$change.subject}</strong>.
</p>
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
index 23a0077..525c6d3 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
@@ -24,8 +24,7 @@
*/
{template .RestoredHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> restored{sp}
- <strong>{$change.subject}</strong>.
+ {$fromName} restored <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
index bb29c3b..9770f09 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
@@ -24,8 +24,7 @@
*/
{template .RevertedHtml autoescape="strict" kind="html"}
<p>
- <strong>{$fromName}</strong> reverted the change:{sp}
- <strong>{$change.subject}</strong>.
+ {$fromName} reverted the change: <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
