Skip to content

Commit c0d71b7

Browse files
committed
[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 `<a>` elements surrounding an `<img>` 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 343decf, 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#2467 X-original-commit: 81bf067 Signed-off-by: Antoine Vandevenne (anv) <[email protected]>
1 parent 61e9417 commit c0d71b7

File tree

2 files changed

+70
-114
lines changed

2 files changed

+70
-114
lines changed

content/legal.rst

Lines changed: 70 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -22,121 +22,81 @@ Licenses
2222
Terms and Conditions
2323
====================
2424

25-
.. |nbsp| raw:: html
26-
27-
&nbsp;
28-
29-
.. |view_enterprise_en| image:: legal/img/txt.svg
30-
:alt: View Odoo Enterprise Agreement
31-
:target: legal/terms/enterprise.html
32-
33-
.. |download_enterprise_en| image:: legal/img/pdf.svg
34-
:alt: Download Odoo Enterprise Agreement
35-
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement.pdf
36-
37-
.. |view_partnership_en| image:: legal/img/txt.svg
38-
:alt: View Odoo Partnership Agreement
39-
:target: legal/terms/partnership.html
40-
41-
.. |download_partnership_en| image:: legal/img/pdf.svg
42-
:alt: Download Odoo Partnership Agreement
43-
:target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement.pdf
44-
45-
.. |view_terms_of_sale_en| image:: legal/img/txt.svg
46-
:alt: View Terms of Sale
47-
:target: legal/terms/terms_of_sale.html
48-
49-
.. |download_terms_of_sale_en| image:: legal/img/pdf.svg
50-
:alt: Download Odoo Terms of Sale
51-
:target: terms_of_sale.pdf
52-
53-
.. |download_enterprise_fr| image:: legal/img/pdf.svg
54-
:alt: Download Odoo Enterprise Agreement (FR)
55-
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_fr.pdf
56-
57-
.. |view_enterprise_fr| image:: legal/img/txt.svg
58-
:alt: View Odoo Enterprise Agreement (FR)
59-
:target: legal/terms/i18n/enterprise_fr.html
60-
61-
.. |download_partnership_fr| image:: legal/img/pdf.svg
62-
:alt: Download Odoo Partnership Agreement (FR)
63-
:target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_fr.pdf
64-
65-
.. |view_enterprise_nl| image:: legal/img/txt.svg
66-
:alt: View Odoo Enterprise Agreement (NL)
67-
:target: legal/terms/i18n/enterprise_nl.html
68-
69-
.. |view_partnership_fr| image:: legal/img/txt.svg
70-
:alt: View Odoo Partnership Agreement (FR)
71-
:target: legal/terms/i18n/partnership_fr.html
72-
73-
.. |download_terms_of_sale_fr| image:: legal/img/pdf.svg
74-
:alt: Download Odoo Terms of Sale (FR)
75-
:target: https://www.odoo.com/documentation/14.0/terms_of_sale_fr.pdf
76-
77-
.. |view_terms_of_sale_fr| image:: legal/img/txt.svg
78-
:alt: View Terms of Sale (FR)
79-
:target: legal/terms/i18n/terms_of_sale_fr.html
80-
81-
.. |download_enterprise_nl| image:: legal/img/pdf.svg
82-
:alt: Download Odoo Enterprise Agreement (NL)
83-
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_nl.pdf
84-
85-
.. |download_partnership_nl| image:: legal/img/pdf.svg
86-
:alt: Download Odoo Partnership Agreement (NL)
87-
:target: odoo_partnership_agreement_nl.pdf
88-
89-
.. |download_enterprise_de| image:: legal/img/pdf.svg
90-
:alt: Download Odoo Enterprise Agreement (DE)
91-
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_de.pdf
92-
93-
.. |view_enterprise_de| image:: legal/img/txt.svg
94-
:alt: View Odoo Enterprise Agreement (DE)
95-
:target: legal/terms/i18n/enterprise_de.html
96-
97-
.. |download_partnership_de| image:: legal/img/pdf.svg
98-
:alt: Download Odoo Partnership Agreement (DE)
99-
:target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_de.pdf
100-
101-
.. |view_partnership_de| image:: legal/img/txt.svg
102-
:alt: View Odoo Partnership Agreement (DE)
103-
:target: legal/terms/i18n/partnership_de.html
104-
105-
.. |download_enterprise_es| image:: legal/img/pdf.svg
106-
:alt: Download Odoo Enterprise Agreement (ES)
107-
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_es.pdf
108-
109-
.. |view_enterprise_es| image:: legal/img/txt.svg
110-
:alt: View Odoo Partnership Agreement (ES)
111-
:target: legal/terms/i18n/enterprise_es.html
112-
113-
.. |download_partnership_es| image:: legal/img/pdf.svg
114-
:alt: Download Odoo Partnership Agreement (ES)
115-
:target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_es.pdf
116-
117-
.. |view_partnership_es| image:: legal/img/txt.svg
118-
:alt: View Odoo Partnership Agreement (ES)
119-
:target: legal/terms/i18n/partnership_es.html
25+
.. list-table::
26+
:header-rows: 1
27+
28+
* -
29+
- English
30+
- Français
31+
- Nederlands
32+
- Deutsch
33+
- Español
34+
* - Odoo Enterprise Agreement [#]_
35+
- .. image:: legal/img/txt.svg
36+
:alt: View Odoo Enterprise Agreement
37+
:target: legal/terms/enterprise.html
38+
.. image:: legal/img/pdf.svg
39+
:alt: Download Odoo Enterprise Agreement
40+
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement.pdf
41+
- .. image:: legal/img/txt.svg
42+
:alt: View Odoo Enterprise Agreement (FR)
43+
:target: legal/terms/i18n/enterprise_fr.html
44+
.. image:: legal/img/pdf.svg
45+
:alt: Download Odoo Enterprise Agreement (FR)
46+
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_fr.pdf
47+
- |missing_txt| |missing_pdf|
48+
- |missing_txt| |missing_pdf|
49+
- .. image:: legal/img/txt.svg
50+
:alt: View Odoo Enterprise Agreement (ES)
51+
:target: legal/terms/i18n/enterprise_es.html
52+
.. image:: legal/img/pdf.svg
53+
:alt: Download Odoo Enterprise Agreement (ES)
54+
:target: https://www.odoo.com/documentation/14.0/odoo_enterprise_agreement_es.pdf
55+
* - Odoo Partnership Agreement
56+
- .. image:: legal/img/txt.svg
57+
:alt: View Odoo Partnership Agreement
58+
:target: legal/terms/partnership.html
59+
.. image:: legal/img/pdf.svg
60+
:alt: Download Odoo Partnership Agreement
61+
:target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement.pdf
62+
- .. image:: legal/img/txt.svg
63+
:alt: View Odoo Partnership Agreement (FR)
64+
:target: legal/terms/i18n/partnership_fr.html
65+
.. image:: legal/img/pdf.svg
66+
:alt: Download Odoo Partnership Agreement (FR)
67+
:target: https://www.odoo.com/documentation/14.0/odoo_partnership_agreement_fr.pdf
68+
- |missing_txt| |missing_pdf|
69+
- |missing_txt| |missing_pdf|
70+
- |missing_txt| |missing_pdf|
71+
* - Terms of Sale
72+
- .. image:: legal/img/txt.svg
73+
:alt: View Terms of Sale
74+
:target: legal/terms/terms_of_sale.html
75+
.. image:: legal/img/pdf.svg
76+
:alt: Download Odoo Terms of Sale
77+
:target: terms_of_sale.pdf
78+
- .. image:: legal/img/txt.svg
79+
:alt: View Terms of Sale (FR)
80+
:target: legal/terms/i18n/terms_of_sale_fr.html
81+
.. image:: legal/img/pdf.svg
82+
:alt: Download Odoo Terms of Sale (FR)
83+
:target: https://www.odoo.com/documentation/14.0/terms_of_sale_fr.pdf
84+
-
85+
-
86+
-
87+
88+
.. [#] Applies to self-hosting, Odoo.SH and Odoo Cloud.
12089
12190
.. |missing_pdf| image:: legal/img/pdf_missing.svg
122-
:alt: Document not available yet
91+
:alt: Document not yet available
92+
:class: o-no-modal
12393

12494
.. |missing_txt| image:: legal/img/txt_missing.svg
125-
:alt: Document not available yet
95+
:alt: Document not yet available
96+
:class: o-no-modal
12697

127-
+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
128-
| | **English** | Français | Nederlands | Deutsch | Español |
129-
+====================================================================+=======================================================================+========================================================================+=======================================================================+=======================================================================+=======================================================================+
130-
| 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| |
131-
+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
132-
| 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| |
133-
+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
134-
| Terms of Sale | |view_terms_of_sale_en| |download_terms_of_sale_en| | |view_terms_of_sale_fr| |download_terms_of_sale_fr| | | | |
135-
+--------------------------------------------------------------------+-----------------------------------------------------------------------+------------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+-----------------------------------------------------------------------+
136-
| Archive of older agreements: `Archive <https://drive.google.com/open?id=1skSTsdAPOBlaIWi_hUkL3tfaoi8Qdspu>`_ |
137-
+--------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
138-
| .. [#ltoe1] Applies to self-hosting, Odoo.SH and Odoo Cloud |
139-
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
98+
.. seealso::
99+
`Archive of older agreements <https://drive.google.com/open?id=1skSTsdAPOBlaIWi_hUkL3tfaoi8Qdspu>`_
140100

141101
Other legal references
142102
======================

static/css/legal.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ section#terms-and-conditions table td {
44
white-space: nowrap;
55
}
66

7-
section#terms-and-conditions table th {
8-
text-align: center;
9-
}
10-
117
section#terms-and-conditions table img.img-fluid {
128
margin: 0px;
139
}

0 commit comments

Comments
 (0)