diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py index 25a07b90..66f56d21 100644 --- a/runbot/__manifest__.py +++ b/runbot/__manifest__.py @@ -63,20 +63,8 @@ 'assets': { 'web.assets_backend': [ - 'runbot/static/src/libs/diff_match_patch/diff_match_patch.js', - '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', - '/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/js/runbot.js', + 'runbot/static/libs/diff_match_patch/diff_match_patch.js', + 'runbot/static/src/fields/*', ], }, 'post_load': 'runbot_post_load', diff --git a/runbot/static/src/img/icon_killed.png b/runbot/static/img/icon_killed.png similarity index 100% rename from runbot/static/src/img/icon_killed.png rename to runbot/static/img/icon_killed.png diff --git a/runbot/static/src/img/icon_killed.svg b/runbot/static/img/icon_killed.svg similarity index 100% rename from runbot/static/src/img/icon_killed.svg rename to runbot/static/img/icon_killed.svg diff --git a/runbot/static/src/img/icon_ko.png b/runbot/static/img/icon_ko.png similarity index 100% rename from runbot/static/src/img/icon_ko.png rename to runbot/static/img/icon_ko.png diff --git a/runbot/static/src/img/icon_ko.svg b/runbot/static/img/icon_ko.svg similarity index 100% rename from runbot/static/src/img/icon_ko.svg rename to runbot/static/img/icon_ko.svg diff --git a/runbot/static/src/img/icon_ok.png b/runbot/static/img/icon_ok.png similarity index 100% rename from runbot/static/src/img/icon_ok.png rename to runbot/static/img/icon_ok.png diff --git a/runbot/static/src/img/icon_ok.svg b/runbot/static/img/icon_ok.svg similarity index 100% rename from runbot/static/src/img/icon_ok.svg rename to runbot/static/img/icon_ok.svg diff --git a/runbot/static/src/img/icon_skipped.png b/runbot/static/img/icon_skipped.png similarity index 100% rename from runbot/static/src/img/icon_skipped.png rename to runbot/static/img/icon_skipped.png diff --git a/runbot/static/src/img/icon_skipped.svg b/runbot/static/img/icon_skipped.svg similarity index 100% rename from runbot/static/src/img/icon_skipped.svg rename to runbot/static/img/icon_skipped.svg diff --git a/runbot/static/src/img/icon_warn.png b/runbot/static/img/icon_warn.png similarity index 100% rename from runbot/static/src/img/icon_warn.png rename to runbot/static/img/icon_warn.png diff --git a/runbot/static/src/img/icon_warn.svg b/runbot/static/img/icon_warn.svg similarity index 100% rename from runbot/static/src/img/icon_warn.svg rename to runbot/static/img/icon_warn.svg diff --git a/runbot/static/src/libs/bootstrap/LICENSE b/runbot/static/libs/bootstrap/LICENSE similarity index 100% rename from runbot/static/src/libs/bootstrap/LICENSE rename to runbot/static/libs/bootstrap/LICENSE diff --git a/runbot/static/src/libs/bootstrap/css/bootstrap.css b/runbot/static/libs/bootstrap/css/bootstrap.css similarity index 100% rename from runbot/static/src/libs/bootstrap/css/bootstrap.css rename to runbot/static/libs/bootstrap/css/bootstrap.css diff --git a/runbot/static/src/libs/bootstrap/js/alert.js b/runbot/static/libs/bootstrap/js/alert.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/alert.js rename to runbot/static/libs/bootstrap/js/alert.js diff --git a/runbot/static/src/libs/bootstrap/js/bootstrap.bundle.js b/runbot/static/libs/bootstrap/js/bootstrap.bundle.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/bootstrap.bundle.js rename to runbot/static/libs/bootstrap/js/bootstrap.bundle.js diff --git a/runbot/static/src/libs/bootstrap/js/button.js b/runbot/static/libs/bootstrap/js/button.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/button.js rename to runbot/static/libs/bootstrap/js/button.js diff --git a/runbot/static/src/libs/bootstrap/js/carousel.js b/runbot/static/libs/bootstrap/js/carousel.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/carousel.js rename to runbot/static/libs/bootstrap/js/carousel.js diff --git a/runbot/static/src/libs/bootstrap/js/collapse.js b/runbot/static/libs/bootstrap/js/collapse.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/collapse.js rename to runbot/static/libs/bootstrap/js/collapse.js diff --git a/runbot/static/src/libs/bootstrap/js/dropdown.js b/runbot/static/libs/bootstrap/js/dropdown.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/dropdown.js rename to runbot/static/libs/bootstrap/js/dropdown.js diff --git a/runbot/static/src/libs/bootstrap/js/index.js b/runbot/static/libs/bootstrap/js/index.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/index.js rename to runbot/static/libs/bootstrap/js/index.js diff --git a/runbot/static/src/libs/bootstrap/js/modal.js b/runbot/static/libs/bootstrap/js/modal.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/modal.js rename to runbot/static/libs/bootstrap/js/modal.js diff --git a/runbot/static/src/libs/bootstrap/js/popover.js b/runbot/static/libs/bootstrap/js/popover.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/popover.js rename to runbot/static/libs/bootstrap/js/popover.js diff --git a/runbot/static/src/libs/bootstrap/js/scrollspy.js b/runbot/static/libs/bootstrap/js/scrollspy.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/scrollspy.js rename to runbot/static/libs/bootstrap/js/scrollspy.js diff --git a/runbot/static/src/libs/bootstrap/js/tab.js b/runbot/static/libs/bootstrap/js/tab.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/tab.js rename to runbot/static/libs/bootstrap/js/tab.js diff --git a/runbot/static/src/libs/bootstrap/js/toast.js b/runbot/static/libs/bootstrap/js/toast.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/toast.js rename to runbot/static/libs/bootstrap/js/toast.js diff --git a/runbot/static/src/libs/bootstrap/js/tooltip.js b/runbot/static/libs/bootstrap/js/tooltip.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/tooltip.js rename to runbot/static/libs/bootstrap/js/tooltip.js diff --git a/runbot/static/src/libs/bootstrap/js/util.js b/runbot/static/libs/bootstrap/js/util.js similarity index 100% rename from runbot/static/src/libs/bootstrap/js/util.js rename to runbot/static/libs/bootstrap/js/util.js diff --git a/runbot/static/src/libs/diff_match_patch/LICENSE b/runbot/static/libs/diff_match_patch/LICENSE similarity index 100% rename from runbot/static/src/libs/diff_match_patch/LICENSE rename to runbot/static/libs/diff_match_patch/LICENSE diff --git a/runbot/static/src/libs/diff_match_patch/diff_match_patch.js b/runbot/static/libs/diff_match_patch/diff_match_patch.js similarity index 100% rename from runbot/static/src/libs/diff_match_patch/diff_match_patch.js rename to runbot/static/libs/diff_match_patch/diff_match_patch.js diff --git a/runbot/static/src/libs/fontawesome/css/font-awesome.css b/runbot/static/libs/fontawesome/css/font-awesome.css similarity index 100% rename from runbot/static/src/libs/fontawesome/css/font-awesome.css rename to runbot/static/libs/fontawesome/css/font-awesome.css diff --git a/runbot/static/src/libs/fontawesome/fonts/FontAwesome.otf b/runbot/static/libs/fontawesome/fonts/FontAwesome.otf similarity index 100% rename from runbot/static/src/libs/fontawesome/fonts/FontAwesome.otf rename to runbot/static/libs/fontawesome/fonts/FontAwesome.otf diff --git a/runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.eot b/runbot/static/libs/fontawesome/fonts/fontawesome-webfont.eot similarity index 100% rename from runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.eot rename to runbot/static/libs/fontawesome/fonts/fontawesome-webfont.eot diff --git a/runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.svg b/runbot/static/libs/fontawesome/fonts/fontawesome-webfont.svg similarity index 100% rename from runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.svg rename to runbot/static/libs/fontawesome/fonts/fontawesome-webfont.svg diff --git a/runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.ttf b/runbot/static/libs/fontawesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.ttf rename to runbot/static/libs/fontawesome/fonts/fontawesome-webfont.ttf diff --git a/runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.woff b/runbot/static/libs/fontawesome/fonts/fontawesome-webfont.woff similarity index 100% rename from runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.woff rename to runbot/static/libs/fontawesome/fonts/fontawesome-webfont.woff diff --git a/runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.woff2 b/runbot/static/libs/fontawesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from runbot/static/src/libs/fontawesome/fonts/fontawesome-webfont.woff2 rename to runbot/static/libs/fontawesome/fonts/fontawesome-webfont.woff2 diff --git a/runbot/static/src/libs/jquery/jquery.browser.js b/runbot/static/libs/jquery/jquery.browser.js similarity index 100% rename from runbot/static/src/libs/jquery/jquery.browser.js rename to runbot/static/libs/jquery/jquery.browser.js diff --git a/runbot/static/src/libs/jquery/jquery.js b/runbot/static/libs/jquery/jquery.js similarity index 100% rename from runbot/static/src/libs/jquery/jquery.js rename to runbot/static/libs/jquery/jquery.js diff --git a/runbot/static/src/libs/popper/popper.js b/runbot/static/libs/popper/popper.js similarity index 100% rename from runbot/static/src/libs/popper/popper.js rename to runbot/static/libs/popper/popper.js diff --git a/runbot/static/src/js/fields/fields.css b/runbot/static/src/fields/fields.css similarity index 100% rename from runbot/static/src/js/fields/fields.css rename to runbot/static/src/fields/fields.css diff --git a/runbot/static/src/js/fields/fields.js b/runbot/static/src/fields/fields.js similarity index 100% rename from runbot/static/src/js/fields/fields.js rename to runbot/static/src/fields/fields.js diff --git a/runbot/static/src/js/fields/tracking_value.js b/runbot/static/src/fields/tracking_value.js similarity index 100% rename from runbot/static/src/js/fields/tracking_value.js rename to runbot/static/src/fields/tracking_value.js diff --git a/runbot/static/src/js/fields/tracking_value.scss b/runbot/static/src/fields/tracking_value.scss similarity index 100% rename from runbot/static/src/js/fields/tracking_value.scss rename to runbot/static/src/fields/tracking_value.scss diff --git a/runbot/static/src/js/fields/tracking_value.xml b/runbot/static/src/fields/tracking_value.xml similarity index 100% rename from runbot/static/src/js/fields/tracking_value.xml rename to runbot/static/src/fields/tracking_value.xml diff --git a/runbot/static/src/js/runbot.js b/runbot/static/src/frontend/runbot.js similarity index 100% rename from runbot/static/src/js/runbot.js rename to runbot/static/src/frontend/runbot.js diff --git a/runbot/static/src/js/stats.js b/runbot/static/src/frontend/stats.js similarity index 100% rename from runbot/static/src/js/stats.js rename to runbot/static/src/frontend/stats.js diff --git a/runbot/static/src/js/log_display.js b/runbot/static/src/js/log_display.js deleted file mode 100644 index e69de29b..00000000 diff --git a/runbot/templates/build_stats.xml b/runbot/templates/build_stats.xml index 5c0d815d..5c2883f0 100644 --- a/runbot/templates/build_stats.xml +++ b/runbot/templates/build_stats.xml @@ -131,7 +131,7 @@ - + diff --git a/runbot/templates/utils.xml b/runbot/templates/utils.xml index 9b3f74cd..10089f7e 100644 --- a/runbot/templates/utils.xml +++ b/runbot/templates/utils.xml @@ -6,38 +6,38 @@ - <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/libs/bootstrap/css/bootstrap.css"/> + <link rel="stylesheet" type="text/css" href="/runbot/static/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"/> + <script src="/runbot/static/libs/jquery/jquery.js" type="text/javascript"/> + <script type="text/javascript" src="/runbot/static/libs/popper/popper.js"/> + <script type="text/javascript" src="/runbot/static/libs/bootstrap/js/bootstrap.bundle.js"/> + <script type="text/javascript" src="/runbot/static/src/frontend/runbot.js"/> <t t-if="refresh"> <meta http-equiv="refresh" t-att-content="refresh"/> </t> <t t-if="not page_info_state or page_info_state == 'ok' or page_info_state not in ('warn', 'ko', 'skipped', 'killed', 'manually_killed')"> - <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_ok.png"/> - <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_ok.svg"/> + <link rel="icon" type="image/png" href="/runbot/static/img/icon_ok.png"/> + <link rel="icon" type="image/svg+xml" href="/runbot/static/img/icon_ok.svg"/> </t> <t t-elif="page_info_state == 'ko'"> - <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_ko.png"/> - <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_ko.svg"/> + <link rel="icon" type="image/png" href="/runbot/static/img/icon_ko.png"/> + <link rel="icon" type="image/svg+xml" href="/runbot/static/img/icon_ko.svg"/> </t> <t t-elif="page_info_state == 'warn'"> - <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_warn.png"/> - <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_warn.svg"/> + <link rel="icon" type="image/png" href="/runbot/static/img/icon_warn.png"/> + <link rel="icon" type="image/svg+xml" href="/runbot/static/img/icon_warn.svg"/> </t> <t t-elif="page_info_state == 'skipped'"> - <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_skipped.png"/> - <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_skipped.svg"/> + <link rel="icon" type="image/png" href="/runbot/static/img/icon_skipped.png"/> + <link rel="icon" type="image/svg+xml" href="/runbot/static/img/icon_skipped.svg"/> </t> <t t-elif="page_info_state == 'killed' or page_info_state == 'manually_killed'"> - <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_killed.png"/> - <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_killed.svg"/> + <link rel="icon" type="image/png" href="/runbot/static/img/icon_killed.png"/> + <link rel="icon" type="image/svg+xml" href="/runbot/static/img/icon_killed.svg"/> </t> </head> <body>