Skip to content

[BP][IMP] website_cookiefirst: Replace deprecated Cookiefirst functionality #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NICO-SOLUTIONS wants to merge 1 commit into
base: 15.0
Choose a base branch
from
+24 −17
Open

[BP][IMP] website_cookiefirst: Replace deprecated Cookiefirst functionality #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions website_cookiefirst/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ Configuration

To configure this module, you need to:

#. Go to **Website > Configuration > Settings**
#. Search 'Cookiefirst' option.
#. Fill in your 'Cookiefirst ID' (e.g. '00000000-0000-0000-0000-000000000000').
#. Click on "Save" button.
1. Go to **Website \> Configuration \> Settings**
2. Search 'Cookiefirst' option.
3. Enable Use Cookiefirst checkbox
4. Enter your Cookiefirst **API Key** into **Cookiefirst ID** field (e.g.
'00000000-0000-0000-0000-000000000000').
5. Click on "Save" button.

Bug Tracker
===========
Expand Down
10 changes: 6 additions & 4 deletions website_cookiefirst/readme/CONFIGURE.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
To configure this module, you need to:

#. Go to **Website > Configuration > Settings**
#. Search 'Cookiefirst' option.
#. Fill in your 'Cookiefirst ID' (e.g. '00000000-0000-0000-0000-000000000000').
#. Click on "Save" button.
1. Go to **Website \> Configuration \> Settings**
2. Search 'Cookiefirst' option.
3. Enable Use Cookiefirst checkbox
4. Enter your Cookiefirst **API Key** into **Cookiefirst ID** field (e.g.
'00000000-0000-0000-0000-000000000000').
5. Click on "Save" button.
16 changes: 10 additions & 6 deletions website_cookiefirst/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -392,7 +392,9 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
<ol class="arabic simple">
<li>Go to <strong>Website &gt; Configuration &gt; Settings</strong></li>
<li>Search ‘Cookiefirst’ option.</li>
<li>Fill in your ‘Cookiefirst ID’ (e.g. ‘00000000-0000-0000-0000-000000000000’).</li>
<li>Enable Use Cookiefirst checkbox</li>
<li>Enter your Cookiefirst <strong>API Key</strong> into <strong>Cookiefirst ID</strong> field (e.g.
‘00000000-0000-0000-0000-000000000000’).</li>
<li>Click on “Save” button.</li>
</ol>
</div>
Expand Down Expand Up @@ -428,7 +430,9 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<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>
Expand Down
5 changes: 2 additions & 3 deletions website_cookiefirst/views/portal_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
<attribute name="data-cookiefirst-category">performance</attribute>
</xpath>
<xpath expr="//script[last()]" position="after">
<t t-if="website.cookiefirst_identifier">
<t t-if="website.cookiefirst_identifier and website.domain">
<script
src="https://consent.cookiefirst.com/banner.js"
t-att-data-cookiefirst-key="website.cookiefirst_identifier"
t-attf-src="https://consent.cookiefirst.com/sites/{{ (website.domain or '').replace('http://', '').replace('https://', '').replace('www.', '') }}-{{ website.cookiefirst_identifier }}/consent.js"
/>
</t>
</xpath>
Expand Down