NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

layout cleanup/improvements

Browse Source 
remove outdated comments
fix todos/fixmes
...
This commit is contained in:
Victor Feyens 2021-04-28 12:11:29 +02:00
parent 77a2c9feaf
commit e128874cef
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/odoo_theme/layout.html
View File

@ -3,17 +3,18 @@
{% block css %} {% block css %}
{{ super() }} {{ super() }}
{# Allow custom css style import for specific pages #} {% if 'custom-css' in meta %}{# Allow custom css style import for specific pages #}
{% if 'custom-css' in meta %} {% set css_files = meta['custom-css'].split(',') %}
{# TODO VFE this should be wrapped in a loop as custom-css is a comma(, not ;)-separated list #} {% for css_file in css_files %}
{% set link = '_static/css/' + meta['custom-css'] %} {% set link = '_static/css/' + css_file %}
<link rel="stylesheet" href="{{ pathto(link, 1) }}" type="text/css"/> <link rel="stylesheet" href="{{ pathto(link, 1) }}" type="text/css"/>
{% endfor %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{% if 'custom-js' in meta %} {% if 'custom-js' in meta %}{# Allow custom js import for specific pages #}
{# Before the custom files using React & Immutable #} {# Before the custom files using React & Immutable (accounting mementos) #}
<script src="https://cdnjs.cloudflare.com/ajax/libs/immutable/3.8.2/immutable.min.js" <script src="https://cdnjs.cloudflare.com/ajax/libs/immutable/3.8.2/immutable.min.js"
integrity="sha512-myCdDiGJRYrvRb/VuJ67ljifYTJdc1jdEvL4c4ftX9o3N6EAnmD83c/7l2/91RCINZ7c8w21tiXDT7RDFjdc3g==" integrity="sha512-myCdDiGJRYrvRb/VuJ67ljifYTJdc1jdEvL4c4ftX9o3N6EAnmD83c/7l2/91RCINZ7c8w21tiXDT7RDFjdc3g=="
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
@ -27,13 +28,10 @@
<script src="{{ pathto(link, 1) }}"></script> <script src="{{ pathto(link, 1) }}"></script>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{# FIXME ANVFEDI Do we really need prefixfree ? It triggers a reload of css files two more times/page #} {{ super() }} {# Load the scripts specified in the extensions/themes #}
<!-- <script src="https://cdn.jsdelivr.net/npm/prefixfree@1.0.0/prefixfree.min.js" <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
integrity="sha256-a1jYldRqTzpGqk63nmXXjh/zPYp7Sjxp9iUYhNbYPXI=" integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
crossorigin="anonymous"></script> --> crossorigin="anonymous"></script>
{{ super() }}
{# TODO EDI boostrap beta cdn ??? Isn't there a stable CDN ? It looks like this cdn won't exist forever :D #}
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js" integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0" crossorigin="anonymous"></script>
{% endblock %} {% endblock %}
{% block linktags %} {% block linktags %}
@ -55,12 +53,12 @@
{% endblock %} {% endblock %}
{% block header %} {% block header %}
{# shown when js has properly set all the classes on the toc elements #}
<noscript> <noscript>
<nav class="o_side_nav border-end"> <nav class="o_side_nav border-end">
{% include "layout_templates/menu.html" %} {% include "layout_templates/menu.html" %}
</nav> </nav>
</noscript> </noscript>
{# shown when js has properly set all the classes on the toc elements #}
<nav id="o_main_toctree" class="o_side_nav border-end" hidden> <nav id="o_main_toctree" class="o_side_nav border-end" hidden>
{% include "layout_templates/menu.html" %} {% include "layout_templates/menu.html" %}
</nav> </nav>
@ -103,11 +101,9 @@
{% include "layout_templates/homepage.html" %} {% include "layout_templates/homepage.html" %}
{% else %} {% else %}
<article id="o_content" class="doc-body"> <article id="o_content" class="doc-body">
<!-- Beacon used by the Sphinx search to know where to look for a string --> <div role="main">{# Beacon used by the Sphinx search to know where to look for a string #}
<div role="main">
{% block body %} {% endblock %} {% block body %} {% endblock %}
</div> </div>
{# Do not show the edition link for pages without content #}
{% if github_link and pagename != 'search' %} {% if github_link and pagename != 'search' %}
<a href="{{ github_link(mode='edit') }}" class="o_git_link d-none d-lg-inline-block"><i class="i-edit"></i> Edit on GitHub</a> <a href="{{ github_link(mode='edit') }}" class="o_git_link d-none d-lg-inline-block"><i class="i-edit"></i> Edit on GitHub</a>
{% endif %} {% endif %}