diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html
index 6eba82ada..4c80ed1a3 100644
--- a/_extensions/odoo/layout.html
+++ b/_extensions/odoo/layout.html
@@ -1,11 +1,11 @@
{% extends "basic/layout.html" %}
-
-{% set script_files = script_files + [
-'_static/jquery.min.js',
-'_static/bootstrap.js',
-'_static/doc.js',
-'_static/jquery.noconflict.js',
-] %}
+{%- block scripts %}
+ {{ super() }}
+
+
+
+
+{%- endblock %}
{% set classes = [] %}
{% if pagename == master_doc %}
diff --git a/_extensions/odoo/translator.py b/_extensions/odoo/translator.py
index 8d924c5ef..73572cfed 100644
--- a/_extensions/odoo/translator.py
+++ b/_extensions/odoo/translator.py
@@ -4,7 +4,7 @@ import posixpath
import re
from docutils import nodes
-from sphinx import addnodes, util
+from sphinx import addnodes, util, builders
from sphinx.locale import admonitionlabels
try:
@@ -42,6 +42,11 @@ 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 = []