summaryrefslogtreecommitdiff
path: root/addons/website_form
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2019-10-16 15:46:52 +0000
committerqsm-odoo <qsm@odoo.com>2019-11-18 09:56:08 +0000
commit72a2f417ae746142a8098129d7629241908769fb (patch)
tree2521f97802c5ffc1fdefdaa1eb78411dbfb03f2d /addons/website_form
parented8133c72f6d98e88efe318975c9c54bcfc64649 (diff)
[IMP] web_editor, *: introduce select & checkboxes for the left panel UI
* website, website_blog, website_form, website_sale + introduce default UI for snippet options + refactor style of icon buttons Part of https://github.com/odoo/odoo/pull/38959 task-2066614
Diffstat (limited to 'addons/website_form')
-rw-r--r--addons/website_form/static/tests/tours/website_form_editor.js16
-rw-r--r--addons/website_form/views/snippets.xml59
2 files changed, 44 insertions, 31 deletions
diff --git a/addons/website_form/static/tests/tours/website_form_editor.js b/addons/website_form/static/tests/tours/website_form_editor.js
index b37c7626777..4d28b45ab1b 100644
--- a/addons/website_form/static/tests/tours/website_form_editor.js
+++ b/addons/website_form/static/tests/tours/website_form_editor.js
@@ -193,6 +193,10 @@ odoo.define('website_form_editor.tour', function(require) {
trigger: ".s_website_form[data-model_name]",
},
{
+ content: "Open custom fields menu",
+ trigger: "we-select:contains('Multiple Checkboxes')",
+ },
+ {
content: "Click on Multiple Checkboxes in menu Add a custom field",
trigger: "we-button:contains('Multiple Checkboxes')",
},
@@ -245,6 +249,10 @@ odoo.define('website_form_editor.tour', function(require) {
trigger: "label:contains('Iphone') span",
},
{
+ content: "Open display menu",
+ trigger: "we-select:contains('Vertical')",
+ },
+ {
content: "Click on 'Vertical' in menu 'Display'",
trigger: "we-button:contains('Vertical')",
},
@@ -266,6 +274,10 @@ odoo.define('website_form_editor.tour', function(require) {
trigger: ".s_website_form[data-model_name]",
},
{
+ content: "Open custom fields menu",
+ trigger: "we-select:contains('Radio Buttons')"
+ },
+ {
content: "Click on Radio Buttons in menu Add a custom field",
trigger: "we-button:contains('Radio Buttons')"
},
@@ -336,6 +348,10 @@ odoo.define('website_form_editor.tour', function(require) {
trigger: ".s_website_form[data-model_name]",
},
{
+ content: "Open custom fields menu",
+ trigger: "we-select:contains('Selection')"
+ },
+ {
content: "Click on Selection in menu Add a custom field",
trigger: "we-button:contains('Selection')",
},
diff --git a/addons/website_form/views/snippets.xml b/addons/website_form/views/snippets.xml
index f2148f0a427..e558f6c5eab 100644
--- a/addons/website_form/views/snippets.xml
+++ b/addons/website_form/views/snippets.xml
@@ -28,43 +28,38 @@
<attribute name="data-selector" add=".s_website_form" separator=","/>
</xpath>
<xpath expr="//div" position="after">
- <!-- Form -->
- <div data-js="website_form_editor" data-selector=".s_website_form">
- <we-button data-website_form_model_modal="" data-no-preview="true">Change Form Parameters</we-button>
- <we-button data-website_form_field_modal="" data-no-preview="true">Add an existing field</we-button>
- <we-collapse-area>
- <we-toggler>Add a custom field</we-toggler>
- <we-collapse data-no-preview="true">
- <we-button data-website_form_custom_field="char">Text</we-button>
- <we-button data-website_form_custom_field="text">Long Text</we-button>
- <we-button data-website_form_custom_field="email">Email</we-button>
- <we-button data-website_form_custom_field="integer">Number</we-button>
- <we-button data-website_form_custom_field="float">Decimal Number</we-button>
- <we-button data-website_form_custom_field="boolean">Checkbox</we-button>
- <we-button data-website_form_custom_field="selection">Radio Buttons</we-button>
- <we-button data-website_form_custom_field="many2one">Selection</we-button>
- <we-button data-website_form_custom_field="one2many">Multiple Checkboxes</we-button>
- <we-button data-website_form_custom_field="date">Date</we-button>
- <we-button data-website_form_custom_field="datetime">Date &amp; Time</we-button>
- <we-button data-website_form_custom_field="binary">File Upload</we-button>
- </we-collapse>
- </we-collapse-area>
- </div>
+ <!-- Form -->
+ <div data-js="website_form_editor" data-selector=".s_website_form">
+ <we-button data-website_form_model_modal="" data-no-preview="true">Change Form Parameters</we-button>
+ <we-button data-website_form_field_modal="" data-no-preview="true">Add an existing field</we-button>
+ <we-select string="Add a custom field" data-no-preview="true">
+ <we-button data-website_form_custom_field="char">Text</we-button>
+ <we-button data-website_form_custom_field="text">Long Text</we-button>
+ <we-button data-website_form_custom_field="email">Email</we-button>
+ <we-button data-website_form_custom_field="integer">Number</we-button>
+ <we-button data-website_form_custom_field="float">Decimal Number</we-button>
+ <we-button data-website_form_custom_field="boolean">Checkbox</we-button>
+ <we-button data-website_form_custom_field="selection">Radio Buttons</we-button>
+ <we-button data-website_form_custom_field="many2one">Selection</we-button>
+ <we-button data-website_form_custom_field="one2many">Multiple Checkboxes</we-button>
+ <we-button data-website_form_custom_field="date">Date</we-button>
+ <we-button data-website_form_custom_field="datetime">Date &amp; Time</we-button>
+ <we-button data-website_form_custom_field="binary">File Upload</we-button>
+ </we-select>
+ </div>
<!-- Field -->
<div data-js='website_form_editor' data-selector=".form-field" data-drop-near=".form-field">
- <we-button data-toggle-class="o_website_form_field_hidden" data-no-preview="true">Hidden</we-button>
+ <we-checkbox string="Hidden" data-no-preview="true"
+ data-toggle-class="o_website_form_field_hidden"/>
</div>
<!-- Add an option to display radio buttons / checkboxes horizontally or vertically -->
<div data-js='website_form_editor_choice_field_display' data-selector=".o_website_form_flex">
- <we-collapse-area>
- <we-toggler>Display</we-toggler>
- <we-collapse data-no-preview="true">
- <we-button data-website_form_choice_field_display="horizontal">Horizontal</we-button>
- <we-button data-website_form_choice_field_display="vertical">Vertical</we-button>
- </we-collapse>
- </we-collapse-area>
+ <we-select string="Display" data-no-preview="true">
+ <we-button data-website_form_choice_field_display="horizontal">Horizontal</we-button>
+ <we-button data-website_form_choice_field_display="vertical">Vertical</we-button>
+ </we-select>
</div>
<!-- Add move, duplicate and remove controllers to checkboxes and radio buttons -->
@@ -75,7 +70,9 @@
<!-- Required option for fields that are not required fields of the model -->
<div data-js='website_form_editor_field' data-selector=".form-field:not(.o_website_form_required)">
- <we-button data-website_form_field_require="" data-toggle-class="o_website_form_required_custom" data-no-preview="true">Required</we-button>
+ <we-checkbox string="Required" data-no-preview="true"
+ data-website_form_field_require=""
+ data-toggle-class="o_website_form_required_custom"/>
</div>
<!-- Remove the duplicate options of model fields -->