From 3026e4cc66f014206842d2b330367fbc9fb79824 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 22 Mar 2021 11:58:15 +0100 Subject: [PATCH 01/12] [IMP] language names in their own language (continued) --- conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.py b/conf.py index ff341b972..79ad5c702 100644 --- a/conf.py +++ b/conf.py @@ -132,12 +132,12 @@ locale_dirs = ['locale/'] supported_languages = { 'de': 'Deutsch', 'en': 'English', - 'es': 'Espanol', + 'es': 'Español', 'fr': 'Français', 'nl': 'Nederlands', 'pt_BR': 'Português (BR)', - 'uk': 'Ukrainian', - 'zh_CN': 'Chinese', + 'uk': 'українська', + 'zh_CN': '简体中文', } # The specifications of redirect rules used by the redirects extension. From 6d4389ca8bddd5bc162cf9da3dd5784446b96309 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 22 Mar 2021 12:28:50 +0100 Subject: [PATCH 02/12] [FIX] scrolling issue fixed! No need for JS: AMEN --- extensions/odoo_theme/static/style.scss | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index f8426df2b..121f4e244 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -17,6 +17,12 @@ body { dd { margin-left: 1rem; } + // This fixes the scroll position on all elements, including refs + :target { + &:before { + @include scroll-padding() + } + } } .hidden { @@ -528,14 +534,6 @@ header.o_main_header{ } section { - // This fixes the scroll position // BUT creates issues when buttons or links from the previous section are behind it - // padding-top: $o-header-height; - // margin-top: -$o-header-height; */ - // adding a :before works better; - &:before { - @include scroll-padding() - } - > h1 { color: $o-violet-dark; font-weight: $fw_bold; From f1d304831ce1c0b18c3c3ce634f4842672304046 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 22 Mar 2021 13:29:22 +0100 Subject: [PATCH 03/12] [IMP] replace green/orange/red bullets on support page with flat design --- content/services/support/supported_versions.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/services/support/supported_versions.rst b/content/services/support/supported_versions.rst index 96998e31d..e6dfab61a 100644 --- a/content/services/support/supported_versions.rst +++ b/content/services/support/supported_versions.rst @@ -63,13 +63,13 @@ This matrix shows the support status of every version. 🏁 Future version, not released yet -.. |green| image:: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDphNmMxNWY4YS00NjY3LTQ3MWEtOTJhMy05ZDdmN2NkM2M5YmEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDFGNDhDMjZGODREMTFFOUFCRkRBRDVFRERCQzYwOEEiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDFGNDhDMjVGODREMTFFOUFCRkRBRDVFRERCQzYwOEEiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpjM2E2MzlhMC00YzgzLTRlYjgtYTY5Zi1kMWQ2ODM0ODUxNGQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6YTZjMTVmOGEtNDY2Ny00NzFhLTkyYTMtOWQ3ZjdjZDNjOWJhIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+AIIG+AAAAqxJREFUeNq8lz9oFEEUxnfXFUQsDBIhnVhqYUSwMYVgo8QEO5GIIop/CkGCaGOpaIiVJJCIaQJaBCsPEaLYCVpYqU0qFURMoYly2MzM+nt7s3fD7O4lMbspvntv3gzzvffd7PwJp8xUkCRJYIxpWx9a603Yw2AQ/xB2N7YHhGCZ9hfsO/ACvAJNECitAqNNoJSSOdqQdixkGQpIt4Az4Dw4YBNoT2DH9Ngk+sEl8AnMgkeQ/vRJM0RFFVocAW8ZNI096JNqowsnpMq92DHwHv9U0ZiUuKTSm2CeAfsyMp9UJCyb1Mq5Syv9BP+BJO3KXFbxOLhHZ/Q/pAX/6VUqf4yN3bhPfANcd8lWQyqLqMh3kjlJfNId4xLLqr27VlJ/tSJvWfwi/jm/Ylm9kxXK267ci48T75PkMuLTBPdULG9uDNiBP5pWzM9mcKUmeXPJEDuL3xtDNAD6q5K3m+wWvWBQiIfd/3YlebP4auUtSfxYzM/Aeiv1N4ecvPmx+2O74dcrr/K2WaP7pOLtGyRvi7jFs1WIw/STqlNe06nW9oXyOf3u9rmsYXPoxLX9lFRpQn8je4hXsTkEKxXgKLAY2ZtDNZtDd3k7lwdtPghxY4PkdQ+feSF+DRbqltch/YN9FtmL2Uzd8jr2KfZrZDsfMvBbzfKmq9neboLITrKEHa1R3szeRpEFkxjO42whKT1H50RN8op9DsayzSryZLxGRXMVyyv2DcmNAC3j0oo9qaRjhMmnK5S3waTHsctptZAmJskRS6Xw6Mv4F8DiOuRtYm+BE2Apu1QKqdioy4Y/QwbybLlP/HtbXkfmEtJf6fNFXh9G3xEJU3kdUkE41BhqZa8K9upObKfcGsBROcTlPGWybfbR1qT9g/ZHJnxJWxbR5/T4swvJfxCK/0+AAQAmKbWesdxiOAAAAABJRU5ErkJggg== +.. |green| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6IzAwYTcwMCIvPjwvc3ZnPg== :width: 15 -.. |red| image:: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDphNmMxNWY4YS00NjY3LTQ3MWEtOTJhMy05ZDdmN2NkM2M5YmEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDFGNDhDMkFGODREMTFFOUFCRkRBRDVFRERCQzYwOEEiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDFGNDhDMjlGODREMTFFOUFCRkRBRDVFRERCQzYwOEEiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpjM2E2MzlhMC00YzgzLTRlYjgtYTY5Zi1kMWQ2ODM0ODUxNGQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6YTZjMTVmOGEtNDY2Ny00NzFhLTkyYTMtOWQ3ZjdjZDNjOWJhIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+8nyGFAAAAoxJREFUeNq8lz9oFEEUh/fGFUQsDBIhqcRSCyMHNloEbJRIsBOJKKL4pxBERBtLxYRYiSkU0wS0ECuPIESxE7SwUptUKoiYQqMSbHZm/N7uzN7csnceunvFd+/N3O7+9v12dmemYZrNyFobmSjKosvDqK1dRxynPUG+l3w7cQga8IP2R+JreArPYU1n56UkQe7bsYhZLypCnaIb4Dicot10N5BfwGQMuZsYg7PwHhbgPnwrinpUsbog3w+vOOgu7T1lorqcnTADb+Co7iZsy0WvwhIH7JJ2UaiHaGjnNnhIfltuumi7Mm3LvOgsTPOnMiVCfYqG7QvwAOKkh9VX4LJ2bd0eXH2LduEIzOVtY1zFmcA43MxF/7HSpHv/GfKTxYpl9M5VaG+3/lmqHUmCZ3yMzh0V29sJ9sIW8ktpxfysh/M12dvZjwZ9J8iHYy6+D9GxGu3Nqm23h2EiRnQyfLaV21v+38FYS8V1VersLcl3x+6DX6u9SeH6xBGpePOA7M2/kOQbRbhRt725oHtdoSGv08/K7SXmr1O5A7+Vm8Sr+Dj0fTyaK8qtHCr5OPzF3nCAvRXh1oDsDUf1kgi/gOUB2OvjL+IT5RZm8wOw18fHfC0/KXfiPfhcs73paEZ02s9O0rHqp6ua7I3cAuM6+bL1wu6uH5HfqcleEV0kn/FtVbjwRZ3dQJX2iuhL8inQ2q3jVeEk+WNK1tIV2tsiP2SyHUcqaoJnHNqbwDny07DyH/auIXqN/DCsFrdGqsfonadS2bbcSoz54u1NnNU9Kv0u2xfZfZDfAKNL9mON1uhomiQlzzPo2yqrBjggk7jMp8RNMsuklVn7lfiO+Iy4yMU/mE67o3DHInb/EWAA56Ap3OqLYGgAAAAASUVORK5CYII= +.. |red| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2QwMDAwMCIvPjwvc3ZnPg== :width: 15 -.. |orange| image:: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDphNmMxNWY4YS00NjY3LTQ3MWEtOTJhMy05ZDdmN2NkM2M5YmEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTA0MTQ2QzdGODQ5MTFFOUFCRkRBRDVFRERCQzYwOEEiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTA0MTQ2QzZGODQ5MTFFOUFCRkRBRDVFRERCQzYwOEEiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpjM2E2MzlhMC00YzgzLTRlYjgtYTY5Zi1kMWQ2ODM0ODUxNGQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6YTZjMTVmOGEtNDY2Ny00NzFhLTkyYTMtOWQ3ZjdjZDNjOWJhIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+AQXwQQAAAtZJREFUeNq8lz1oFEEUx/cmKwSxMEiEdGKphZGAjSkCNoaI2IlEFFH8KAQJoo2digmxkqSImEaIRbAyiBDFTtDCythYqSCihSZKuObmjb/Zmf26ryzcruFe3nv7dua389+5mbmaXrsdtP8zfDARnOkLjIwRT2CHifcakQHiWiB6A/+F/F2g9QvyV+SbRnRATnsdmMhLlBtpRD7sCjXSD/QM/jwNRzD7AHzEdSRRhwPuIfQwdon8I9DHdP6I/JcRndzrHsbFqgv0iBHzFr9Aw0OtUGcmfgA/KjrfTzzDtffEp2JQVI/ucSNWHaA3ga7iDySQlpFql+scNJVX9B6gT4gfIHWf8ded3DlwAp0FOo1XnaGSQqUtNJEU4FVGuYSFgW4k96km6A2g1y2oPbRJ3i2giRpan8Tms/epDHQM6L3O0ELyZkcaNMl7EX8urikHNf1A50uU102iaCI1srVZakNOatfhaf7tK1neZCLFsxnoLuKpSGq+p9uoXqlI3qZFJLKzxIMh1VE6Gy5P3ixU8lD3YIPEEyGdHcdUKfJ2G2l83bUbt+DRnkdaFKpdO+KDoV/wq5VXWubHUAhkZ+XyxtB0gm0P/dZWrbxZqLte43us/5S0OBSF2vvrym/iZSwOxaCO9VNFJwcpaXEoAnW1D4pgpQi0Z3lTqM1X7Tt+TfLpP8gbQ//inyl/MFusXF4tcf6U+lflGz0k+VaxvNbXqU/bXPkRrFOYqlDeOL8TvVZjwam8y8RzFclr68/xM8afcJTROQmvMarlkuW19Tf4SWMv+KVZBZKTV2OT2EKJ8q7gjwHdyB42lN+cs500aHQZf8GuMD3Iu0n9Fv4E0PUsNBCD1P5kn5c36nSRzkeI72Pfk41Bbynvb7z9+WJ/fdw1dj1ugtr3XKsvTXSeSGm8Gz8O9KjdxO1+Sr7D7jJcsyP7Qcdr5C/xTCL92f3Yyx+VY6g92f4TYABoYgaZy0z5agAAAABJRU5ErkJggg== +.. |orange| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2ZmYTcwMCIvPjwvc3ZnPg== :width: 15 I run an older version of Odoo/OpenERP/TinyERP From c5a28e235144e442ce2e894fc73dbc3cc17a47ee Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 09:34:28 +0100 Subject: [PATCH 04/12] [IMP] change ".doc-toc" to ".o_fullwidth_page" --- extensions/odoo_theme/layout.html | 4 +--- extensions/odoo_theme/static/style.scss | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index 0071226d0..5dd06453d 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -84,9 +84,7 @@ {% endif %} {% if 'has_only_toc' in meta or 'hide_page_toc' in meta %} - {# The page only contains a toctree or the page toc is hidden #} - {# TODO EDI rename doc-toc class to sthg more meaningful explaining the result (body taking full page) #} - {% set main_classes = main_classes + ['doc-toc'] %} {# Increase body width, taking the place of the page toc #} + {% set main_classes = main_classes + ['o_fullwidth_page'] %} {% endif %}
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 121f4e244..60b44a811 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -380,7 +380,7 @@ header.o_main_header{ // "in between" pages (Applications / Contributing) - &.doc-toc { + &.o_fullwidth_page { .toctree-wrapper { margin-top: 1.5rem; > ul { From cf7347164d031910dda992e32959631feff32eed Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 09:35:07 +0100 Subject: [PATCH 05/12] [IMP] change "visibility: hidden" to "display: none" on page toc --- extensions/odoo_theme/static/js/page_toc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/odoo_theme/static/js/page_toc.js b/extensions/odoo_theme/static/js/page_toc.js index c18bc6f0e..e9e07f9ad 100644 --- a/extensions/odoo_theme/static/js/page_toc.js +++ b/extensions/odoo_theme/static/js/page_toc.js @@ -28,7 +28,7 @@ /** * Entirely hide the local tree of contents. */ - const _hidePageToc = () => this.pageToc.style.visibility = 'hidden'; + const _hidePageToc = () => this.pageToc.style.display = 'none'; /** * Add the relevant classes on the TOC entries (and lists) whose section is focused. From e0c892a6930226b09b1a46b4b8f4affa76e7a9d4 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 09:35:37 +0100 Subject: [PATCH 06/12] [IMP] fix github link position --- extensions/odoo_theme/static/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 60b44a811..48af54d8b 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -499,7 +499,7 @@ header.o_main_header{ .o_git_link { @include font-size($font-size-secondary); - @include o-position-absolute($top: calc(#{$o-header-height} + 1rem), $right: 1rem); + @include o-position-absolute($top: 10px, $right: 1rem); i { margin-right: .2rem; } From 27f01a9a610ef3d3c7b97ff4d3d246a5ad05a403 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 09:37:20 +0100 Subject: [PATCH 07/12] [IMP] remove "#mask" div and remove ".o_content" from around article --- extensions/odoo_theme/layout.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index 5dd06453d..35c0c210a 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -88,10 +88,12 @@ {% endif %}
-
+ {% if pagename == master_doc %} +
{# Custom landing page on the root of the documentation #} {% include "layout_templates/homepage.html" %} +
{% else %}
@@ -104,8 +106,6 @@ {% endif %}
{% endif %} -
-
{# VFE TODO Check if this condition is still needed ??? #} {% if pagename not in toc and 'hide_page_toc' not in meta %} From 50bde37cf255bb39d3d929b8b27b1ff7d0e9a16b Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 09:54:19 +0100 Subject: [PATCH 08/12] [DESIGN] modify spacings above titles in content --- extensions/odoo_theme/static/style.scss | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 48af54d8b..b8372d7ae 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -538,7 +538,7 @@ header.o_main_header{ color: $o-violet-dark; font-weight: $fw_bold; max-width: calc(100% - 120px); - + *:not(h2) { + + * { margin-top: 1rem; } } @@ -546,17 +546,21 @@ header.o_main_header{ > h2 { font-family: $font-family-serif; color: $gray-darker; - margin-top: .5rem; - margin-bottom: 1.5rem; + margin-top: 3rem; + margin-bottom: 1rem; padding-bottom: .3rem; border-bottom: 1px solid $gray-light; } > h3 { - color: $gray-darkest; + margin-top: 2rem; font-weight: $fw_bold; } + > h4 { + margin-top: 2rem; + } + > h4, > h5, > h6 { font-weight: $fw_semibold; } @@ -606,12 +610,10 @@ header.o_main_header{ @include o-transition(all, .1s) } } - h1, h2, h3, h4, h5, h6, dt, caption, p.caption, div.code-block-caption { - &:hover > a.headerlink:after{ + *:hover > a.headerlink:after{ // This makes permalinks only visible on hover. visibility: visible; opacity: 1; - } } } @@ -658,6 +660,7 @@ header.o_main_header{ text-align: center; color: $white; font-weight: $fw_extrabold; + font-style: normal; margin: 0 .2rem; } } From f4847d02d0dd0065bdc491bd1d2aaf08dd5227b7 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 10:41:24 +0100 Subject: [PATCH 09/12] drop 'has_only_toc' meta --- conf.py | 23 ----------------------- content/applications.rst | 1 + content/contributing/documentation.rst | 2 +- extensions/odoo_theme/layout.html | 4 ++-- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/conf.py b/conf.py index 79ad5c702..836a3efdc 100644 --- a/conf.py +++ b/conf.py @@ -244,8 +244,6 @@ def setup(app): app.add_config_value('languages', None, 'env') app.connect('html-page-context', _generate_alternate_urls) - app.connect('doctree-resolved', tag_toctrees) # TODO ANVFE review + typo - def _generate_alternate_urls(app, pagename, templatename, context, doctree): """ Add keys of required alternate URLs for the current document in the rendering context. @@ -319,24 +317,3 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree): _canonicalize() _versionize() _localize() - - -def tag_toctrees(app, doctree, docname): - """Add a 'has_only_toc' metadata entry to all documents containing only a toctree node""" - # document - # section - # title - # compound@toctree-wrapper - # .... - if not len(doctree.children) <= 1: - return - section = doctree.children[0] - if len(section.children) < 2: - return - compound = section.children[1] - if 'toctree-wrapper' not in compound['classes']: - return - - if 'show_content' not in app.env.metadata[docname]: - # If page contains custom content: we have to show github link and local toc - app.env.metadata[docname]['has_only_toc'] = True diff --git a/content/applications.rst b/content/applications.rst index 8ea646be5..3f4f12d2f 100644 --- a/content/applications.rst +++ b/content/applications.rst @@ -1,4 +1,5 @@ :show_content: +:hide_page_toc: ============ Applications diff --git a/content/contributing/documentation.rst b/content/contributing/documentation.rst index 81b3bef70..63b1b6882 100644 --- a/content/contributing/documentation.rst +++ b/content/contributing/documentation.rst @@ -1,5 +1,5 @@ - :show_content: +:hide_page_toc: ================================= Contributing to the documentation diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index 35c0c210a..a9b1808aa 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -83,7 +83,7 @@ {% set main_classes = main_classes + meta['classes'].split() %} {% endif %} - {% if 'has_only_toc' in meta or 'hide_page_toc' in meta %} + {% if 'hide_page_toc' in meta %} {% set main_classes = main_classes + ['o_fullwidth_page'] %} {% endif %} @@ -101,7 +101,7 @@ {% block body %} {% endblock %} {# Do not show the edition link for pages without content #} - {% if github_link and 'has_only_toc' not in meta and pagename != 'search' %} + {% if github_link and pagename != 'search' %} Edit on GitHub {% endif %} From 108c3102f5cd1ec06b574678988cac85500f5732 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 11:08:30 +0100 Subject: [PATCH 10/12] remove useless comments (anv) --- extensions/odoo_theme/layout_templates/header.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/extensions/odoo_theme/layout_templates/header.html b/extensions/odoo_theme/layout_templates/header.html index 11bff777a..daa99c41e 100644 --- a/extensions/odoo_theme/layout_templates/header.html +++ b/extensions/odoo_theme/layout_templates/header.html @@ -7,11 +7,7 @@ {% include "layout_templates/searchbox.html" %}
- {#{% if alternate_languages %}#} - {% include "layout_templates/language_switcher.html" %} - {#{% endif %}#} - {#{% if alternate_versions %}#} - {% include "layout_templates/version_switcher.html" %} - {#{% endif %}#} + {% include "layout_templates/language_switcher.html" %} + {% include "layout_templates/version_switcher.html" %} Try Odoo for FREE
\ No newline at end of file From 6595bad9d23654e98317adaa09c613aad778fec6 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 11:21:32 +0100 Subject: [PATCH 11/12] handle noscript rendering --- extensions/odoo_theme/layout.html | 40 +-- .../odoo_theme/layout_templates/homepage.html | 234 +++++++++--------- extensions/odoo_theme/static/style.scss | 2 +- 3 files changed, 140 insertions(+), 136 deletions(-) diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index a9b1808aa..20ea54d08 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -55,6 +55,11 @@ {% block header %} {# shown when js has properly set all the classes on the toc elements #} + @@ -72,7 +77,7 @@ {% set main_classes = [] %} {% if pagename == master_doc %} {# The current page is the homepage #} - {% set main_classes = main_classes + ['index'] %} {# TODO ANVFE should be 'o_index' #} + {% set main_classes = main_classes + ['index'] %} {# TODO EDI should be 'o_index' #} {% endif %} {% if 'code-column' in meta %} {# The page contains a 'memento' (side dynamic block) #} @@ -88,24 +93,21 @@ {% endif %}
- - {% if pagename == master_doc %} -
- {# Custom landing page on the root of the documentation #} - {% include "layout_templates/homepage.html" %} -
- {% else %} -
- -
- {% block body %} {% endblock %} -
- {# Do not show the edition link for pages without content #} - {% if github_link and pagename != 'search' %} - Edit on GitHub - {% endif %} -
- {% endif %} + {% if pagename == master_doc %} + {# Custom landing page on the root of the documentation #} + {% include "layout_templates/homepage.html" %} + {% else %} +
+ +
+ {% block body %} {% endblock %} +
+ {# Do not show the edition link for pages without content #} + {% if github_link and pagename != 'search' %} + Edit on GitHub + {% endif %} +
+ {% endif %}
{# VFE TODO Check if this condition is still needed ??? #} {% if pagename not in toc and 'hide_page_toc' not in meta %} diff --git a/extensions/odoo_theme/layout_templates/homepage.html b/extensions/odoo_theme/layout_templates/homepage.html index 613ab7f85..22bc0f63d 100644 --- a/extensions/odoo_theme/layout_templates/homepage.html +++ b/extensions/odoo_theme/layout_templates/homepage.html @@ -1,118 +1,120 @@ -
-
-

Getting Started

-
    -
  • - Overview of Odoo -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Requirements -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - New to Odoo – Where to start -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Version 14 -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - History -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
+
+
+
+

Getting Started

+
    +
  • + Overview of Odoo +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Requirements +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + New to Odoo – Where to start +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Version 14 +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + History +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
+
+
+

Installing Odoo

+
    +
  • + Before you install +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + How to install +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Deploying Odoo +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Database Management +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
+
+
+

Basic Usage

+
    +
  • + Odoo in your own language +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Add users and manage access rights +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Import data to Odoo +

    The button is under "Favorites" ... Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do + eiusmod tempo.

    +
    • +
  • + Get support +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + History +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
+
-
-

Installing Odoo

-
    -
  • - Before you install -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - How to install -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Deploying Odoo -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Database Management -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
+
+
+

Tutorials

+
    +
  • + Building a website +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Building a module +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Customizing the web client +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
+
+
+

Advanced Usage

+
    +
  • + External API +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + In-app purchases +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Creating a localisation +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Database upgrade +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
  • + Odoo email gateway +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    +
    • +
+
-
-

Basic Usage

-
    -
  • - Odoo in your own language -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Add users and manage access rights -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Import data to Odoo -

    The button is under "Favorites" ... Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempo.

    -
    • -
  • - Get support -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - History -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
-
-
-
-
-

Tutorials

-
    -
  • - Building a website -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Building a module -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Customizing the web client -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
-
-
-

Advanced Usage

-
    -
  • - External API -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - In-app purchases -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Creating a localisation -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Database upgrade -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
  • - Odoo email gateway -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempo.

    -
    • -
-
-
+
\ No newline at end of file diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index b8372d7ae..4e3e3230a 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -326,7 +326,7 @@ header.o_main_header{ margin: 0; } - &.index, &.doc-toc, &.has_code_col { + &.index, &.o_fullwidth_page, &.has_code_col { @include media-breakpoint-up(lg) { max-width: calc(100vw - (#{$o-side-nav-width} + var(--bs-gutter-x, 1.5rem)) ); } From 1457ce0334ecf0cd95776180d9836ecd7eb964f1 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Wed, 24 Mar 2021 16:43:34 +0100 Subject: [PATCH 12/12] add Community url --- extensions/odoo_theme/layout_templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/odoo_theme/layout_templates/footer.html b/extensions/odoo_theme/layout_templates/footer.html index 2c73c1851..612c2348c 100644 --- a/extensions/odoo_theme/layout_templates/footer.html +++ b/extensions/odoo_theme/layout_templates/footer.html @@ -3,7 +3,7 @@
Get Help