diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py index eab898c6..77298e3f 100644 --- a/runbot/__manifest__.py +++ b/runbot/__manifest__.py @@ -66,15 +66,15 @@ 'runbot/static/src/js/fields/*', ], 'runbot.assets_frontend': [ - '/web/static/lib/bootstrap/dist/css/bootstrap.css', - '/web/static/src/libs/fontawesome/css/font-awesome.css', + ('include', 'web.assets_frontend_minimal'), + + '/runbot/static/src/libs/bootstrap/css/bootstrap.css', + '/runbot/static/src/libs/fontawesome/css/font-awesome.css', '/runbot/static/src/css/runbot.css', - '/web/static/lib/jquery/jquery.js', - '/web/static/lib/popper/popper.js', - #'/web/static/lib/bootstrap/js/dist/util.js', - '/web/static/lib/bootstrap/js/dist/dropdown.js', - '/web/static/lib/bootstrap/js/dist/collapse.js', + '/runbot/static/src/libs/jquery/jquery.js', + '/runbot/static/src/libs/popper/popper.js', + '/runbot/static/src/libs/bootstrap/js/bootstrap.bundle.js', '/runbot/static/src/js/runbot.js', ], }, diff --git a/runbot/templates/utils.xml b/runbot/templates/utils.xml index debf37cf..adcd2c14 100644 --- a/runbot/templates/utils.xml +++ b/runbot/templates/utils.xml @@ -6,14 +6,9 @@ - <link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/bootstrap/css/bootstrap.css"/> - <link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/fontawesome/css/font-awesome.css"/> - <link rel="stylesheet" type="text/css" href="/runbot/static/src/css/runbot.css"/> - <script src="/runbot/static/src/libs/jquery/jquery.js" type="text/javascript"/> - <script type="text/javascript" src="/runbot/static/src/libs/popper/popper.js"/> - <script type="text/javascript" src="/runbot/static/src/libs/bootstrap/js/bootstrap.bundle.js"/> - <script type="text/javascript" src="/runbot/static/src/js/runbot.js"/> + <t t-call-assets="runbot.assets_frontend"/> + <t t-if="refresh"> <meta http-equiv="refresh" t-att-content="refresh"/>