[18.0][MIG] website_google_tag_manager: Migration to 18.0

OCA · Oct 30, 2024 · 75a0af7 · 75a0af7
1 parent b14c9ed
commit 75a0af7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/website_google_tag_manager/README.rst b/website_google_tag_manager/README.rst
@@ -17,13 +17,13 @@ Google Tag Manager
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fwebsite-lightgray.png?logo=github
-    :target: https://github.com/OCA/website/tree/17.0/website_google_tag_manager
+    :target: https://github.com/OCA/website/tree/18.0/website_google_tag_manager
     :alt: OCA/website
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/website-17-0/website-17-0-website_google_tag_manager
+    :target: https://translation.odoo-community.org/projects/website-18-0/website-18-0-website_google_tag_manager
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/website&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/website&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -51,7 +51,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/website/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/website/issues/new?body=module:%20website_google_tag_manager%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/website/issues/new?body=module:%20website_google_tag_manager%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -67,13 +67,14 @@ Authors
 Contributors
 ------------
 
--  `Sebastien Alix <sebastien.alix@osiell.com>`__
--  `Tecnativa <https://www.tecnativa.com>`__:
+- `Sebastien Alix <sebastien.alix@osiell.com>`__
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-   -  Cristina Martin R.
+  - Cristina Martin R.
 
--  Bjorn Billen <bjorn.billen@dynapps.be>
--  Foram Shah <foram.shah@initos.com>
+- Bjorn Billen <bjorn.billen@dynapps.be>
+- Foram Shah <foram.shah@initos.com>
+- Juan Ignacio Rivero <jr@adhoc.com.ar>
 
 Maintainers
 -----------
@@ -88,6 +89,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/website <https://github.com/OCA/website/tree/17.0/website_google_tag_manager>`_ project on GitHub.
+This module is part of the `OCA/website <https://github.com/OCA/website/tree/18.0/website_google_tag_manager>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_google_tag_manager/__manifest__.py b/website_google_tag_manager/__manifest__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Google Tag Manager",
-    "version": "17.0.1.0.1",
+    "version": "18.0.1.0.0",
     "author": "ABF OSIELL, Tecnativa, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,

diff --git a/website_google_tag_manager/readme/CONTRIBUTORS.md b/website_google_tag_manager/readme/CONTRIBUTORS.md
@@ -3,3 +3,4 @@
   - Cristina Martin R.
 - Bjorn Billen \<<bjorn.billen@dynapps.be>\>
 - Foram Shah \<<foram.shah@initos.com>\>
+- Juan Ignacio Rivero \<<jr@adhoc.com.ar>\>
diff --git a/website_google_tag_manager/static/description/index.html b/website_google_tag_manager/static/description/index.html
@@ -369,7 +369,7 @@ <h1 class="title">Google Tag Manager</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:310de3868828f459c2abf18760e922a4e64074ea6b6e068e399dea21e01ec390
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/website/tree/17.0/website_google_tag_manager"><img alt="OCA/website" src="https://img.shields.io/badge/github-OCA%2Fwebsite-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/website-17-0/website-17-0-website_google_tag_manager"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/website&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/website/tree/18.0/website_google_tag_manager"><img alt="OCA/website" src="https://img.shields.io/badge/github-OCA%2Fwebsite-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/website-18-0/website-18-0-website_google_tag_manager"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/website&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to configure your Odoo website to support the
 <a class="reference external" href="https://marketingplatform.google.com/about/tag-manager/">GTM</a> tool.</p>
 <p><strong>Table of contents</strong></p>
@@ -399,7 +399,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/website/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/website/issues/new?body=module:%20website_google_tag_manager%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/website/issues/new?body=module:%20website_google_tag_manager%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -421,6 +421,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </li>
 <li>Bjorn Billen &lt;<a class="reference external" href="mailto:bjorn.billen&#64;dynapps.be">bjorn.billen&#64;dynapps.be</a>&gt;</li>
 <li>Foram Shah &lt;<a class="reference external" href="mailto:foram.shah&#64;initos.com">foram.shah&#64;initos.com</a>&gt;</li>
+<li>Juan Ignacio Rivero &lt;<a class="reference external" href="mailto:jr&#64;adhoc.com.ar">jr&#64;adhoc.com.ar</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -432,7 +433,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/website/tree/17.0/website_google_tag_manager">OCA/website</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/website/tree/18.0/website_google_tag_manager">OCA/website</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/website_google_tag_manager/views/website_templates.xml b/website_google_tag_manager/views/website_templates.xml
@@ -2,7 +2,7 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
     <template id="layout" inherit_id="website.layout">
-        <xpath expr="//div[@id='wrapwrap']" position="after">
+        <xpath expr="//body" position="inside">
             <t t-if="website and website.google_tag_manager_key">
                 <!-- Google Tag Manager (noscript) -->
                 <noscript>