diff --git a/Makefile b/Makefile index 5b6bf304e..e5768df23 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ edi: clean html static: extensions/odoo_theme/static/style.css cp -r extensions/odoo_theme/static/* _build/html/_static/ + cp -r static/* _build/html/_static/ html: extensions/odoo_theme/static/style.css @echo "Starting build..." diff --git a/conf.py b/conf.py index 032aadfe5..c98448ad3 100644 --- a/conf.py +++ b/conf.py @@ -188,7 +188,7 @@ html_js_files = [ 'js/coa-valuation-anglo-saxon.js', ] html_css_files = [ - 'css/accounting.css', + #'css/accounting.css', 'css/legal.css', ] diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index a204bc5a3..86930dbea 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -85,18 +85,16 @@ {# Custom landing page on the root of the documentation #} {% include "layout_templates/homepage.html" %} {% else %} -
-
- -
- {% block body %} {% endblock %} -
- {# Do not show the edition link for pages without content #} - {% if github_link and not 'has_only_toc' in meta %} - Edit on GitHub - {% endif %} -
-
+
+ +
+ {% block body %} {% endblock %} +
+ {# Do not show the edition link for pages without content #} + {% if github_link and 'has_only_toc' not in meta and pagename != 'search' %} + Edit on GitHub + {% endif %} +
{% endif %}
diff --git a/extensions/odoo_theme/layout_templates/footer.html b/extensions/odoo_theme/layout_templates/footer.html index 9c46ceea2..2c73c1851 100644 --- a/extensions/odoo_theme/layout_templates/footer.html +++ b/extensions/odoo_theme/layout_templates/footer.html @@ -1,12 +1,12 @@ -
-
+
+ -
+
Odoo diff --git a/extensions/odoo_theme/layout_templates/header.html b/extensions/odoo_theme/layout_templates/header.html index 53c0884cf..6c11dcafe 100644 --- a/extensions/odoo_theme/layout_templates/header.html +++ b/extensions/odoo_theme/layout_templates/header.html @@ -2,7 +2,7 @@
{% include "layout_templates/searchbox.html" %} diff --git a/extensions/odoo_theme/layout_templates/language_switcher.html b/extensions/odoo_theme/layout_templates/language_switcher.html index 6ec6c21db..d26b063b2 100644 --- a/extensions/odoo_theme/layout_templates/language_switcher.html +++ b/extensions/odoo_theme/layout_templates/language_switcher.html @@ -1,8 +1,18 @@