Merge "Simplify change email styles"

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}
+    {$fromName} abandoned <strong>{$change.subject}</strong>.
-    <strong>{$change.subject}</strong>.
   </p>
 
   {if $email.changeUrl}

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}
+    {$fromName} posted comments on <strong>{$change.subject}</strong>.
-    <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}">

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>

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}
+    {$fromName} removed a vote from <strong>{$change.subject}</strong>.
-    <strong>{$change.subject}</strong>.
   </p>
 
   {if $email.changeUrl}

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}

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}
+      {$fromName} uploaded <strong>{$change.subject}</strong> for review.
-      <strong>{$change.subject}</strong> for review.
     {/if}
   </p>
 

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"}
+  <a href="{$email.changeUrl}">View Change</a>
-    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}
 
 /**

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}
+    {$fromName} uploaded patch set #{$patchSet.patchSetId} to{sp}
-    <strong>#{$patchSet.patchSetId}</strong> to{sp}
     <strong>{$change.subject}</strong>.
   </p>
 

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}
+    {$fromName} restored <strong>{$change.subject}</strong>.
-    <strong>{$change.subject}</strong>.
   </p>
 
   {if $email.changeUrl}

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}
+    {$fromName} reverted the change: <strong>{$change.subject}</strong>.
-    <strong>{$change.subject}</strong>.
   </p>
 
   {if $email.changeUrl}