From e6897c71d5d2d16fa1664f7aa7e072286fde3395 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 13 Apr 2017 17:32:05 +0200 Subject: [PATCH] [FIX] web: wrong display in mobile --- .../static/src/js/views/calendar/calendar_model.js | 6 +++--- .../static/src/js/views/calendar/calendar_renderer.js | 2 +- addons/web/static/src/less/web_calendar.less | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js index 5f068e77847..ef35fee0ca2 100644 --- a/addons/web/static/src/js/views/calendar/calendar_model.js +++ b/addons/web/static/src/js/views/calendar/calendar_model.js @@ -354,15 +354,15 @@ return AbstractModel.extend({ navLinks: false, eventLimit: this.eventLimit, // allow "more" link when too many events snapMinutes: 15, + longPressDelay: 500, eventResizableFromStart: true, - weekNumberCalculation: function (date) { - return moment(date).week(); - }, + weekNumbers: true, weekNumberTitle: _t("W"), allDayText: _t("All day"), views: { week: { columnFormat: 'ddd ' + time.strftime_to_moment_format(_t.database.parameters.date_format), + titleFormat: time.strftime_to_moment_format(_t.database.parameters.time_format), } }, monthNames: moment.months(), diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js index 9ffdb6d0524..e6a52befced 100644 --- a/addons/web/static/src/js/views/calendar/calendar_renderer.js +++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js @@ -324,7 +324,7 @@ return AbstractRenderer.extend({ } element.find('.fc-content .fc-time').text(display_hour); }, - + height: 'auto', unselectAuto: false, }); diff --git a/addons/web/static/src/less/web_calendar.less b/addons/web/static/src/less/web_calendar.less index 740d6db14d9..b23b64bcfa7 100644 --- a/addons/web/static/src/less/web_calendar.less +++ b/addons/web/static/src/less/web_calendar.less @@ -39,9 +39,9 @@ .o_calendar_view { .o-flex(1, 1, auto); min-width: 0; - height: 100%; .o_calendar_widget { + height: 100%; background-color: @odoo-view-background-color; * { z-index: 0; // FIXME @@ -69,6 +69,9 @@ } .fc-view { overflow-x: auto; + > table { + min-width: 600px; + } } } @@ -202,6 +205,12 @@ } } +@media only screen and (max-width: 768px) { + .o_calendar_container { + padding: 0; + } +} + .modal { .o_attendee_head { width: 32px;