Skip to content

Commit a7768be

Browse files
duau-odooduau-odoo
committed
fix some ids and isActiveItem
renamed some with the original name, for easier maintenance added some isActiveItem that were forgotten
1 parent 48edd7d commit a7768be

File tree

8 files changed

+40
-21
lines changed

8 files changed

+40
-21
lines changed

‎addons/website/static/src/builder/plugins/header_navbar_option.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<BuilderButtonGroup>
4646
<BuilderNumberInput action="'customizeWebsiteVariable'" actionParam="'header-font-size'" unit="'px'" saveUnit="'rem'"/>
4747
<BuilderColorPicker action="'customizeWebsiteVariable'" actionParam="'header-text-color'"/>
48-
<BuilderSelect action="'websiteConfig'" id="'header_alignment_opt'">
48+
<BuilderSelect action="'websiteConfig'" t-if="!hasSomeViews(['website.template_header_sales_three', 'website.template_header_vertical'])" id="'header_alignment_opt'">
4949
<BuilderSelectItem
5050
actionParam="{
5151
views: [],
@@ -71,7 +71,7 @@
7171
</BuilderSelect>
7272
</BuilderButtonGroup>
7373
</BuilderRow>
74-
<BuilderRow label.translate="Link Style" t-if="hasSomeViews(['website.template_header_default', 'website.template_header_boxed', 'website.template_header_vertical', 'website.template_header_search', 'website.template_header_sales_one', 'website.template_header_sales_two', 'website.template_header_sales_three', 'website.template_header_sales_four'])">
74+
<BuilderRow label.translate="Link Style" t-if="!hasSomeViews(['website.template_header_hamburger', 'website.template_header_stretch', 'website.template_header_sidebar'])">
7575
<BuilderSelect action="'websiteConfig'">
7676
<BuilderSelectItem
7777
id="'option_header_navbar_links_default'"
@@ -139,7 +139,7 @@
139139
>Secondary</BuilderSelectItem>
140140
</BuilderSelect>
141141
</BuilderRow>
142-
<BuilderRow label.translate="Sub Menus">
142+
<BuilderRow label.translate="Sub Menus" t-if="!hasSomeViews(['website.template_header_hamburger'])">
143143
<BuilderSelect action="'websiteConfig'">
144144
<BuilderSelectItem
145145
id="header_dropdown_on_click_opt"

‎addons/website/static/src/builder/plugins/options/card_image_option.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- Image position -->
88
<BuilderButtonGroup action="'setCoverImagePosition'">
99
<BuilderButton
10-
id="'card_img_top_option'"
10+
id="'card_img_top_opt'"
1111
classAction="'o_card_img_top'"
1212
actionParam="'card-img-top'"
1313
iconImg="'/website/static/src/img/snippets_options/pos_top.svg'"
@@ -49,12 +49,12 @@
4949
<BuilderSelect applyTo="'.o_card_img_wrapper'">
5050
<BuilderSelectItem id="'card_img_default_ratio_option'" classAction="''">Image default</BuilderSelectItem>
5151
<BuilderSelectItem classAction="'ratio ratio-1x1'">Square</BuilderSelectItem>
52-
<t t-if="isActiveItem('card_img_top_option')">
52+
<t t-if="isActiveItem('card_img_top_opt')">
5353
<BuilderSelectItem classAction="'ratio ratio-4x3'">Landscape - 4/3</BuilderSelectItem>
5454
<BuilderSelectItem classAction="'ratio ratio-16x9'">Wide - 16/9</BuilderSelectItem>
5555
<BuilderSelectItem classAction="'ratio ratio-21x9'">Ultrawide - 21/9</BuilderSelectItem>
5656
<BuilderSelectItem
57-
id="'card_img_custom_ratio_option'"
57+
id="'image_ratio_custom_opt'"
5858
classAction="'ratio o_card_img_ratio_custom'">
5959
Custom
6060
</BuilderSelectItem>
@@ -63,7 +63,7 @@
6363
</BuilderRow>
6464

6565
<!-- Custom ratio control -->
66-
<BuilderRow t-if="isActiveItem('card_img_custom_ratio_option')" label.translate="Custom Ratio" level="2">
66+
<BuilderRow t-if="isActiveItem('image_ratio_custom_opt')" label.translate="Custom Ratio" level="2">
6767
<BuilderRange
6868
styleAction="'--card-img-aspect-ratio'"
6969
min="8"
@@ -74,7 +74,7 @@
7474
</BuilderRow>
7575

7676
<!-- Width -->
77-
<BuilderRow t-if="!isActiveItem('card_img_top_option')" label.translate="Width" level="1">
77+
<BuilderRow t-if="!isActiveItem('card_img_top_opt')" label.translate="Width" level="1">
7878
<!-- Bootstrap default column size -->
7979
<t t-set="colSize" t-value="8.33333333"/>
8080
<BuilderRange

