From 963193459321673327be4677ae4ba1ffb7960aea Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Thu, 24 Sep 2020 16:46:00 +0200 Subject: [PATCH] [REV] DIFF tech dev: bring back some stuff --- _extensions/odoo/__init__.py | 8 +++++++- _extensions/odoo/layout.html | 18 +++++++++++------- _extensions/odoo/static/style.css | 12 ++++++++++++ _extensions/odoo/translator.py | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/_extensions/odoo/__init__.py b/_extensions/odoo/__init__.py index e4191e900..65d6a05ba 100644 --- a/_extensions/odoo/__init__.py +++ b/_extensions/odoo/__init__.py @@ -111,7 +111,13 @@ if toctree: def resolve(old_resolve, tree, docname, *args, **kwargs): if docname == tree.env.config.master_doc: return resolve_content_toctree(tree.env, docname, *args, **kwargs) - return old_resolve(tree, docname, *args, **kwargs) + toc = old_resolve(tree, docname, *args, **kwargs) + if toc is None: + return None + + navbarify(toc[0], navbar=kwargs.pop('navbar', None)) + return toc + @monkey(sphinx.environment.BuildEnvironment) def resolve_toctree(old_resolve, self, docname, *args, **kwargs): diff --git a/_extensions/odoo/layout.html b/_extensions/odoo/layout.html index 368ccfc45..1c619729a 100644 --- a/_extensions/odoo/layout.html +++ b/_extensions/odoo/layout.html @@ -1,4 +1,5 @@ {% extends "basic/layout.html" %} +{% set html5_doctype = True %} {% set classes = [] %} {% if pagename == master_doc %} @@ -9,15 +10,17 @@ {% set classes = classes + ['has_code_col'] %} {% endif %} -{%- block doctype -%} - -{%- endblock -%} +{% if 'classes' in meta %} + {% set classes = classes + meta['classes'].split() %} +{% endif %} -{%- block linktags %} - +{%- block linktags -%} + {% for code, url in language_codes %} + + {%- endfor %} - {{- super() }} -{%- endblock %} + {{ super() }} +{%- endblock -%} {%- block sidebar1 -%}{%- endblock -%} {%- block sidebar2 -%}{%- endblock -%} @@ -33,6 +36,7 @@ })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', '{{ google_analytics_key }}', 'auto'); + ga('set', 'anonymizeIp', true); ga('send','pageview'); {%- endif -%} diff --git a/_extensions/odoo/static/style.css b/_extensions/odoo/static/style.css index 65ad6a7c5..cc883d2cb 100644 --- a/_extensions/odoo/static/style.css +++ b/_extensions/odoo/static/style.css @@ -9584,6 +9584,12 @@ article.doc-body .code-fields ul em { -moz-transform-origin: 50% 0px 0px; -ms-transform-origin: 50% 0px 0px; transform-origin: 50% 0px 0px; + background: #75526b; + background: -webkit-linear-gradient(99deg, #875A7B 10%, #62495B 90%); + background: -moz-linear-gradient(99deg, #875A7B 10%, #62495B 90%); + background: -ms-linear-gradient(99deg, #875A7B 10%, #62495B 90%); + background: -o-linear-gradient(99deg, #875A7B 10%, #62495B 90%); + background: linear-gradient(99deg, #875A7B 10%, #62495B 90%); } @media screen and (min-width: 768px) { .card.top { @@ -10223,6 +10229,12 @@ main.index .card figcaption { .toctree-wrapper > ul li.toctree-l2 > ul:empty { display: none; } +.toctree-wrapper > ul li.toctree-l2 a { + text-decoration: none; +} +.toctree-wrapper > ul li.toctree-l2 a:hover { + text-decoration: underline; +} #oe_main_menu_navbar ~ #wrapwrap .o_main_header.o_has_sub_nav.o_scrolled { top: -17px; } diff --git a/_extensions/odoo/translator.py b/_extensions/odoo/translator.py index 982e6040c..914d0a813 100644 --- a/_extensions/odoo/translator.py +++ b/_extensions/odoo/translator.py @@ -515,6 +515,20 @@ class BootstrapTranslator(nodes.NodeVisitor, object): self.body.append(self.starttag(node, 'a', **attrs)) def depart_reference(self, node): self.body.append(u'') + def visit_download_reference(self, node): + # type: (nodes.Node) -> None + if node.hasattr('filename'): + self.body.append( + '' % + posixpath.join(self.builder.dlpath, node['filename'])) + self.body.append(node.astext()) + self.body.append('') + raise nodes.SkipNode + else: + self.context.append('') + def depart_download_reference(self, node): + # type: (nodes.Node) -> None + self.body.append(self.context.pop()) def visit_target(self, node): pass def depart_target(self, node): pass def visit_footnote(self, node):