[REF] web: static/src/(img|fonts) => static/(img|fonts)

addons/account/views/account_portal_templates.xml

@@ -119,7 +119,7 @@
                                 <div class="row">
                                     <div class="col flex-grow-0 pr-2">
                                         <img t-if="invoice.invoice_user_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(invoice.invoice_user_id.image_1024)" alt="Contact"/>
-                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                     </div>
                                     <div class="col pl-0">
                                         <span t-field="invoice.invoice_user_id" t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>

addons/crm/models/crm_lead.py

@@ -956,7 +956,7 @@ class Lead(models.Model):
                 'effect': {
                     'fadeout': 'slow',
                     'message': message,
-                    'img_url': '/web/image/%s/%s/image_1024' % (self.team_id.user_id._name, self.team_id.user_id.id) if self.team_id.user_id.image_1024 else '/web/static/src/img/smile.svg',
+                    'img_url': '/web/image/%s/%s/image_1024' % (self.team_id.user_id._name, self.team_id.user_id.id) if self.team_id.user_id.image_1024 else '/web/static/img/smile.svg',
                     'type': 'rainbow_man',
                 }
             }

addons/hw_drivers/views/pos_display.html

@@ -51,7 +51,7 @@
     <body>
         <div class="container-fluid">
             <div class="text-center pt-5">
-                <img style="width: 150px;" src="/web/static/src/img/logo_inverse_white_206px.png">
+                <img style="width: 150px;" src="/web/static/img/logo_inverse_white_206px.png">
                 <p class="mt-3" style="color: #fff;font-size: 30px;">IoTBox</p>
             </div>
             <div class="pos-display-boxes">

addons/hw_posbox_homepage/views/loading.html

@@ -2,7 +2,7 @@
 <div class="loading-block o_hide">
     <div class="loading-message-block">
         <div style="height: 50px">
-            <img src="/web/static/src/img/spin.png" style="animation: spin 4s infinite linear;" alt="Loading...">
+            <img src="/web/static/img/spin.png" style="animation: spin 4s infinite linear;" alt="Loading...">
         </div>
         <br>
         <div class="loading-message">

addons/im_livechat/static/src/legacy/public_livechat.scss

@@ -448,7 +448,7 @@ $o-mail-thread-window-zindex: $zindex-modal + 1 !default;
         &.o_neutral_face_icon:before {
             @extend %o-nocontent-init-image;
             @include size(120px, 140px);
-            background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+            background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
         }
     }
 

addons/mail/static/src/components/composer/composer.js

@@ -135,7 +135,7 @@ class Composer extends Component {
                     id: this.env.messaging.currentUser.id,
                     model: 'res.users',
                 })
-            : '/web/static/src/img/user_menu_avatar.png';
+            : '/web/static/img/user_menu_avatar.png';
         return avatar;
     }
 

addons/mail/static/src/components/message_list/message_list.scss

@@ -89,7 +89,7 @@
     &.o-neutral-face-icon:before {
         @extend %o-nocontent-init-image;
         @include size(120px, 140px);
-        background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+        background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
     }
 }
 

addons/mail/static/src/scss/thread.scss

@@ -147,7 +147,7 @@
         &.o_neutral_face_icon:before {
             @extend %o-nocontent-init-image;
             @include size(120px, 140px);
-            background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+            background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
         }
     }
 

addons/partner_autocomplete/static/tests/partner_autocomplete_tests.js

