summaryrefslogtreecommitdiff
path: root/addons/lunch/static
diff options
context:
space:
mode:
authorKevin Baptiste <kba@odoo.com>2019-06-27 14:24:41 +0000
committerYannick Tivisse <yti@odoo.com>2019-07-16 11:44:35 +0000
commit50163143a915635eda08dc1f053e057c38871f42 (patch)
tree71c1dcdb08ac95a7a65ac0e9c5bb1be277e3a2e2 /addons/lunch/static
parent8f137f66bc4a43a43da111cfde04d4fd27e455ea (diff)
[IMP] lunch: Improve the general UX (back2basics)
- Reorganize configure your order screen - Alert users through chat: Alerts can now be configured to send a chat message to the employees. - Replace toppings by extras closes odoo/odoo#34470 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/lunch/static')
-rw-r--r--addons/lunch/static/src/js/lunch_kanban_controller.js1
-rw-r--r--addons/lunch/static/src/scss/lunch_kanban.scss15
-rw-r--r--addons/lunch/static/src/scss/lunch_list.scss5
-rw-r--r--addons/lunch/static/src/xml/lunch_kanban.xml6
-rw-r--r--addons/lunch/static/tests/lunch_kanban_tests.js1
5 files changed, 25 insertions, 3 deletions
diff --git a/addons/lunch/static/src/js/lunch_kanban_controller.js b/addons/lunch/static/src/js/lunch_kanban_controller.js
index f1acf81b301..a0f02b020a7 100644
--- a/addons/lunch/static/src/js/lunch_kanban_controller.js
+++ b/addons/lunch/static/src/js/lunch_kanban_controller.js
@@ -169,6 +169,7 @@ var LunchKanbanController = KanbanController.extend({
this.do_action({
res_model: 'lunch.order.temp',
+ name: 'Configure Your Order',
type: 'ir.actions.act_window',
views: [[false, 'form']],
target: 'new',
diff --git a/addons/lunch/static/src/scss/lunch_kanban.scss b/addons/lunch/static/src/scss/lunch_kanban.scss
index 51acfd2b3f8..2e315025398 100644
--- a/addons/lunch/static/src/scss/lunch_kanban.scss
+++ b/addons/lunch/static/src/scss/lunch_kanban.scss
@@ -51,6 +51,13 @@
}
}
+.o_lunch_image {
+ img {
+ max-width: 128px;
+ max-height: 128px !important;
+ }
+}
+
@include media-breakpoint-down(sm) {
.o_lunch_kanban {
details summary {
@@ -65,3 +72,11 @@
}
}
}
+
+.o_lunch_wizard {
+ .col-10 {
+ .o_form_label {
+ font-weight: normal !important;
+ }
+ }
+} \ No newline at end of file
diff --git a/addons/lunch/static/src/scss/lunch_list.scss b/addons/lunch/static/src/scss/lunch_list.scss
new file mode 100644
index 00000000000..2babc5e388e
--- /dev/null
+++ b/addons/lunch/static/src/scss/lunch_list.scss
@@ -0,0 +1,5 @@
+.o_lunch_list {
+ .o_list_button {
+ width: 1px;
+ }
+} \ No newline at end of file
diff --git a/addons/lunch/static/src/xml/lunch_kanban.xml b/addons/lunch/static/src/xml/lunch_kanban.xml
index 3b3b319ce95..1695319d96f 100644
--- a/addons/lunch/static/src/xml/lunch_kanban.xml
+++ b/addons/lunch/static/src/xml/lunch_kanban.xml
@@ -4,10 +4,10 @@
<div class="o_lunch_widget row py-3 py-md-0">
<div class="o_lunch_widget_info col-12 col-md-4 card border-0">
<div class="card-body row no-gutters align-items-center">
- <div class="col-3 col-md-6 col-lg-4">
+ <div class="col-3 col-md-6 col-lg-3">
<img class="rounded-circle" t-attf-src="{{ widget.userimage }}"/>
</div>
- <div class="col-9 col-md-6 col-lg-8">
+ <div class="col-9 col-md-6 col-lg-9">
<div class="pl-3">
<div class="o_lunch_user_field py-1"/>
<div class="o_lunch_location_field py-1"/>
@@ -87,7 +87,7 @@
</div>
</div>
<t t-foreach="widget.alerts" t-as="alert">
- <div class="alert alert-danger" role="alert">
+ <div class="alert alert-warning" role="alert">
<t t-raw="alert.message"/> <!-- alert.message is coming from a fields.Html so it should be safe -->
</div>
</t>
diff --git a/addons/lunch/static/tests/lunch_kanban_tests.js b/addons/lunch/static/tests/lunch_kanban_tests.js
index 8bc4879f9e5..1757414c6c4 100644
--- a/addons/lunch/static/tests/lunch_kanban_tests.js
+++ b/addons/lunch/static/tests/lunch_kanban_tests.js
@@ -591,6 +591,7 @@ QUnit.module('LunchKanbanView', {
intercepts: {
do_action: function (ev) {
assert.deepEqual(ev.data.action, {
+ name: "Configure Your Order",
res_model: 'lunch.order.temp',
type: 'ir.actions.act_window',
views: [[false, 'form']],