From af016f42392428442395bc380d9b2802b254c0ca Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Tue, 29 Nov 2022 10:02:18 +0100
Subject: [PATCH] [FIX] runbot_merge: frontend templates & styles for 15.0

15.0 (or 14.0) dropped some of the BS3 (?) compatibility stuff, which
the mergebot was (apparently) relying on. This lead to a visual
degradation as well as the frontend dropdown looking absolutely awful.

Fix that, on both style and templates.

15.0 (or 14.0) also dropped the bespoke responsive utility classes,
switch to bootstrap's.
---
 runbot_merge/static/scss/runbot_merge.scss |  9 +++++++-
 runbot_merge/views/templates.xml           | 26 +++++++++++++---------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/runbot_merge/static/scss/runbot_merge.scss b/runbot_merge/static/scss/runbot_merge.scss
index c00bf61f..11ed66f4 100644
--- a/runbot_merge/static/scss/runbot_merge.scss
+++ b/runbot_merge/static/scss/runbot_merge.scss
@@ -1,7 +1,12 @@
 // FIX: bs4 shit-heap colors and styles
-body {
+html {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   color: #666666;
+  font-size: 14px;
+}
+body {
+  color: inherit;
+  font-family: inherit;
 }
 h1, h2, h3, h4, h5, h6{
   color: inherit;
@@ -36,6 +41,8 @@ h5 { font-size: 1em; }
 .list-inline > li {
   padding: 0 5px;
   margin-right: 0;
+  // TODO: find better way to do this
+  display: inline-block;
 }
 
 // mergebot layouting
diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index 0f3f662f..5eeaa497 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -13,6 +13,7 @@
         <a t-attf-href="https://github.com/{{ pr.repository.name }}/pull/{{ pr.number }}"
            t-att-title="pr.blocked or title.strip()"
            t-att-target="target or None"
+           t-att-class="classes or None"
         ><t t-esc="pr.display_name"/></a>
     </template>
 
@@ -29,8 +30,10 @@
                 <span class="caret"></span>
             </button>
             <ul class="dropdown-menu staging-statuses">
-                <li groups="runbot_merge.group_admin">
-                    <a t-attf-href="/web#id={{staging.id}}&amp;view_type=form&amp;model=runbot_merge.stagings"
+                <li >
+                    <a groups="runbot_merge.group_admin"
+                       class="dropdown-item" role="menuitem"
+                       t-attf-href="/web#id={{staging.id}}&amp;view_type=form&amp;model=runbot_merge.stagings"
                        target="new">
                         Open Staging
                     </a>
@@ -38,14 +41,14 @@
                 <t t-set="statuses" t-value="{(r, c): (s, t) for r, c, s, t in staging.statuses}"/>
                 <t t-foreach="repo_statuses._for_staging(staging)" t-as="req">
                     <t t-set="st" t-value="statuses.get((req.repo_id.name, req.context)) or (None, None)"/>
-                    <li t-att-class="
-                            'bg-success' if st[0] == 'success'
+                    <a t-att-href="st[1]" target="new" role="menuitem" t-attf-class="
+                        dropdown-menu
+                            {{'bg-success' if st[0] == 'success'
                        else 'bg-danger' if st[0] in ('error', 'failure')
                        else 'bg-info' if st[0]
-                       else 'bg-light'"
-                    ><a t-att-href="st[1]" target="new">
+                       else 'bg-light'}}">
                         <t t-esc="req.repo_id.name"/>: <t t-esc="req.context"/>
-                    </a></li>
+                    </a>
                 </t>
             </ul>
         </div>
@@ -164,8 +167,8 @@
                     <t t-if="not (success or failure or pending)">bg-gray-lighter</t>
                 </t>
                 <t t-set="decorationclass" >
-                    <t t-if="staging_index >= 2">hidden-xs</t>
-                    <t t-if="staging_index >= 4">visible-lg-block</t>
+                    <t t-if="4 > staging_index >= 2">d-none d-md-block</t>
+                    <t t-if="staging_index >= 4">d-none d-lg-block</t>
                 </t>
                 <t t-set="title">
                     <t t-if="staging.state == 'ff_failed'">fast forward failed (<t t-esc="staging.reason"/>)</t>
@@ -254,11 +257,12 @@
                                                 <span class="caret"></span>
                                             </button>
                                             <ul class="dropdown-menu">
-                                                <li t-foreach="batch.prs" t-as="pr">
+                                                <t t-foreach="batch.prs" t-as="pr">
                                                     <t t-call="runbot_merge.link-pr">
                                                         <t t-set="target">new</t>
+                                                        <t t-set="classes">dropdown-item</t>
                                                     </t>
-                                                </li>
+                                                </t>
                                             </ul>
                                         </li>
                                     </t>