8000 Master mysterious egg agau cleanup by agau-odoo · Pull Request #4689 · odoo-dev/odoo · GitHub
[go: up one dir, main page]

Skip to content

Master mysterious egg agau cleanup #4689

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
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3cd44df
[REF] website: rewrite website builder using owl and new html editor
ged-odoo Apr 29, 2025
3228d6f
[FIX] *: various random small fixes
ged-odoo May 21, 2025
0109637
[FIX] make the branch green again
Goaman May 20, 2025
48edd7d
fix green branch
FrancoisGe May 22, 2025
dc8e702
clean carousel related tests, remove repeated ones and merge/rename f…
Jinjiu96 May 20, 2025
44521c8
[FIX] remove the unnecessary link preview loading and notification
Jinjiu96 May 22, 2025
04ac5ad
fix logo adding/removing option
Syozik May 15, 2025
5c98f3d
[FIX] html_builder: fix space between rating stars
AlessandroLupo May 12, 2025
e8778d5
[FIX] html_builder: search for snippet name in add snippet dialog
AlessandroLupo May 9, 2025
337c978
[FIX] website: default colorpicker tab = custom in theme colors option
emge-odoo May 19, 2025
b9b6e3c
Use only "color" tabs in countdown color picker options
Syozik May 16, 2025
7c2e005
fix color styling
Syozik May 19, 2025
9036ba8
add support for compact hex colors (e.g. #fff)
Syozik May 20, 2025
4d52db6
[FIX] web: extend tests timeout
robinlej May 22, 2025
f83fa7f
[FIX] test_website: adapt TestImageUploadProgress test
divy-odoo May 15, 2025
85c41dd
[FIX] test_website: adapt test_01_multi_website_settings test
divy-odoo May 15, 2025
2624218
[FIX] website: adapt reset_view test
divy-odoo May 9, 2025
85df7d1
remove unused ColorSelector component from BuilderColorpicker
agau-odoo May 15, 2025
3f24060
fix typo in selector
agau-odoo May 15, 2025
25808ec
lint
agau-odoo May 22, 2025
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
Prev Previous commit
Next Next commit
fix logo adding/removing option
Logo can have two views: image and a text one, and so
we pass the view of the one that's displayed right now.
Or, if the logo is hidden, we pass the image logo.
  • Loading branch information
Syozik authored and FrancoisGe committed May 22, 2025
commit 04ac5addcd6aff11a1a6f6419534c3900d1892e1
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { BaseOptionComponent } from "@html_builder/core/utils";

export class HeaderElementOption extends BaseOptionComponent {
static template = "website.headerElementOption";

setup(){
super.setup();
this.customizeWebsite = this.env.editor.shared.customizeWebsite;
const views = [
"website.option_header_brand_logo",
"website.option_header_brand_name"
];
this.customizeWebsite.loadConfigKey({ views });
}

get websiteLogoParams(){
const views = this.customizeWebsite.getConfigKey("website.option_header_brand_name")
? ["website.option_header_brand_name"]
: ["website.option_header_brand_logo"];
return {
views,
resetViewArch: true,
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,7 @@
<BuilderButton
title.translate="Show/hide logo"
className="'flex-grow-1'"
actionParam="{
views: ['website.option_header_brand_name', 'website.option_header_brand_logo'],
resetViewArch: true,
}"
actionParam="websiteLogoParams"
>
<Img src="'/website/static/src/img/snippets_options/header_extra_element_logo.svg'"/>
</BuilderButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Plugin } from "@html_editor/plugin";
import { withSequence } from "@html_editor/utils/resource";
import { registry } from "@web/core/registry";
import { HeaderBorderOption } from "./header_border_option";
import { HeaderElementOption } from "./header_element_option";

const [
HEADER_TEMPLATE,
Expand Down Expand Up @@ -74,7 +75,7 @@ class HeaderOptionPlugin extends Plugin {
}),
withSequence(HEADER_ELEMENT, {
editableOnly: false,
template: "website.headerElementOption",
OptionComponent: HeaderElementOption,
selector: "#wrapwrap > header",
groups: ["website.group_website_designer"],
}),
Expand Down
0