‎addons/website/static/src/builder/plugins/options/header_option.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<BuilderSelect action="'reloadComposite'">
88
<BuilderSelectItem
99
title.translate="Default"
10+
id="'header_default_opt'"
1011
actionParam="[
1112
{
1213
action: 'websiteConfig',
@@ -22,6 +23,7 @@
2223
</BuilderSelectItem>
2324
<BuilderSelectItem
2425
title.translate="Hamburger menu"
26+
id="'header_hamburger_opt'"
2527
actionParam="[
2628
{
2729
action: 'websiteConfig',
@@ -37,6 +39,7 @@
3739
</BuilderSelectItem>
3840
<BuilderSelectItem
3941
title.translate="Rounded box menu"
42+
id="'header_boxed_opt'"
4043
actionParam="[
4144
{
4245
action: 'websiteConfig',
@@ -52,6 +55,7 @@
5255
</BuilderSelectItem>
5356
<BuilderSelectItem
5457
title.translate="Stretch menu"
58+
id="'header_stretch_opt'"
5559
actionParam="[
5660
{
5761
action: 'websiteConfig',
@@ -67,6 +71,7 @@
6771
</BuilderSelectItem>
6872
<BuilderSelectItem
6973
title.translate="Vertical"
74+
id="'header_vertical_opt'"
7075
actionParam="[
7176
{
7277
action: 'websiteConfig',
@@ -82,6 +87,7 @@
8287
</BuilderSelectItem>
8388
<BuilderSelectItem
8489
title.translate="Menu with Search bar"
90+
id="'header_search_opt'"
8591
actionParam="[
8692
{
8793
action: 'websiteConfig',
@@ -97,6 +103,7 @@
97103
</BuilderSelectItem>
98104
<BuilderSelectItem
99105
title.translate="Menu - Sales 1"
106+
id="'header_sales_one_opt'"
100107
actionParam="[
101108
{
102109
action: 'websiteConfig',
@@ -112,6 +119,7 @@
112119
</BuilderSelectItem>
113120
<BuilderSelectItem
114121
title.translate="Menu - Sales 2"
122+
id="'header_sales_two_opt'"
115123
actionParam="[
116124
{
117125
action: 'websiteConfig',
@@ -127,6 +135,7 @@
127135
</BuilderSelectItem>
128136
<BuilderSelectItem
129137
title.translate="Menu - Sales 3"
138+
id="'header_sales_three_opt'"
130139
actionParam="[
131140
{
132141
action: 'websiteConfig',
@@ -141,7 +150,8 @@
141150
<Img attrs="{style:'width:150px;'}" src="'/website/static/src/img/snippets_options/header_template_sales_three.svg'"/>
142151
</BuilderSelectItem>
143152
<BuilderSelectItem
144-
title.translate="Menu - Sales "
153+
title.translate="Menu - Sales 4"
154+
id="'header_sales_four_opt'"
145155
actionParam="[
146156
{
147157
action: 'websiteConfig',
@@ -156,8 +166,8 @@
156166
<Img attrs="{style:'width:150px;'}" src="'/website/static/src/img/snippets_options/header_template_sales_four.svg'"/>
157167
</BuilderSelectItem>
158168
<BuilderSelectItem
159-
id="'header_sidebar_opt'"
160169
title.translate="Sidebar"
170+
id="'header_sidebar_opt'"
161171
actionParam="[
162172
{
163173
action: 'websiteConfig',

‎addons/website/static/src/builder/plugins/options/image_gallery_option.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</BuilderRow>
99
<BuilderRow label.translate="Mode" t-if="!this.state.isSlideShow">
1010
<BuilderSelect>
11-
<BuilderSelectItem id="'image_gallery_grid_id'" action="'setImageGalleryLayout'" actionParam="'grid'">Grid</BuilderSelectItem>
12-
<BuilderSelectItem id="'image_gallery_masonry_id'" action="'setImageGalleryLayout'" actionParam="'masonry'">Masonry</BuilderSelectItem>
11+
<BuilderSelectItem id="'grid_mode_opt'" action="'setImageGalleryLayout'" actionParam="'grid'">Grid</BuilderSelectItem>
12+
<BuilderSelectItem id="'masonry_mode_opt'" action="'setImageGalleryLayout'" actionParam="'masonry'">Masonry</BuilderSelectItem>
1313
<BuilderSelectItem action="'setImageGalleryLayout'" actionParam="'nomode'">Float</BuilderSelectItem>
1414
</BuilderSelect>
1515
</BuilderRow>
@@ -19,7 +19,7 @@
1919
<BuilderRange action="'setClassRange'" actionParam="['o_spc-none','o_spc-small','o_spc-medium','o_spc-big']" max="3"/>
2020
</BuilderRow>
2121

22-
<BuilderRow label.translate="Columns" t-if="isActiveItem('image_gallery_grid_id') || isActiveItem('image_gallery_masonry_id')">
22+
<BuilderRow label.translate="Columns" t-if="isActiveItem('grid_mode_opt') || isActiveItem('masonry_mode_opt')">
2323
<BuilderSelect>
2424
<t t-foreach="[1,2,3,4,6,12]" t-as="column" t-key="column">
2525
<BuilderSelectItem action="'setImageGalleryColumns'" actionParam="column"><t t-esc="column"/></BuilderSelectItem>

‎addons/website/static/src/builder/plugins/options/progress_bar_option.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<BuilderColorPicker applyTo="'.progress-bar'" styleAction="'background-color'"/>
1818
</BuilderRow>
1919
<BuilderRow label.translate="Striped">
20-
<BuilderCheckbox id="'striped_option'" classAction="'progress-bar-striped'" applyTo="'.progress-bar'"/>
20+
<BuilderCheckbox id="'progress_striped_opt'" classAction="'progress-bar-striped'" applyTo="'.progress-bar'"/>
2121
</BuilderRow>
2222
<BuilderRow label.translate="Animated" level="1">
23-
<BuilderCheckbox classAction="'progress-bar-animated'" t-if="this.isActiveItem('striped_option')" applyTo="'.progress-bar'"/>
23+
<BuilderCheckbox classAction="'progress-bar-animated'" t-if="this.isActiveItem('progress_striped_opt')" applyTo="'.progress-bar'"/>
2424
</BuilderRow>
2525
</t>
2626

‎addons/website/static/src/builder/plugins/options/scroll_button_option.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ export class ScrollButtonOption extends BaseOptionComponent {
1717
}
1818

1919
showHeightField() {
20-
return this.state.heightFieldEnabled && this.isActiveItem("fit_content_opt");
20+
return this.state.heightFieldEnabled && this.isActiveItem("minheight_auto_opt");
2121
}
2222
}

‎addons/website/static/src/builder/plugins/options/scroll_button_option.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<t t-name="html_builder.ScrollButtonOption">
55
<BuilderRow label="this.state.heightLabel">
66
<BuilderButtonGroup action="'scrollButtonSectionHeightClassAction'">
7-
<BuilderButton id="'fit_content_opt'" actionParam="''" title.translate="Fit content">Auto</BuilderButton>
7+
<BuilderButton id="'minheight_auto_opt'" actionParam="''" title.translate="Fit content">Auto</BuilderButton>
88
<BuilderButton actionParam="'o_half_screen_height'" title.translate="Half screen">50%</BuilderButton>
99
<BuilderButton id="'full_height_opt'" actionParam="'o_full_screen_height'" title.translate="Full screen">100%</BuilderButton>
1010
</BuilderButtonGroup>

‎addons/website_sale/static/src/website_builder/products_list_page_option.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,26 @@
7575
</BuilderRow>
7676

7777
<BuilderRow label.translate="Categories">
78-
<BuilderButton id="'categories_opt'" actionParam="{views: ['website_sale.products_categories']}">Left</BuilderButton>
78+
<BuilderButton id="'categories_opt'" actionParam="{views: ['website_sale.products_categories']}">Sidebar</BuilderButton>
7979
<BuilderButton id="'categories_opt_top'" actionParam="{views: ['website_sale.products_categories_top']}">Top</BuilderButton>
8080
</BuilderRow>
8181

8282
<BuilderRow t-if="this.isActiveItem('categories_opt')" label.translate="Collapse Category Recursive" level="1">
8383
<BuilderCheckbox id="'collapse_category_recursive'" actionParam="{views: ['website_sale.option_collapse_products_categories']}"/>
8484
</BuilderRow>
8585

86-
<BuilderRow label.translate="Attributes">
87-
<BuilderButton id="'attributes_opt'" actionParam="{views: ['website_sale.products_attributes']}">Left</BuilderButton>
88-
<BuilderButton id="'attributes_opt_top'" actionParam="{views: ['website_sale.products_attributes_top']}">Top</BuilderButton>
86+
<BuilderRow t-if="this.isActiveItem('categories_opt_top')" label.translate="Style" level="1">
87+
<BuilderSelect action="'websiteConfig'">
88+
<BuilderSelectItem actionParam="{views: []}">Filmstrip - default</BuilderSelectItem>
89+
</BuilderSelect>
90+
</BuilderRow>
91+
92+
<BuilderRow label.translate="Filters">
93+
<BuilderSelect action="'websiteConfig'">
94+
<BuilderSelectItem actionParam="{views: []}">Hide</BuilderSelectItem>
95+
<BuilderSelectItem id="'attributes_opt'" actionParam="{views: ['website_sale.products_attributes']}">Left</BuilderSelectItem>
96+
<BuilderSelectItem id="'attributes_opt_top'" actionParam="{views: ['website_sale.products_attributes_top']}">Off-screen Menu</BuilderSelectItem>
97+
</BuilderSelect>
8998
</BuilderRow>
9099
<t t-if="this.isActiveItem('attributes_opt') or this.isActiveItem('attributes_opt_top')">
91100
<BuilderRow label.translate="Price Filter" level="1">

0 commit comments

Comments
 (0)