From 13e3d9d6ea956d2512fbb1eb0a557165526c45c4 Mon Sep 17 00:00:00 2001
From: Xavier-Do <xdo@odoo.com>
Date: Tue, 23 Apr 2024 10:54:22 +0200
Subject: [PATCH] [FIX] runbot: small fix following BS 5.3

---
 runbot/static/src/css/runbot.css | 5 +++++
 runbot/templates/batch.xml       | 4 ++--
 runbot/templates/build.xml       | 4 ++--
 runbot/templates/build_stats.xml | 2 +-
 runbot/templates/bundle.xml      | 6 ++++--
 runbot/templates/commit.xml      | 4 ++--
 runbot/templates/utils.xml       | 6 +++---
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/runbot/static/src/css/runbot.css b/runbot/static/src/css/runbot.css
index 4e34309c8..7d792ddc1 100644
--- a/runbot/static/src/css/runbot.css
+++ b/runbot/static/src/css/runbot.css
@@ -87,6 +87,11 @@
     --bs-btn-disabled-border-color: #17a2b8;
 }
 
+
+.accordion {
+	--bs-accordion-btn-padding-y: 0.3rem; /* more condensed build error views */
+}
+
 .text-bg-default {
 	color: var(--bs-body-color) !important;
 	background-color: RGBA(var(--bs-body-bg-rgb), var(--bs-bg-opacity, 1)) !important;
diff --git a/runbot/templates/batch.xml b/runbot/templates/batch.xml
index 664018b80..7ecadecc8 100644
--- a/runbot/templates/batch.xml
+++ b/runbot/templates/batch.xml
@@ -3,7 +3,7 @@
     <data>
         <template id="runbot.batch">
             <t t-call="runbot.layout">
-                <div class="row">
+                <div class="row g-0">
                     <div class="col-lg-6">
                     <t t-set="batch_class" t-value="'bg-info-subtle' if batch.state=='preparing' else 'bg-success-subtle' if not any(log.level != 'INFO' for log in batch.log_ids) else 'bg-warning-subtle'"/>
                     <table class="table table-stripped">
@@ -56,7 +56,7 @@
                                         <i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/>
                                         <span class="label" t-esc="commit.dname"/>
                                     </a>
-                                    <a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" class="badge text-bg-subtle" title="View Commit on Github"><i class="fa fa-github"/></a>
+                                    <a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a>
                                     <small t-if="commit_link.match_type and commit_link.match_type.startswith('base')">
                                         from base:
                                         <span t-esc="commit_link.branch_id.name"/>
diff --git a/runbot/templates/build.xml b/runbot/templates/build.xml
index 8bcf830ee..aa70d2238 100644
--- a/runbot/templates/build.xml
+++ b/runbot/templates/build.xml
@@ -14,7 +14,7 @@
             </div>
           </form>
         </t>
-        <div class="row">
+        <div class="row g-0">
           <div class="col-md-12">
             <t t-set="batches" t-value="build.top_parent.with_context(active_test=False).slot_ids.mapped('batch_id')"/>
             <t t-set="bundles" t-value="batches.mapped('bundle_id')"/>
@@ -370,7 +370,7 @@
     </template>
     <template id="runbot.build_search">
       <t t-call='runbot.layout'>
-        <div class="row">
+        <div class="row g-0">
           <div class="col-md-12">
             <table class="table table-condensed">
               <t t-foreach="builds" t-as="build">
diff --git a/runbot/templates/build_stats.xml b/runbot/templates/build_stats.xml
index c219eda42..d771ed742 100644
--- a/runbot/templates/build_stats.xml
+++ b/runbot/templates/build_stats.xml
@@ -5,7 +5,7 @@
       <t t-call='runbot.layout'>
           <t t-set="bundles" t-value="build.slot_ids.mapped('batch_id.bundle_id')"/>
           <div>
-            <div class="row">
+            <div class="row g-0">
               <div class="col-md-4">
                 <div class="bg-success-subtle">
                   <b>Build: </b><a t-attf-href="/runbot/build/{{build.id}}"><t t-esc="build.id"/></a><br/>
diff --git a/runbot/templates/bundle.xml b/runbot/templates/bundle.xml
index 40b9eefc2..21b10ed6b 100644
--- a/runbot/templates/bundle.xml
+++ b/runbot/templates/bundle.xml
@@ -11,7 +11,7 @@
                                     <t t-esc="bundle.name"/>
                                     <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
                                     <div class="btn-group" role="group">
-                                        <a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{bundle.id}}&amp;view_type=form&amp;model=runbot.bundle&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default btn-sm" target="new" title="View in Backend">
+                                        <a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{bundle.id}}&amp;view_type=form&amp;model=runbot.bundle&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default" target="new" title="View in Backend">
                                           <i class="fa fa-list"/>
                                         </a>
                                         <a groups="runbot.group_runbot_advanced_user" class="btn btn-default" t-attf-href="/runbot/bundle/{{bundle.id}}/force" title="Force A New Batch">
