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

[REV] Revert 54f0228dae

Browse Source 
Reason: delay changes until internal build tools are updated
This commit is contained in:
Antoine Vandevenne (anv) 2020-02-12 15:13:59 +01:00
parent b343d51cec
commit 9334afe66d
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_extensions/odoo/layout.html
View File

@ -1,11 +1,11 @@
{% extends "basic/layout.html" %}
{%- block scripts %}
{{ super() }}
<script type="text/javascript" src="{{ pathto('_static/jquery.min.js', 1) }}"></script>
<script type="text/javascript" src="{{ pathto('_static/bootstrap.js', 1) }}"></script>
<script type="text/javascript" src="{{ pathto('_static/doc.js', 1) }}"></script>
<script type="text/javascript" src="{{ pathto('_static/jquery.noconflict.js', 1) }}"></script>
{%- endblock %}
{% set script_files = script_files + [
'_static/jquery.min.js',
'_static/bootstrap.js',
'_static/doc.js',
'_static/jquery.noconflict.js',
] %}
{% set classes = [] %}
{% if pagename == master_doc %}

7
_extensions/odoo/translator.py
View File

@ -5,7 +5,7 @@ import re
import urllib
from docutils import nodes
from sphinx import addnodes, util, builders
from sphinx import addnodes, util
from sphinx.locale import admonitionlabels
from . import pycompat
@ -45,11 +45,6 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
]
def __init__(self, builder, document):
# order of parameter swapped between Sphinx 1.x and 2.x, check if
# we're running 1.x and swap back
if not isinstance(builder, builders.Builder):
builder, document = document, builder
super(BootstrapTranslator, self).__init__(document)
self.builder = builder
self.body = []