Merge "Buck: Clarify cross-compilation from Java 8 to Java 7"
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 bda900b..30d40c9 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,7 +24,8 @@
*/
{template .AbandonedHtml autoescape="strict" kind="html"}
<p>
- {$fromName} has abandoned this change.
+ <strong>{$fromName}</strong> abandoned{sp}
+ <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -33,11 +34,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
{if $coverLetter}
<pre style="font-size:12px">{$coverLetter}</pre>
{/if}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
index 934ea18..a0101c9 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
@@ -27,9 +27,7 @@
*/
{template .ChangeFooterHtml autoescape="strict" kind="html"}
{let $footerStyle kind="css"}
- color: #555;
- font-size: 10px;
- margin: 10px 0 0 0;
+ display: none;
{/let}
{if $email.changeUrl or $email.settingsUrl}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy
index f8f6c5f..84cace2 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy
@@ -21,9 +21,7 @@
*/
{template .CommentFooterHtml autoescape="strict" kind="html"}
{let $footerStyle kind="css"}
- color: #555;
- font-size: 10px;
- margin: 0;
+ display: none;
{/let}
<p style="{$footerStyle}">
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 a39e6f4..4f70645 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
@@ -43,7 +43,8 @@
{/let}
<p>
- {$fromName} has posted comments on this change.
+ <strong>{$fromName}</strong> posted comments on{sp}
+ <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -52,11 +53,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
{if $coverLetter}
<pre style="font-size:12px">{$coverLetter}</pre>
{/if}
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 e6830ec..ead4071 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,12 +24,12 @@
*/
{template .DeleteReviewerHtml autoescape="strict" kind="html"}
<p>
- {$fromName} has removed{sp}
+ <strong>{$fromName}</strong> removed{sp}
{foreach $reviewerName in $email.reviewerNames}
{if not isFirst($reviewerName)},{sp}{/if}
- {$reviewerName}
+ <strong>{$reviewerName}</strong>
{/foreach}{sp}
- from this change.
+ from <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -38,11 +38,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
{if $coverLetter}
<pre style="font-size:12px">{$coverLetter}</pre>
{/if}
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 6d88748..4f74da9 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,7 +24,8 @@
*/
{template .DeleteVoteHtml autoescape="strict" kind="html"}
<p>
- {$fromName} removed a vote on this change.
+ <strong>{$fromName}</strong> removed a vote from{sp}
+ <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -33,11 +34,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
{if $coverLetter}
<pre style="font-size:12px">{$coverLetter}</pre>
{/if}
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 083e57d..6ed8a8d 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>
- {$fromName} has submitted this change and it was merged.
+ <strong>{$fromName}</strong> merged <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -32,11 +32,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
<pre style="font-size:12px">
{$email.changeDetail}
</pre>
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 95ee41d..98a7c67 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
@@ -24,40 +24,27 @@
* @param projectName
*/
{template .NewChangeHtml autoescape="strict" kind="html"}
- {if $email.reviewerNames}
- <p>
- Hello{sp}
- {foreach $reviewerName in $email.reviewerNames}
- {if not isFirst($reviewerName)},{sp}{/if}
- {$reviewerName}
- {/foreach},
- </p>
-
- <p>
- I'd like you to do a code review.
- </p>
-
- {if $email.changeUrl}
- <p>
- Please visit <a href="{$email.changeUrl}">this change</a> to review.
- </p>
- {/if}
- {else}
- <p>
- {$fromName} has uploaded a new change for review.
- </p>
-
- {if $email.changeUrl}
- <p>
- {call .ViewChangeButton data="all" /}
- </p>
- {/if}
- {/if}
-
<p>
- Change subject: {$change.subject}
+ {if $email.reviewerNames}
+ <strong>{$fromName}</strong> would like{sp}
+ {foreach $reviewerName in $email.reviewerNames}
+ {if not isFirst($reviewerName)}
+ {if isLast($reviewerName)}{sp}and{else},{/if}{sp}
+ {/if}
+ <strong>{$reviewerName}</strong>
+ {/foreach}{sp}
+ to review <strong>{$change.subject}</strong>.
+ {else}
+ <strong>{$fromName}</strong> uploaded{sp}
+ <strong>{$change.subject}</strong> for review.
+ {/if}
</p>
- <hr/>
+
+ {if $email.changeUrl}
+ <p>
+ {call .ViewChangeButton data="all" /}
+ </p>
+ {/if}
<pre style="font-size:12px">
{$email.changeDetail}
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 df00e2d..92e2eef 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
@@ -24,40 +24,17 @@
* @param projectName
*/
{template .ReplacePatchSetHtml autoescape="strict" kind="html"}
- {if $email.reviewerNames}
- <p>
- Hello{sp}
- {foreach $reviewerName in $email.reviewerNames}
- {$reviewerName},{sp}
- {/foreach}
- </p>
-
- <p>
- I'd like you to reexamine a change.
- </p>
-
- {if $email.changeUrl}
- <p>
- Please visit <a href="{$email.changeUrl}">this change</a> to look at{sp}
- the new patch set (#{$patchSet.patchSetId}).
- </p>
- {/if}
- {else}
- <p>
- {$fromName} has uploaded a new patch set (#{$patchSet.patchSetId}).
- </p>
-
- {if $email.changeUrl}
- <p>
- {call .ViewChangeButton data="all" /}
- </p>
- {/if}
- {/if}
-
<p>
- Change subject: {$change.subject}
+ <strong>{$fromName}</strong> uploaded patch set{sp}
+ <strong>#{$patchSet.patchSetId}</strong> to{sp}
+ <strong>{$change.subject}</strong>.
</p>
- <hr/>
+
+ {if $email.changeUrl}
+ <p>
+ {call .ViewChangeButton data="all" /}
+ </p>
+ {/if}
<pre style="font-size:12px">
{$email.changeDetail}
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 83b05c4..4f249a7 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,7 +24,8 @@
*/
{template .RestoredHtml autoescape="strict" kind="html"}
<p>
- {$fromName} has restored this change.
+ <strong>{$fromName}</strong> restored{sp}
+ <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -33,11 +34,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
{if $coverLetter}
<pre style="font-size:12px">{$coverLetter}</pre>
{/if}
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 c0dc4d3..fd6a222 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,7 +24,8 @@
*/
{template .RevertedHtml autoescape="strict" kind="html"}
<p>
- {$fromName} has reverted this change.
+ <strong>{$fromName}</strong> reverted the change:{sp}
+ <strong>{$change.subject}</strong>.
</p>
{if $email.changeUrl}
@@ -33,11 +34,6 @@
</p>
{/if}
- <p>
- Change subject: {$change.subject}
- </p>
- <hr/>
-
{if $coverLetter}
<pre style="font-size:12px">{$coverLetter}</pre>
{/if}
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ViewChangeButton.soy b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ViewChangeButton.soy
index defde55..ab66eaa 100644
--- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ViewChangeButton.soy
+++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ViewChangeButton.soy
@@ -21,5 +21,14 @@
* @param email
*/
{template .ViewChangeButton private="true" autoescape="strict" kind="html"}
- <a href="{$email.changeUrl}">View Change</a>
+ {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>
{/template}
