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

[FIX] odoo: compatibility sphinx2

Browse Source 
Cherry-pick of odoo/odoo@2b28dd89b8
This commit is contained in:
Xavier Morel 2019-06-17 16:27:25 +02:00 committed by Martin Trigaux
parent b9a2a1e93b
commit da7f9932cc
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_extensions/odoo/__init__.py
View File

@ -21,6 +21,10 @@ def setup(app):
location="odoo extension") location="odoo extension")
app.config.html_translator_class = 'odoo.translator.BootstrapTranslator' app.config.html_translator_class = 'odoo.translator.BootstrapTranslator'
add_js_file = getattr(app, 'add_js_file', None) or app.add_javascript
for f in ['jquery.min.js', 'bootstrap.js', 'doc.js', 'jquery.noconflict.js']:
add_js_file(f)
switcher.setup(app) switcher.setup(app)
app.add_config_value('odoo_cover_default', None, 'env') app.add_config_value('odoo_cover_default', None, 'env')
app.add_config_value('odoo_cover_external', {}, 'env') app.add_config_value('odoo_cover_external', {}, 'env')
@ -28,7 +32,9 @@ def setup(app):
app.connect('html-page-context', update_meta) app.connect('html-page-context', update_meta)
def update_meta(app, pagename, templatename, context, doctree): def update_meta(app, pagename, templatename, context, doctree):
meta = context.setdefault('meta', {}) meta = context.get('meta')
if meta is None:
meta = context['meta'] = {}
meta.setdefault('banner', app.config.odoo_cover_default) meta.setdefault('banner', app.config.odoo_cover_default)
def navbarify(node, navbar=None): def navbarify(node, navbar=None):

7
_extensions/odoo/layout.html
View File

@ -1,12 +1,5 @@
{% extends "basic/layout.html" %} {% extends "basic/layout.html" %}
{% set script_files = script_files + [
'_static/jquery.min.js',
'_static/bootstrap.js',
'_static/doc.js',
'_static/jquery.noconflict.js',
] %}
{% set classes = [] %} {% set classes = [] %}
{% if pagename == master_doc %} {% if pagename == master_doc %}
{% set classes = classes + ['index'] %} {% set classes = classes + ['index'] %}

9
_extensions/odoo/translator.py
View File

@ -5,7 +5,7 @@ import re
import urllib import urllib
from docutils import nodes from docutils import nodes
from sphinx import addnodes, util from sphinx import addnodes, util, builders
from sphinx.locale import admonitionlabels from sphinx.locale import admonitionlabels
from . import pycompat from . import pycompat
@ -44,7 +44,12 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
'<meta name="viewport" content="width=device-width, initial-scale=1">' '<meta name="viewport" content="width=device-width, initial-scale=1">'
] ]
def __init__(self, builder, document): def __init__(self, document, builder):
# 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) super(BootstrapTranslator, self).__init__(document)
self.builder = builder self.builder = builder
self.body = [] self.body = []