WIP ref display logic

TODO remove hacky banners logic, use this cleaner one instead
This commit is contained in:
Victor Feyens 2020-09-28 18:20:50 +02:00
parent 04388d5a09
commit 2c55f54d58
4 changed files with 35 additions and 20 deletions

View File

@ -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:

View File

@ -222,31 +222,43 @@
</div>
</figure>
{% if 'code-column' in meta %}
{% set container = 'container-fluid' %}
{% set container = 'container-fluid' %}
{% else %}
{% set container = 'container' %}
{% set container = 'container' %}
{% endif %}
<main class="container {{ ' '.join(classes) }}">
{% if pagename != master_doc and pagename != banners_doc %}
<div class="o_content row">
{% if 'has-toc' not in meta and not (pagename in toc) %}
<aside>
<div class="navbar-aside text-center">
{{ toc }}
{% if github_link %}
<p class="gith-container"><a href="{{ github_link(mode='edit') }}" class="gith-link">
Edit on GitHub
</a></p>
{% if pagename == master_doc %}
<div class="o_content row">
<article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
HOHOHOHO
<!-- {{ toc }} -->
{{ body }}
</article>
</div>
{% else %}
{% if 'banners-display' not in meta %}
<div class="o_content row">
{% if 'has-toc' not in meta and not (pagename in toc) %}
<aside>
<div class="navbar-aside text-center">
{{ toc }}
{% if github_link %}
<p class="gith-container">
<a href="{{ github_link(mode='edit') }}" class="gith-link">
Edit on GitHub
</a>
</p>
{% endif %}
</div>
</aside>
{% endif %}
</div>
</aside>
<article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
{% endif %}
<article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
{% endif %}
{% block body %} {% endblock %}
{% if pagename != master_doc and pagename != banners_doc %}
</article>
</div>
{% if 'banners-display' not in meta %}
</article>
</div>
{% endif %}
{% endif %}
<div id="mask"></div>
</main>

View File

@ -6,6 +6,7 @@ Odoo User Documentation
.. toctree::
:titlesonly:
:maxdepth: 1
user/index
developer/index

View File

@ -1,3 +1,5 @@
:banners-display:
=======================
Odoo User Documentation
=======================