From 2c55f54d58c8eb756f9e4e48644d6771aba1c0de Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 28 Sep 2020 18:20:50 +0200 Subject: [PATCH] WIP ref display logic TODO remove hacky banners logic, use this cleaner one instead --- _extensions/odoo_ext/__init__.py | 2 +- _extensions/odoo_ext/layout.html | 50 ++++++++++++++++++++------------ index.rst | 1 + user/index.rst | 2 ++ 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/_extensions/odoo_ext/__init__.py b/_extensions/odoo_ext/__init__.py index 14704663e..8d45aea01 100644 --- a/_extensions/odoo_ext/__init__.py +++ b/_extensions/odoo_ext/__init__.py @@ -109,7 +109,7 @@ if toctree: # than functions on the BuildEnv & al @monkey(toctree.TocTree) def resolve(old_resolve, tree, docname, *args, **kwargs): - if docname == tree.env.config.master_doc or docname in tree.env.config.banners_doc: + if docname in tree.env.config.banners_doc: return resolve_content_toctree(tree.env, docname, *args, **kwargs) toc = old_resolve(tree, docname, *args, **kwargs) if toc is None: diff --git a/_extensions/odoo_ext/layout.html b/_extensions/odoo_ext/layout.html index 2551cc902..55de1a423 100644 --- a/_extensions/odoo_ext/layout.html +++ b/_extensions/odoo_ext/layout.html @@ -222,31 +222,43 @@ {% if 'code-column' in meta %} - {% set container = 'container-fluid' %} + {% set container = 'container-fluid' %} {% else %} - {% set container = 'container' %} + {% set container = 'container' %} {% endif %}
- {% if pagename != master_doc and pagename != banners_doc %} -
- {% if 'has-toc' not in meta and not (pagename in toc) %} - +
{% endif %} -
- {% endif %} {% block body %} {% endblock %} - {% if pagename != master_doc and pagename != banners_doc %} -
-
+ {% if 'banners-display' not in meta %} + + + {% endif %} {% endif %}
diff --git a/index.rst b/index.rst index daf6c06a0..b94d8ddb0 100644 --- a/index.rst +++ b/index.rst @@ -6,6 +6,7 @@ Odoo User Documentation .. toctree:: :titlesonly: + :maxdepth: 1 user/index developer/index diff --git a/user/index.rst b/user/index.rst index d948250a0..5f91a0c9e 100644 --- a/user/index.rst +++ b/user/index.rst @@ -1,3 +1,5 @@ +:banners-display: + ======================= Odoo User Documentation =======================