From 379e948312e9930a13528b59aa476bf5ddc70919 Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Wed, 28 Apr 2021 12:26:21 +0200 Subject: [PATCH 1/2] add more testing make rules --- Makefile | 11 ++++++++--- extensions/odoo_theme/static/js/utils.js | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 32adf3d0e..bc5d4bab0 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,12 @@ static: extensions/odoo_theme/static/style.css cp -r static/* _build/html/_static/ lang: - make clean - make fast CANONICAL_VERSION=12.0 VERSIONS=12.0,13.0,14.0,master LANGUAGES=en,fr CURRENT_LANG=en - make fast CANONICAL_VERSION=12.0 VERSIONS=12.0,13.0,14.0,master LANGUAGES=en,fr CURRENT_LANG=fr + make fast LANGUAGES=en,fr CURRENT_LANG=en + make fast LANGUAGES=en,fr CURRENT_LANG=fr +version: + make fast CANONICAL_VERSION=12.0 VERSIONS=12.0,13.0,14.0,master + +both: + make fast CANONICAL_VERSION=12.0 VERSIONS=12.0,13.0,14.0,master LANGUAGES=en,fr CURRENT_LANG=en + make fast CANONICAL_VERSION=12.0 VERSIONS=12.0,13.0,14.0,master LANGUAGES=en,fr CURRENT_LANG=fr \ No newline at end of file diff --git a/extensions/odoo_theme/static/js/utils.js b/extensions/odoo_theme/static/js/utils.js index 38c4365e6..4909204d4 100644 --- a/extensions/odoo_theme/static/js/utils.js +++ b/extensions/odoo_theme/static/js/utils.js @@ -1,4 +1,5 @@ let tocEntryListId = 0; // Used to generate IDs of toc entry lists for both the menu and page TOC + /** * Update the provided TOC to allow collapsing its entries with Bootstrap's accordion. * From fc1015b98688be0585454eea79078388936d7e2e Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Wed, 28 Apr 2021 16:49:22 +0200 Subject: [PATCH 2/2] reword some comments --- conf.py | 5 ++--- extensions/odoo_theme/layout.html | 13 ++++++++----- extensions/odoo_theme/translator.py | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/conf.py b/conf.py index 7b5123524..a2396f7cb 100644 --- a/conf.py +++ b/conf.py @@ -164,9 +164,8 @@ html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'img', 'fa html_static_path = ['static'] html_add_permalinks = 'ΒΆ' # Sphinx < 3.5 html_permalinks = True # Sphinx >= 3.5 -# Additional css & js files: -# Empty because the js & css files are specified in the extensions/theme -# or specified for a given page only through the custom-js & custom-css metadata directives +# Additional JS & CSS files that can be imported with the 'custom-js' and 'custom-css' metadata. +# Lists are empty because the files are specified in extensions/themes. html_js_files = [] html_css_files = [] diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index 20d38f0bf..f0ee34846 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -3,7 +3,7 @@ {% block css %} {{ super() }} - {% if 'custom-css' in meta %}{# Allow custom css style import for specific pages #} + {% if 'custom-css' in meta %} {# Allow custom css style import for specific pages #} {% set css_files = meta['custom-css'].split(',') %} {% for css_file in css_files %} {% set link = '_static/css/' + css_file %} @@ -13,7 +13,7 @@ {% endblock %} {% block scripts %} - {% if 'custom-js' in meta %}{# Allow custom js import for specific pages #} + {% if 'custom-js' in meta %} {# Allow custom js import for specific pages #} {# Before the custom files using React & Immutable (accounting mementos) #}