Clarify milestones in diff emails. (#1493)

* Clarify milestones in diff emails.

* added missing file

index.yaml

@@ -22,6 +22,14 @@ indexes:
   - name: "shipped_milestone"
     direction: desc
   - name: "name"
+- kind: "FeatureOwner"
+  properties:
+  - name: "primary_blink_components"
+  - name: "name"
+- kind: "FeatureOwner"
+  properties:
+  - name: "blink_components"
+  - name: "name"
 - kind: "Feature"
   properties:
   - name: "shipped_milestone"
@@ -155,14 +163,6 @@ indexes:
   - name: "date"
   - name: "day_percentage"
     direction: desc
-- kind: "FeatureOwner"
-  properties:
-  - name: "blink_components"
-  - name: "name"
-- kind: "FeatureOwner"
-  properties:
-  - name: "primary_blink_components"
-  - name: "name"
 - kind: "StableInstance"
   properties:
   - name: "bucket_id"

templates/blink/intent_to_implement.html

@@ -200,70 +200,7 @@
 
 
 <br><br><h4>Estimated milestones</h4>
-<table>
-
-  {% if feature.dt_milestone_desktop_start %}
-    <tr><td>DevTrial on desktop</td>
-    <td>{{feature.dt_milestone_desktop_start}}</td></tr>
-  {% endif %}
-
-  {% if feature.dt_milestone_andorid_start %}
-    <tr><td>DevTrial on android</td>
-    <td>{{feature.dt_milestone_android_start}}</td></tr>
-  {% endif %}
-
-  {% if feature.dt_milestone_ios_start %}
-    <tr><td>DevTrial on iOS</td>
-    <td>{{feature.dt_milestone_ios_start}}</td></tr>
-  {% endif %}
-
-  {% if feature.dt_milestone_webview_start %}
-    <tr><td>DevTrial on Webview</td>
-    <td>{{feature.dt_milestone_webview_start}}</td></tr>
-  {% endif %}
-
-  {% if feature.ot_milestone_desktop_start %}
-    <tr><td>OriginTrial desktop first</td>
-    <td>{{feature.ot_milestone_desktop_start}}</td></tr>
-  {% endif %}
-
-  {% if feature.ot_milestone_desktop_end %}
-    <tr><td>OriginTrial desktop last</td>
-    <td>{{feature.ot_milestone_desktop_end}}</td></tr>
-  {% endif %}
-
-  {% if feature.ot_milestone_android_start %}
-    <tr><td>OriginTrial android first</td>
-    <td>{{feature.ot_milestone_android_start}}</td></tr>
-  {% endif %}
-
-  {% if feature.ot_milestone_android_end %}
-    <tr><td>OriginTrial android last</td>
-    <td>{{feature.ot_milestone_android_end}}</td></tr>
-  {% endif %}
-
-  {% if feature.shipped_milestone %}
-    <tr><td>Shipping on desktop</td>
-    <td>{{feature.shipped_milestone}}</td></tr>
-  {% endif %}
-
-  {% if feature.shipped_android_milestone %}
-    <tr><td>Shipping on Android</td>
-    <td>{{feature.shipped_android_milestone}}</td></tr>
-  {% endif %}
-
-  {% if feature.shipped_ios_milestone %}
-    <tr><td>Shipping on iOS</td>
-    <td>{{feature.shipped_ios_milestone}}</td></tr>
-  {% endif %}
-
-  {% if feature.shipped_webview_milestone %}
-    <tr><td>Shipping on Webview</td>
-    <td>{{feature.shipped_webview_milestone}}</td></tr>
-  {% endif %}
-
-</table>
-
+{% include "../estimated-milestones-table.html" %}
 
 
 <br><br><h4>Link to entry on the {{APP_TITLE}}</h4>

templates/estimated-milestones-table.html

@@ -0,0 +1,63 @@
+<table>
+
+  {% if feature.dt_milestone_desktop_start %}
+    <tr><td>DevTrial on desktop</td>
+    <td>{{feature.dt_milestone_desktop_start}}</td></tr>
+  {% endif %}
+
+  {% if feature.dt_milestone_andorid_start %}
+    <tr><td>DevTrial on android</td>
+    <td>{{feature.dt_milestone_android_start}}</td></tr>
+  {% endif %}
+
+  {% if feature.dt_milestone_ios_start %}
+    <tr><td>DevTrial on iOS</td>
+    <td>{{feature.dt_milestone_ios_start}}</td></tr>
+  {% endif %}
+
+  {% if feature.dt_milestone_webview_start %}
+    <tr><td>DevTrial on Webview</td>
+    <td>{{feature.dt_milestone_webview_start}}</td></tr>
+  {% endif %}
+
+  {% if feature.ot_milestone_desktop_start %}
+    <tr><td>OriginTrial desktop first</td>
+    <td>{{feature.ot_milestone_desktop_start}}</td></tr>
+  {% endif %}
+
+  {% if feature.ot_milestone_desktop_end %}
+    <tr><td>OriginTrial desktop last</td>
+    <td>{{feature.ot_milestone_desktop_end}}</td></tr>
+  {% endif %}
+
+  {% if feature.ot_milestone_android_start %}
+    <tr><td>OriginTrial android first</td>
+    <td>{{feature.ot_milestone_android_start}}</td></tr>
+  {% endif %}
+
+  {% if feature.ot_milestone_android_end %}
+    <tr><td>OriginTrial android last</td>
+    <td>{{feature.ot_milestone_android_end}}</td></tr>
+  {% endif %}
+
+  {% if feature.shipped_milestone %}
+    <tr><td>Shipping on desktop</td>
+    <td>{{feature.shipped_milestone}}</td></tr>
+  {% endif %}
+
+  {% if feature.shipped_android_milestone %}
+    <tr><td>Shipping on Android</td>
+    <td>{{feature.shipped_android_milestone}}</td></tr>
+  {% endif %}
+
+  {% if feature.shipped_ios_milestone %}
+    <tr><td>Shipping on iOS</td>
+    <td>{{feature.shipped_ios_milestone}}</td></tr>
+  {% endif %}
+
+  {% if feature.shipped_webview_milestone %}
+    <tr><td>Shipping on Webview</td>
+    <td>{{feature.shipped_webview_milestone}}</td></tr>
+  {% endif %}
+
+</table>

templates/new-feature-email.html

@@ -5,9 +5,11 @@
 <p><b><a href="https://www.chromestatus.com/feature/{{id}}"
          >{{feature.name}}</a></b>
 </p>
-<p><b>Milestone</b>: {{milestone}}</p>
 <p><b>Components</b>: {{feature.blink_components|join:", "}}</p>
 <p><b>Implementation status</b>: {{status}}</p>
+<p><b>Estimated milestones</b>:
+  {% include "estimated-milestones-table.html" %}
+</p>
 
 <hr>
 <p>Next steps:</p>

templates/update-feature-email.html

@@ -7,9 +7,11 @@
         >{{feature.name}}</a></b>
 </p>
 
-<p><b>Milestone</b>: {{milestone}}</p>
 <p><b>Components</b>: {{feature.blink_components|join:", "}}</p>
 <p><b>Implementation status</b>: {{status}}</p>
+<p><b>Estimated milestones</b>:
+  {% include "estimated-milestones-table.html" %}
+</p>
 
 <p><b>Changes:</b></p>
 <ul>