@@ -207,7 +207,7 @@ odoo.define('partner_autocomplete.tests', function (require) {
                 '<field name="vat"/>' +
                 '</form>',
             mockRPC: function (route) {
-                if (route === "/web/static/src/img/placeholder.png"
+                if (route === "/web/static/img/placeholder.png"
                     || route === "odoo.com/logo.png"
                     || route === "data:image/png;base64,odoobase64") { // land here as it is not valid base64 content
                     return Promise.resolve();
@@ -280,7 +280,7 @@ odoo.define('partner_autocomplete.tests', function (require) {
                 '<field name="vat"/>' +
                 '</form>',
             mockRPC: function (route) {
-                if (route === "/web/static/src/img/placeholder.png"
+                if (route === "/web/static/img/placeholder.png"
                     || route === "odoo.com/logo.png"
                     || route === "data:image/png;base64,odoobase64") { // land here as it is not valid base64 content
                     return Promise.resolve();

addons/payment/static/src/js/post_processing.js

@@ -124,7 +124,7 @@ odoo.define('payment.post_processing', function (require) {
         displayLoading: function () {
             var msg = _t("We are processing your payment, please wait ...");
             $.blockUI({
-                'message': '<h2 class="text-white"><img src="/web/static/src/img/spin.png" class="fa-pulse"/>' +
+                'message': '<h2 class="text-white"><img src="/web/static/img/spin.png" class="fa-pulse"/>' +
                     '    <br />' + msg +
                     '</h2>'
             });

addons/point_of_sale/__manifest__.py

@@ -53,7 +53,7 @@
             'point_of_sale/static/tests/tours/**/*',
         ],
         'point_of_sale.assets': [
-            'web/static/src/scss/fonts.scss',
+            'web/static/fonts/fonts.scss',
             'web/static/lib/fontawesome/css/font-awesome.css',
             'point_of_sale/static/src/css/pos.css',
             'point_of_sale/static/src/css/keyboard.css',

addons/point_of_sale/static/src/css/customer_facing_display.css

@@ -261,7 +261,7 @@ body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details .p
   line-height: 1.3;
 }
 body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details .pos-odoo_logo_container {
-  background-image: url(/web/static/src/img/logo_inverse_white_206px.png);
+  background-image: url(/web/static/img/logo_inverse_white_206px.png);
   background-position: right top;
   background-size: contain;
   background-repeat: no-repeat;

addons/point_of_sale/views/pos_assets_index.xml

@@ -23,7 +23,7 @@
 
         <style> body { background: #222; } </style>
 
-        <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
+        <link rel="shortcut icon" href="/web/static/img/favicon.ico" type="image/x-icon"/>
 
         <script type="text/javascript">
             var odoo = <t t-out="json.dumps({

addons/portal/views/portal_templates.xml

@@ -72,7 +72,7 @@
             <a href="#" role="button" data-toggle="dropdown" t-attf-class="dropdown-toggle #{_link_class}">
                 <t t-if="_avatar">
                     <t t-if="user_id.image_256" t-set="avatar_source" t-value="image_data_uri(user_id.image_256)"/>
-                    <t t-else="" t-set="avatar_source" t-value="'/web/static/src/img/placeholder.png'"/>
+                    <t t-else="" t-set="avatar_source" t-value="'/web/static/img/placeholder.png'"/>
                     <img t-att-src="avatar_source" t-attf-class="rounded-circle #{_avatar_class}" width="24" height="24" alt="" loading="eager"/>
                 </t>
                 <i t-if="_icon" t-attf-class="fa fa-1x fa-fw fa-user-circle-o #{_icon_class}"/>
@@ -203,7 +203,7 @@
                 </div>
                 <t t-if="entries" t-out="entries"/>
                 <div class="card-footer small text-center text-muted border-top-0 pt-1 pb-1 d-none d-lg-block">
-                    Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal" title="odoo"><img src="/web/static/src/img/logo.png" alt="Odoo Logo" height="15"/></a>
+                    Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal" title="odoo"><img src="/web/static/img/logo.png" alt="Odoo Logo" height="15"/></a>
                 </div>
             </div>
         </div>

addons/project/views/project_portal_templates.xml

@@ -92,7 +92,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="project.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(project.partner_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-sm-0">
                                     <address t-field="project.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
@@ -104,7 +104,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="project.user_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(project.user_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-sm-0">
                                     <address t-field="project.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
@@ -213,7 +213,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="task.user_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(task.user_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-md-0">
                                     <div t-field="task.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
@@ -225,7 +225,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="task.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(task.partner_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-md-0">
                                     <div t-field="task.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>

addons/purchase/views/portal_templates.xml

@@ -157,7 +157,7 @@
                               <div class="row flex-nowrap">
                                   <div class="col flex-grow-0 pr-2">
                                       <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="order.user_id.image_1024" t-att-src="image_data_uri(order.user_id.image_1024)" alt="Contact"/>
-                                      <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not order.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                      <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not order.user_id.image_1024" src="/web/static/img/placeholder.png" alt="Contact"/>
                                   </div>
                                   <div class="col pl-0" style="min-width: 150px">
                                       <span t-field="order.user_id" t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>

addons/sale/views/sale_portal_templates.xml

@@ -181,7 +181,7 @@
                                 <div class="row flex-nowrap">
                                     <div class="col flex-grow-0 pr-2">
                                         <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="sale_order.user_id.image_1024" t-att-src="image_data_uri(sale_order.user_id.image_1024)" alt="Contact"/>
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not sale_order.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not sale_order.user_id.image_1024" src="/web/static/img/placeholder.png" alt="Contact"/>
                                     </div>
                                     <div class="col pl-0" style="min-width: 150px">
                                         <span t-field="sale_order.user_id" t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>

addons/survey/views/survey_templates_print.xml

@@ -58,7 +58,7 @@
         <html>
             <head>
                 <title t-esc="'%s Preview' % page_title"/>
-                <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="/web/static/img/favicon.ico" type="image/x-icon"/>
             </head>
             <body style="margin:0;">
                 <iframe type="application/pdf" t-att-src="preview_url" frameBorder="0" width="100%" height="100%"/>

addons/web/__manifest__.py

@@ -265,7 +265,7 @@ This module provides the core of the Odoo Web Client.
 
             'base/static/src/css/description.css',
             'web/static/lib/fontawesome/css/font-awesome.css',
-            'web/static/src/scss/fonts.scss',
+            'web/static/fonts/fonts.scss',
             'web/static/src/scss/report.scss',
             'web/static/src/scss/layout_standard.scss',
             'web/static/src/scss/layout_background.scss',
@@ -327,7 +327,7 @@ This module provides the core of the Odoo Web Client.
             'web/static/lib/select2/select2.css',
             'web/static/lib/select2-bootstrap-css/select2-bootstrap.css',
             'web/static/lib/tempusdominus/tempusdominus.scss',
-            'web/static/src/scss/fonts.scss',
+            'web/static/fonts/fonts.scss',
             'web/static/src/scss/ui.scss',
             'web/static/src/scss/ui_extra.scss',
             'web/static/src/scss/navbar.scss',

addons/web/controllers/main.py

@@ -1374,7 +1374,7 @@ class Binary(http.Controller):
 
     @staticmethod
     def placeholder(image='placeholder.png'):
-        image_path = image.lstrip('/').split('/') if '/' in image else ['web', 'static', 'src', 'img', image]
+        image_path = image.lstrip('/').split('/') if '/' in image else ['web', 'static', 'img', image]
         with tools.file_open(get_resource_path(*image_path), 'rb') as fd:
             return fd.read()
 
@@ -1578,7 +1578,7 @@ class Binary(http.Controller):
     def company_logo(self, dbname=None, **kw):
         imgname = 'logo'
         imgext = '.png'
-        placeholder = functools.partial(get_resource_path, 'web', 'static', 'src', 'img')
+        placeholder = functools.partial(get_resource_path, 'web', 'static', 'img')
         uid = None
         if request.session.db:
             dbname = request.session.db
@@ -1640,8 +1640,8 @@ class Binary(http.Controller):
         fonts = []
         if fontname:
             module_path = get_module_path('web')
-            fonts_folder_path = os.path.join(module_path, 'static/src/fonts/sign/')
-            module_resource_path = get_resource_path('web', 'static/src/fonts/sign/' + fontname)
+            fonts_folder_path = os.path.join(module_path, 'static/fonts/sign/')
+            module_resource_path = get_resource_path('web', 'static/fonts/sign/' + fontname)
             if fonts_folder_path and module_resource_path:
                 fonts_folder_path = os.path.join(os.path.normpath(fonts_folder_path), '')
                 module_resource_path = os.path.normpath(module_resource_path)
@@ -1651,7 +1651,7 @@ class Binary(http.Controller):
                         fonts.append(font)
         else:
             current_dir = os.path.dirname(os.path.abspath(__file__))
-            fonts_directory = os.path.join(current_dir, '..', 'static', 'src', 'fonts', 'sign')
+            fonts_directory = os.path.join(current_dir, '..', 'static', 'fonts', 'sign')
             font_filenames = sorted([fn for fn in os.listdir(fonts_directory) if fn.endswith(('.ttf', '.otf', '.woff', '.woff2'))])
 
             for filename in font_filenames:

addons/web/static/fonts/fonts.scss

@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------
 // Lato
 // ------------------------------------------------------------------
-$lato-font-path: '../fonts/lato';
+$lato-font-path: './lato';
 
 @mixin lato-font($type, $weight, $style) {
     // Cyrillic: U+0400-04FF, U+0500-052F
@@ -69,7 +69,7 @@ $lato-font-path: '../fonts/lato';
 // ------------------------------------------------------------------
 // Google fonts
 // ------------------------------------------------------------------
-$google-font-path: '../fonts/google';
+$google-font-path: './google';
 
 @mixin google-font($family, $type, $weight, $style) {
     @font-face {