@@ -20,7 +20,9 @@
                                         <a t-if="bundle.env.user.has_group('runbot.group_runbot_advanced_user') or (bundle.env.user.has_group('runbot.group_user') and ':' in bundle.name)" class="btn btn-default" t-attf-href="/runbot/bundle/{{bundle.id}}/force/1" title="Force A New Batch with automatic rebase">
                                             <i class="fa fa-fast-forward"/>
                                         </a>
-                                        <t t-call="runbot.branch_copy_button"/>
+                                        <t t-call="runbot.branch_copy_button">
+                                            <t t-set="btn_size" t-value="'btn'"/>
+                                        </t>
                                         <t t-call="runbot.bundle_stats_dropdown"/>
                                     </div>
                                 </span>
diff --git a/runbot/templates/commit.xml b/runbot/templates/commit.xml
index 04e6e0a5c..d4e3f17a2 100644
--- a/runbot/templates/commit.xml
+++ b/runbot/templates/commit.xml
@@ -22,7 +22,7 @@
 
     <template id="runbot.commit">
       <t t-call='runbot.layout'>
-        <div class="row">
+        <div class="row g-0">
           <!-- Commit base informations -->
           <div class="col-md-6">
             <table class="table table-stripped">
@@ -96,7 +96,7 @@
             </table>
           </div>
         </div>
-        <div class="row">
+        <div class="row g-0">
           <div class="col-md-6">
             <h3>Branch presence history</h3>
             <table class="table table-stripped">
diff --git a/runbot/templates/utils.xml b/runbot/templates/utils.xml
index 86b5cc8be..7745f4621 100644
--- a/runbot/templates/utils.xml
+++ b/runbot/templates/utils.xml
@@ -276,7 +276,7 @@
                 <i t-attf-class="fa  {{'fa-spinner' if bu.global_state == 'pending' else 'fa-cog'}} {{'' if bu.global_state in ('done', 'running') else 'fa-spin'}} fa-fw"/>
                 <span class="caret"/>
             </button>
-            <div class="dropdown-menu dropdown-menu-right" role="menu">
+            <div class="dropdown-menu dropdown-menu-end" role="menu">
                 <a t-if="bu.global_result=='skipped'" groups="runbot.group_runbot_admin" class="dropdown-item" href="#" data-runbot="rebuild" t-att-data-runbot-build="bu['id']">
                     <i class="fa fa-level-up"/>
                     Force Build
@@ -367,7 +367,7 @@
         </template>
 
         <template id="runbot.branch_copy_button">
-            <button t-attf-class="btn btn-default btn-ssm" title="Copy Bundle name" aria-label="Copy Bundle name" t-attf-onclick="copyToClipboard('{{ bundle.name.split(':')[-1] }}')">
+            <button t-attf-class="btn btn-default {{btn_size or 'btn-ssm'}}" title="Copy Bundle name" aria-label="Copy Bundle name" t-attf-onclick="copyToClipboard('{{ bundle.name.split(':')[-1] }}')">
               <i t-attf-class="fa fa-clipboard"/>
             </button>
         </template>
@@ -378,7 +378,7 @@
                     <i t-attf-class="fa fa-bar-chart"/>
                     <span class="caret"/>
             </button>
-            <div class="dropdown-menu dropdown-menu-right" role="menu">
+            <div class="dropdown-menu dropdown-menu-end" role="menu">
                 <t t-foreach="project.trigger_ids" t-as="trigger">
                     <a class="dropdown-item" t-if="trigger.has_stats" t-attf-href="/runbot/stats/{{bundle.id}}/{{trigger.id}}">
                         <t t-esc="trigger.name" />