From ab55a5eda449b93c7424705cdb99e7585ca75cb1 Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Mon, 11 Jul 2022 15:13:22 +0000 Subject: [PATCH] [REF] legal: convert the table from a grid to a list table Prior to this commit, the /legal.html page relied on RST substitutions to insert the images directives of legal agreements within the table. This caused Sphinx to omit the `image-reference` class on all `` elements surrounding an `` element, which it normally adds when the `target` option is specified on an `image` directive. As the theme relies on that class to hide the "external link" icon added with commit 343decf1, the layout of the page was broken. While replacing the substitutions with the plain `image` directive, the grid table is converted to a list table to avoid the hassle of expanding table cells to fit the directives. This will also help in maintaining the content of the table when we will add new translations for the legal agreements. task-2909167 closes odoo/documentation#2465 X-original-commit: 81bf067ba1723ac44631020fe063b5c8985db873 Signed-off-by: Antoine Vandevenne (anv) --- content/legal.rst | 176 +++++++++++++++++-------------------------- static/css/legal.css | 4 - 2 files changed, 68 insertions(+), 112 deletions(-) diff --git a/content/legal.rst b/content/legal.rst index a253ea6ea..6dfe25d5f 100644 --- a/content/legal.rst +++ b/content/legal.rst @@ -22,121 +22,81 @@ Licenses Terms and Conditions ==================== -.. |nbsp| raw:: html +.. list-table:: + :header-rows: 1 -   + * - + - English + - Français + - Nederlands + - Deutsch + - Español + * - Odoo Enterprise Agreement [#]_ + - .. image:: legal/img/txt.svg + :alt: View Odoo Enterprise Agreement + :target: legal/terms/enterprise.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Enterprise Agreement + :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement.pdf + - .. image:: legal/img/txt.svg + :alt: View Odoo Enterprise Agreement (FR) + :target: legal/terms/i18n/enterprise_fr.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Enterprise Agreement (FR) + :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_fr.pdf + - |missing_txt| |missing_pdf| + - |missing_txt| |missing_pdf| + - .. image:: legal/img/txt.svg + :alt: View Odoo Enterprise Agreement (ES) + :target: legal/terms/i18n/enterprise_es.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Enterprise Agreement (ES) + :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_es.pdf + * - Odoo Partnership Agreement + - .. image:: legal/img/txt.svg + :alt: View Odoo Partnership Agreement + :target: legal/terms/partnership.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Partnership Agreement + :target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement.pdf + - .. image:: legal/img/txt.svg + :alt: View Odoo Partnership Agreement (FR) + :target: legal/terms/i18n/partnership_fr.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Partnership Agreement (FR) + :target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_fr.pdf + - |missing_txt| |missing_pdf| + - |missing_txt| |missing_pdf| + - |missing_txt| |missing_pdf| + * - Terms of Sale + - .. image:: legal/img/txt.svg + :alt: View Terms of Sale + :target: legal/terms/terms_of_sale.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Terms of Sale + :target: terms_of_sale.pdf + - .. image:: legal/img/txt.svg + :alt: View Terms of Sale (FR) + :target: legal/terms/i18n/terms_of_sale_fr.html + .. image:: legal/img/pdf.svg + :alt: Download Odoo Terms of Sale (FR) + :target: https://www.odoo.com/documentation/14.0/terms_of_sale_fr.pdf + - + - + - -.. |view_enterprise_en| image:: legal/img/txt.svg - :alt: View Odoo Enterprise Agreement - :target: legal/terms/enterprise.html - -.. |download_enterprise_en| image:: legal/img/pdf.svg - :alt: Download Odoo Enterprise Agreement - :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement.pdf - -.. |view_partnership_en| image:: legal/img/txt.svg - :alt: View Odoo Partnership Agreement - :target: legal/terms/partnership.html - -.. |download_partnership_en| image:: legal/img/pdf.svg - :alt: Download Odoo Partnership Agreement - :target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement.pdf - -.. |view_terms_of_sale_en| image:: legal/img/txt.svg - :alt: View Terms of Sale - :target: legal/terms/terms_of_sale.html - -.. |download_terms_of_sale_en| image:: legal/img/pdf.svg - :alt: Download Odoo Terms of Sale - :target: terms_of_sale.pdf - -.. |download_enterprise_fr| image:: legal/img/pdf.svg - :alt: Download Odoo Enterprise Agreement (FR) - :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_fr.pdf - -.. |view_enterprise_fr| image:: legal/img/txt.svg - :alt: View Odoo Enterprise Agreement (FR) - :target: legal/terms/i18n/enterprise_fr.html - -.. |download_partnership_fr| image:: legal/img/pdf.svg - :alt: Download Odoo Partnership Agreement (FR) - :target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_fr.pdf - -.. |view_enterprise_nl| image:: legal/img/txt.svg - :alt: View Odoo Enterprise Agreement (NL) - :target: legal/terms/i18n/enterprise_nl.html - -.. |view_partnership_fr| image:: legal/img/txt.svg - :alt: View Odoo Partnership Agreement (FR) - :target: legal/terms/i18n/partnership_fr.html - -.. |download_terms_of_sale_fr| image:: legal/img/pdf.svg - :alt: Download Odoo Terms of Sale (FR) - :target: https://www.odoo.com/documentation/14.0/terms_of_sale_fr.pdf - -.. |view_terms_of_sale_fr| image:: legal/img/txt.svg - :alt: View Terms of Sale (FR) - :target: legal/terms/i18n/terms_of_sale_fr.html - -.. |download_enterprise_nl| image:: legal/img/pdf.svg - :alt: Download Odoo Enterprise Agreement (NL) - :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_nl.pdf - -.. |download_partnership_nl| image:: legal/img/pdf.svg - :alt: Download Odoo Partnership Agreement (NL) - :target: odoo_partnership_agreement_nl.pdf - -.. |download_enterprise_de| image:: legal/img/pdf.svg - :alt: Download Odoo Enterprise Agreement (DE) - :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_de.pdf - -.. |view_enterprise_de| image:: legal/img/txt.svg - :alt: View Odoo Enterprise Agreement (DE) - :target: legal/terms/i18n/enterprise_de.html - -.. |download_partnership_de| image:: legal/img/pdf.svg - :alt: Download Odoo Partnership Agreement (DE) - :target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_de.pdf - -.. |view_partnership_de| image:: legal/img/txt.svg - :alt: View Odoo Partnership Agreement (DE) - :target: legal/terms/i18n/partnership_de.html - -.. |download_enterprise_es| image:: legal/img/pdf.svg - :alt: Download Odoo Enterprise Agreement (ES) - :target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_es.pdf - -.. |view_enterprise_es| image:: legal/img/txt.svg - :alt: View Odoo Partnership Agreement (ES) - :target: legal/terms/i18n/enterprise_es.html - -.. |download_partnership_es| image:: legal/img/pdf.svg - :alt: Download Odoo Partnership Agreement (ES) - :target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_es.pdf - -.. |view_partnership_es| image:: legal/img/txt.svg - :alt: View Odoo Partnership Agreement (ES) - :target: legal/terms/i18n/partnership_es.html +.. [#] Applies to self-hosting, Odoo.SH and Odoo Cloud. .. |missing_pdf| image:: legal/img/pdf_missing.svg - :alt: Document not available yet + :alt: Document not yet available + :class: o-no-modal .. |missing_txt| image:: legal/img/txt_missing.svg - :alt: Document not available yet + :alt: Document not yet available + :class: o-no-modal -+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| | **English** | Français | Nederlands | Deutsch | Español | -+====================================================================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+ -| Odoo Enterprise Agreement [#ltoe1]_ | |view_enterprise_en| |download_enterprise_en| | |view_enterprise_fr| |download_enterprise_fr| | |missing_txt| |missing_pdf| | |missing_txt| |missing_pdf| | |view_enterprise_es| |download_enterprise_es| | -+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Odoo Partnership Agreement | |view_partnership_en| |download_partnership_en| | |view_partnership_fr| |download_partnership_fr| | |missing_txt| |missing_pdf| | |missing_txt| |missing_pdf| | |missing_txt| |missing_pdf| | -+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | | -+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+ -| Archive of older agreements: `Archive `_ | -+--------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| .. [#ltoe1] Applies to self-hosting, Odoo.SH and Odoo Cloud | -+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +.. seealso:: + `Archive of older agreements `_ Other legal references ====================== diff --git a/static/css/legal.css b/static/css/legal.css index 5e1ac5480..d49e429bd 100644 --- a/static/css/legal.css +++ b/static/css/legal.css @@ -4,10 +4,6 @@ section#terms-and-conditions table td { white-space: nowrap; } -section#terms-and-conditions table th { - text-align: center; -} - section#terms-and-conditions table img.img-fluid { margin: 0px; }