From 389f3989568fffe2efc5537e4c1d99baca39831b Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Thu, 29 Apr 2021 11:07:57 +0200 Subject: [PATCH] more cleaning --- Makefile | 11 ----------- extensions/odoo_theme/layout.html | 2 +- extensions/odoo_theme/static/style.scss | 4 ++-- static/js/accounts.js | 2 +- static/js/chart-of-accounts.js | 2 +- static/js/entries.js | 2 +- static/js/inventory.js | 2 +- static/js/misc.js | 6 +++--- static/js/reconciliation.js | 2 +- 9 files changed, 11 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 6a1a49786..9255c55fb 100644 --- a/Makefile +++ b/Makefile @@ -71,14 +71,3 @@ fast: html static: extensions/odoo_theme/static/style.css cp -r extensions/odoo_theme/static/* _build/html/_static/ cp -r static/* _build/html/_static/ - -lang: - 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/layout.html b/extensions/odoo_theme/layout.html index 46aa1ca8b..96e47602c 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -76,7 +76,7 @@
{%- set main_classes = [] %} {%- if pagename == master_doc %} {# The current page is the homepage #} - {%- set main_classes = main_classes + ['index'] %} {# TODO EDI should be 'o_index' #} + {%- set main_classes = main_classes + ['o_index'] %} {%- endif %} {%- if 'code-column' in meta %} {# The page contains a 'memento' (dynamic side block) #} diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 2e52d40d4..6d1ed86d8 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -378,7 +378,7 @@ header.o_main_header{ margin: 0; } - &.index, &.o_fullwidth_page, &.o_has_code_column { + &.o_index, &.o_fullwidth_page, &.o_has_code_column { @include media-breakpoint-up(lg) { max-width: calc(100vw - (#{$o-side-nav-width} + var(--bs-gutter-x, 1rem)) ); } @@ -386,7 +386,7 @@ header.o_main_header{ // Homepage - &.index { + &.o_index { .o_content_fw_banner { margin: -3rem -0.75rem 3rem; padding: 2rem 1rem; diff --git a/static/js/accounts.js b/static/js/accounts.js index 72f4f190c..1659bd04b 100644 --- a/static/js/accounts.js +++ b/static/js/accounts.js @@ -1,6 +1,6 @@ /* global Immutable, React */ (function () { - // NOTE VFE: used by memento.rst + // NOTE: used by memento.rst 'use strict'; function highlight(primary, secondary) { diff --git a/static/js/chart-of-accounts.js b/static/js/chart-of-accounts.js index b1fec2085..f788025cd 100644 --- a/static/js/chart-of-accounts.js +++ b/static/js/chart-of-accounts.js @@ -1,7 +1,7 @@ /* global Immutable, React */ /* global createAtom */ (function () { - // NOTE VFE: used by memento.rst + // NOTE: used by memento.rst 'use strict'; var data = createAtom(); diff --git a/static/js/entries.js b/static/js/entries.js index 95ea7ac50..5e0b48756 100644 --- a/static/js/entries.js +++ b/static/js/entries.js @@ -2,7 +2,7 @@ /* global createAtom, findAncestor */ (function () { 'use strict'; - // NOTE VFE: memento.rst + // NOTE: memento.rst var data = createAtom(); data.addWatch('chart', function (k, m, prev, next) { diff --git a/static/js/inventory.js b/static/js/inventory.js index 1961b1372..d4cce2774 100644 --- a/static/js/inventory.js +++ b/static/js/inventory.js @@ -1,7 +1,7 @@ /* global Immutable, React */ /* global createAtom */ (function () { - // NOTE VFE: used for double_entry.rst file + // NOTE: used for double_entry.rst file 'use strict'; var data = createAtom(); diff --git a/static/js/misc.js b/static/js/misc.js index 4f9aec6e5..c39ea03e2 100644 --- a/static/js/misc.js +++ b/static/js/misc.js @@ -6,7 +6,7 @@ }); function highlight() { - // NOTE VFE: used by double-entry.rst + // NOTE: used by double-entry.rst $('.highlighter-list').each(function () { var $this = $(this), $target = $($this.data('target')); @@ -34,7 +34,7 @@ * - automatically select first control on startup */ function alternatives() { - // NOTE VFE: used by double-entry.rst & valuation_methods pages + // NOTE: used by double-entry.rst & valuation_methods pages $('dl.alternatives').each(function (index) { var $list = $(this), $contents = $list.children('dd'); @@ -67,7 +67,7 @@ }); } function checks_handling() { - // NOTE VFE: used by memento.rst + // NOTE: used by memento.rst var $section = $('.checks-handling'); if (!$section.length) { return; } diff --git a/static/js/reconciliation.js b/static/js/reconciliation.js index 6f2aece61..b2dc99288 100644 --- a/static/js/reconciliation.js +++ b/static/js/reconciliation.js @@ -1,5 +1,5 @@ (function () { - // NOTE VFE: memento.rst + // NOTE: memento.rst document.addEventListener('DOMContentLoaded', function () { var $rec = $('#reconciliation .reconciliation-example'); if (!$rec.length) { return; }