pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: theme chooser UI

Browse Source 
Some buttons got lost in the milk theme changes for theme formviews.

X-original-commit: 41eb91a81292ae9ac7a802e8f596ea468183c33f
Part-of: odoo/odoo#123978
This commit is contained in:
Damien Bouvy
2023-06-08 10:26:40 +02:00
parent 8b90e6be45
commit 8dbba67cae
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/components/views/theme_preview.xml
+27 -12
View File
@@ -1,18 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<templates id="template" xml:space="preserve">
<t t-name="website.ThemePreview.Buttons" owl="1">
<div>
<div class="o_form_buttons_view" role="toolbar" aria-label="Main actions">
<ViewButton className="'btn btn-primary o_use_theme'"
clickParams="{type: 'object', name: 'button_choose_theme'}"
record="this.model.root">
<t t-set-slot="contents">Start Now</t>
</ViewButton>
<button class="btn btn-link o_switch_theme" t-on-click.stop="this.back">
Choose another theme
</button>
<t t-name="website.ThemePreviewForm.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="primary" owl="1">
<xpath expr="//div[hasclass('o_control_panel_navigation')]" position="replace">
<div class="d-none d-md-flex align-items-end justify-content-end order-2 order-lg-1 w-100 gap-1" role="group">
<input class="btn-check" id="themeViewerDesktop" type="radio" name="viewer" data-mode='desktop' autocomplete="off" checked='checked'/>
<label class="btn btn-secondary" for="themeViewerDesktop" t-on-click="this.onDesktopClick">Desktop</label>
<input class="btn-check" id="themeViewerMobile" type="radio" name="viewer" data-mode='mobile' autocomplete="off"/>
<label class="btn btn-secondary" for="themeViewerMobile" t-on-click="this.onMobileClick">Mobile</label>
</div>
</div>
</xpath>
</t>
<t t-name="website.ThemePreviewFormController" t-inherit="web.FormView" t-inherit-mode="primary" owl="1">
<xpath expr="//Layout" position="inside">
<t t-set-slot="layout-actions">
<div>
<div class="o_form_buttons_view" role="toolbar" aria-label="Main actions">
<ViewButton className="'btn btn-primary o_use_theme'"
clickParams="{type: 'object', name: 'button_choose_theme'}"
record="this.model.root">
<t t-set-slot="contents">Start Now</t>
</ViewButton>
<button class="btn btn-link o_switch_theme" t-on-click.stop="this.back">
Choose another theme
</button>
</div>
</div>
</t>
</xpath>
</t>
<t t-name="website.ThemePreviewKanban.ControlPanel.BreadCrumbs" owl="1">
addons/website/static/src/components/views/theme_preview_form.js
+1 -4
View File
@@ -72,6 +72,7 @@ class ThemePreviewFormController extends FormController {
}
}
ThemePreviewFormController.components = { ...FormController.components, ViewButton };
ThemePreviewFormController.template = 'website.ThemePreviewFormController';
class ThemePreviewFormControlPanel extends ControlPanel {
/**
@@ -92,10 +93,6 @@ ThemePreviewFormControlPanel.template = 'website.ThemePreviewForm.ControlPanel';
const ThemePreviewFormView = {
...formView,
display: {
controlPanel: {}
},
buttonTemplate: 'website.ThemePreview.Buttons',
Controller: ThemePreviewFormController,
ControlPanel: ThemePreviewFormControlPanel,
};