Skip to content

Commit f1f2253

Browse files
committed
[FIX] answers to comments
1 parent 80eaed6 commit f1f2253

File tree

10 files changed

+188
-228
lines changed

10 files changed

+188
-228
lines changed

addons/html_builder/static/src/builder.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export class Builder extends Component {
4545
toggleFullscreen: { type: Function, optional: true },
4646
toggleCodeView: { type: Function, optional: true },
4747
getExternalScrollableAncestor: { type: Function, optional: true },
48+
fullscreenLogo: { type: String, optional: true },
4849
};
4950
static defaultProps = {
5051
onEditorLoad: () => {},

addons/html_builder/static/src/builder.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
<button t-if="props.toggleCodeView" t-on-click="props.toggleCodeView"
1414
class="o-hb-btn btn d-flex align-items-center o_codeview_btn" title="Code View" accesskey="d"><i class="fa fa-code"/></button>
1515
<button t-if="props.toggleFullscreen" t-on-click="props.toggleFullscreen"
16-
class="o-hb-btn btn d-flex align-items-center" title="Fullscreen" accesskey="f">FS</button>
16+
class="o-hb-btn btn d-flex align-items-center" title="Fullscreen" accesskey="f">
17+
<span t-if="props.fullscreenLogo" t-attf-class="fa #{props.fullscreenLogo}"/>
18+
<t t-else="">FS</t>
19+
</button>
1720
<button t-if="props.closeEditor" type="button" t-on-click="discard" class="o-hb-btn btn" data-action="cancel" title="Tip: Esc to preview" accesskey="j">Discard</button>
1821
<button t-if="props.closeEditor" type="button" t-on-click="save" class="o-hb-btn btn btn-success px-3" data-action="save" accesskey="s">Save</button>
1922
</div>

addons/html_builder/static/src/plugins/border_configurator_option.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</BuilderRow>
1818

1919
<!-- TODO: handle the dependency with border_width_opt bg_color_opt-->
20-
<BuilderRow t-if="props.withRoundCorner" label.translate="Round Corners">
20+
<BuilderRow t-if="props.withRoundCorner and state.hasBorder" label.translate="Round Corners">
2121
<BuilderNumberInput action="props.action" actionParam="{ mainParam: 'border-radius', extraClass: props.withBSClass and 'rounded' }" unit="'px'" min="0" composable="true"/>
2222
</BuilderRow>
2323
</t>

addons/mass_mailing_egg/static/src/builder/fontfamily_picker.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<templates>
22
<t t-name="mass_mailing_egg.FontFamilyPicker">
3-
<BuilderSelect action="this.props.action" actionParam="this.props.actionParam">
3+
<BuilderSelect className="'ps-2'" action="this.props.action" actionParam="this.props.actionParam">
44
<t t-foreach="Object.entries(this.FONT_FAMILIES)" t-as="fontFamily" t-key="fontFamily[0]">
55
<BuilderSelectItem t-out="fontFamily[0]" actionValue="fontFamily[1]"/>
66
</t>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<templates>
22

33
<t t-name="mass_mailing_egg.MassMailingBuilder">
4-
<Builder t-props="builderProps"/>
4+
<Builder t-props="builderProps" fullscreenLogo="'fa-expand'"/>
55
</t>
66

77
</templates>

addons/mass_mailing_egg/static/src/builder/options/image_tool_option.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<BuilderSelectItem classAction="'float-end'">Right</BuilderSelectItem>
88
</BuilderSelect>
99
</BuilderRow>
10-
<t t-call="mass_mailing.BorderOptionNoRoundedCornersDependency"/>
10+
<t t-call="mass_mailing.BorderOption"/>
1111
<t t-call="mass_mailing.HorizontalPaddingOption"/>
1212
<t t-call="mass_mailing.VerticalPaddingOption"/>
1313
</t>

addons/mass_mailing_egg/static/src/builder/plugins/alert_option_plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AlertOptionPlugin extends Plugin {
1313
}),
1414
withSequence(after(WIDTH), {
1515
selector: ".s_mail_alert .s_alert",
16-
template: "mass_mailing.BorderOptionNoRoundedCornersDependency"
16+
template: "mass_mailing.BorderOption",
1717
}),
1818
],
1919
patch_builder_options: [

addons/mass_mailing_egg/static/src/builder/plugins/border_option_plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export class BorderOptionPlugin extends Plugin {
88
resources = {
99
builder_options: [
1010
withSequence(before(WIDTH), {
11-
template: "mass_mailing.BorderOptionNoRoundedCornersDependency",
11+
template: "mass_mailing.BorderOption",
1212
selector:
1313
".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div",
1414
applyTo: ".card",

addons/mass_mailing_egg/static/src/fields/html_field/mass_mailing_html_field.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ export class MassMailingHtmlField extends HtmlMailField {
175175
delete config.Plugins;
176176
return {
177177
...config,
178+
allowMediaDialogVideo: false, // videos aren't allowed in mails
178179
withBuilder: true,
179180
// TODO EGGMAIL?: allow the builder to show the theme selection again
180181
// Applying a new Theme from the builder should CREATE AN EDITOR STEP

0 commit comments

Comments
 (0)