diff --git a/_extensions/odoo/__init__.py b/_extensions/odoo/__init__.py index e02deaaff..e3473c996 100644 --- a/_extensions/odoo/__init__.py +++ b/_extensions/odoo/__init__.py @@ -28,9 +28,9 @@ def setup(app): app.connect('html-page-context', update_meta) def update_meta(app, pagename, templatename, context, doctree): - meta = context.get('meta') - if meta is None: - meta = context['meta'] = {} + if not context.get('meta'): # context['meta'] can be None + context['meta'] = {} + meta = context.setdefault('meta', {}) # we want {} by default meta.setdefault('banner', app.config.odoo_cover_default) def navbarify(node, navbar=None): diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 6eba82ada..9b4028883 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 %} @@ -201,16 +201,6 @@ Start Now -
- + + @@ -247,10 +247,9 @@ {% else %} {% set container = 'container' %} {% endif %} -