From 5237056c908458b79a2536588266b04e0abcaef2 Mon Sep 17 00:00:00 2001
From: Pascal Chevrel <pascal@mozilla.com>
Date: Wed, 10 Jul 2024 16:55:48 +0200
Subject: [PATCH] Nightly Page: add an Android icon for Focus/Fenix/GeckoView
 bugs

---
 app/views/templates/base.html.twig    |  2 +-
 app/views/templates/nightly.html.twig | 10 ++++++++--
 public/assets/img/android.svg         |  1 +
 public/style/base.css                 | 13 +++++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 public/assets/img/android.svg

diff --git a/app/views/templates/base.html.twig b/app/views/templates/base.html.twig
index 5e269758..b07dbb44 100644
--- a/app/views/templates/base.html.twig
+++ b/app/views/templates/base.html.twig
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="/assets/bootstrap/css/bootstrap.min.css" media="screen">
     <link rel="stylesheet" href="/assets/bootstrap/css/bootstrap-icons.css" media="screen">
-    <link rel="stylesheet" href="/style/base.css?version=28" type="text/css" media="all" />
+    <link rel="stylesheet" href="/style/base.css?version=29" type="text/css" media="all" />
     <link rel="icon" type="image/svg+xml" href="/assets/img/site_icon.svg" />
     <link rel="apple-touch-icon" type="image/png" href="/assets/img/site_icon.png" />
     <link rel="author" href="humans.txt" />
diff --git a/app/views/templates/nightly.html.twig b/app/views/templates/nightly.html.twig
index 8a1f1b3e..e9f25805 100644
--- a/app/views/templates/nightly.html.twig
+++ b/app/views/templates/nightly.html.twig
@@ -45,7 +45,7 @@
     <p>
 
 </p>
-<div class="collapse" id="collapse{{  dataset.buildid }}">
+<div class="collapse" id="collapse{{ dataset.buildid }}">
 
     <!-- Outstanding bugs -->
     {% if outstanding_bugs[dataset.buildid].bugs %}
@@ -121,14 +121,20 @@
         </thead>
         <tbody>
         {%- for details in bug_list[dataset.buildid].bugs -%}
+
             {%- set alert_link = '' -%}
             {%- set alert_title = '' -%}
             {%- set alert_row = '' -%}
+            {%- set product = '' -%}
+
             {%- set pill_level = 'text-bg-light border' -%}
             {%- if details.type == 'enhancement' -%}
                 {%- set alert_link =' text-success fw-bold' -%}
                 {%- set alert_title =' title="Bug marked as Enhancement"' -%}
             {%- endif -%}
+            {%- if details.product == 'Fenix' or details.product == 'GeckoView' or details.product == 'Focus' -%}
+                {%- set product = 'android' -%}
+            {%- endif -%}
             {%- if bug_list_karma[details.id].score > 8 -%}
                 {%- set pill_level ='text-bg-warning' -%}
             {%- endif -%}
@@ -140,7 +146,7 @@
                 {# do nothing #}
             {% else %}
         <tr class="small {{ alert_row }}">
-            <td><a href="https://bugzilla.mozilla.org/{{ details.id }}" class="text-end text-nowrap bug-link link-primary {{ alert_link }}" {{ alert_title|raw }}>{{ details.id }}</a></td>
+            <td class="{{ product }}"><a href="https://bugzilla.mozilla.org/{{ details.id }}" class="text-end text-nowrap bug-link link-primary {{ alert_link }}" {{ alert_title|raw }}>{{ details.id }}</a></td>
             <td><a href="https://bugzilla.mozilla.org/{{ details.id }}" class="bug-link link-dark {{ alert_link }}">{{ details.component }}</td>
             <td class="text-center {{ alert_row }}">
                 <span class="badge rounded-pill {{ pill_level }} score-pill">{{ bug_list_karma[details.id].score }}</span>
diff --git a/public/assets/img/android.svg b/public/assets/img/android.svg
new file mode 100644
index 00000000..4067a05f
--- /dev/null
+++ b/public/assets/img/android.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.0//EN'  'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'><svg enable-background="new 0 0 32 32" height="32px" id="Layer_1" version="1.0" viewBox="0 0 32 32" width="32px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M5,8.978c-1.104,0-2,0.896-2,2v8c0,1.104,0.896,2,2,2s2-0.896,2-2v-8C7,9.873,6.104,8.978,5,8.978z" fill="#85C808"/><path d="M27,8.978c-1.104,0-2,0.896-2,2v8c0,1.104,0.896,2,2,2s2-0.896,2-2v-8C29,9.873,28.104,8.978,27,8.978z" fill="#85C808"/><path d="M8,24.978h2v5c0,1.104,0.896,2,2,2s2-0.896,2-2v-5h4v5c0,1.104,0.896,2,2,2s2-0.896,2-2v-5h2v-15H8V24.978z   " fill="#85C808"/><path d="M20.723,2.53l1.027-1.779c0.139-0.24,0.057-0.545-0.184-0.684c-0.238-0.139-0.545-0.057-0.683,0.184   l-1.001,1.734C18.732,1.345,17.41,0.978,16,0.978c-1.409,0-2.731,0.367-3.882,1.008L11.116,0.25   c-0.139-0.239-0.443-0.321-0.684-0.183c-0.238,0.138-0.32,0.443-0.183,0.683l1.028,1.78C9.294,3.986,8,6.328,8,8.978h16   C24,6.328,22.706,3.986,20.723,2.53z M13,5.978c-0.553,0-1-0.447-1-1s0.447-1,1-1s1,0.447,1,1S13.553,5.978,13,5.978z M19,5.978   c-0.553,0-1-0.447-1-1s0.447-1,1-1s1,0.447,1,1S19.553,5.978,19,5.978z" fill="#85C808"/></g><g/><g/><g/><g/><g/><g/></svg>
\ No newline at end of file
diff --git a/public/style/base.css b/public/style/base.css
index 94298782..7c2808ad 100644
--- a/public/style/base.css
+++ b/public/style/base.css
@@ -303,3 +303,16 @@ footer {
   margin-left:0.5em;
 }
 
+/* override Bootstrap striped styles as they don't allow background images */
+#nightly table  tr:nth-child(odd) td {
+    box-shadow: none !important;
+    background-color: #ecedee !important;
+}
+
+#nightly td.android {
+     background-image: url("/assets/img/android.svg");
+     background-repeat: no-repeat;
+     background-size: 1em;
+     background-position-x: 10px;
+     background-position-y: center;
+}
\ No newline at end of file