Skip to content

[FW][ADD] tutorials/website_theme: Add tutorials to build a website theme #13131

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.

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

Closed
wants to merge 2 commits into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 29, 2025

Add a tutorial to learn how to create a website theme Odoo16
Based on the documentation 16.0: How-to guides -> Website themes
This tutorial is illustrated by a example module: the website theme of Airproof. It will be on the GitHub repository: /tutorials.

See also:

Forward-Port-Of: #12573

@robodoo
Copy link
Collaborator

robodoo commented Apr 29, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 29, 2025

@cede-odoo @AntoineVDV cherrypicking of pull request #12573 failed.

stdout:

CONFLICT (modify/delete): content/developer/tutorials/website.rst deleted in 9f8b8e79d942a77e3948ddc2e791f43f9e841202 and modified in 5492d6e41614ea7e88e3685f9ee7fbc942e383d0.  Version 5492d6e41614ea7e88e3685f9ee7fbc942e383d0 of content/developer/tutorials/website.rst left in tree.

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@C3POdoo C3POdoo requested a review from a team May 5, 2025 08:19
@AntoineVDV AntoineVDV removed the request for review from a team May 5, 2025 08:26
@bram-odoo bram-odoo force-pushed the 17.0-16.0-website-tutorial-cede-424257-fw branch 2 times, most recently from 67c8452 to fdb6828 Compare May 5, 2025 09:26
@bram-odoo bram-odoo requested a review from AntoineVDV May 5, 2025 09:43
Copy link
Collaborator

@AntoineVDV AntoineVDV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there something I should review in particular?

Except for the commits that should be squashed together and rewritten to look like a proper forward-port, I don't think I need to comment on anything else as I already reviewed the original version in 16.0.

For forward-port PRs, it's up to the author to decide whether the reviewer should make a second pass, for example when significant adaptations are made. If not, they can r+ themselves.

@bram-odoo
Copy link
Contributor

bram-odoo commented May 5, 2025

Is there something I should review in particular?

Except for the commits that should be squashed together and rewritten to look like a proper forward-port, I don't think I need to comment on anything else as I already reviewed the original version in 16.0.

For forward-port PRs, it's up to the author to decide whether the reviewer should make a second pass, for example when significant adaptations are made. If not, they can r+ themselves.

I don't think so, I was not sure @cede-odoo was able to r+ by herself without a new review. My bad, @AntoineVDV

@cede-odoo
Copy link

@robodoo r+

robodoo pushed a commit that referenced this pull request May 5, 2025
stdout:
CONFLICT (modify/delete): content/developer/tutorials/website.rst deleted in 9f8b8e7 and modified in 5492d6e.  Version 5492d6e of content/developer/tutorials/website.rst left in tree.

stderr:

Part-of: #13131
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Céline de Lannoy (cede) <cede@odoo.com>
robodoo pushed a commit that referenced this pull request May 5, 2025
[FIX] toctree: tutorials.rst
[REM] Remove website.rst (no longuer in use)
[FIX] dynamic_templates: reflink to variants

closes #13131

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Céline de Lannoy (cede) <cede@odoo.com>
@AntoineVDV
Copy link
Collaborator

@robodoo r-

Could you squash the commits? 🙏

@bram-odoo bram-odoo force-pushed the 17.0-16.0-website-tutorial-cede-424257-fw branch from fdb6828 to 44cd8aa Compare May 5, 2025 11:59
@bram-odoo
Copy link
Contributor

@AntoineVDV There you go

@AntoineVDV
Copy link
Collaborator

This PR's commit still mentions other commits, "cherry pick failed", etc.

Its commits should rather be like in the 16.0 PR

@bram-odoo bram-odoo force-pushed the 17.0-16.0-website-tutorial-cede-424257-fw branch from 44cd8aa to d99f4b3 Compare May 5, 2025 14:07
@bram-odoo bram-odoo force-pushed the 17.0-16.0-website-tutorial-cede-424257-fw branch from d99f4b3 to 665bd09 Compare May 5, 2025 14:07
@cede-odoo
Copy link

@robodoo r+

@robodoo
Copy link
Collaborator

robodoo commented May 5, 2025

@cede-odoo @AntoineVDV because this PR has multiple commits, I need to know how to merge it:

  • merge to merge directly, using the PR as merge commit message
  • rebase-merge to rebase and merge, using the PR as merge commit message
  • rebase-ff to rebase and fast-forward

@cede-odoo
Copy link

@robodoo r+ rebase-ff

@robodoo
Copy link
Collaborator

robodoo commented May 5, 2025

This PR is already reviewed, reviewing it again is useless.

@robodoo
Copy link
Collaborator

robodoo commented May 5, 2025

Merge method set to rebase and fast-forward.

robodoo pushed a commit that referenced this pull request May 5, 2025
Part-of: #13131
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Céline de Lannoy (cede) <cede@odoo.com>
robodoo pushed a commit that referenced this pull request May 5, 2025
closes #13131

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Céline de Lannoy (cede) <cede@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants