From 310e47218936bb7015b2377a9b5b958add20f04c Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Wed, 20 Jul 2016 22:37:56 +0200 Subject: [PATCH] UI improvements in the table calendar view. --- src/assets/css/backend.css | 2 +- src/assets/js/backend_calendar_table_view.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/assets/css/backend.css b/src/assets/css/backend.css index 8c800388..c7843750 100644 --- a/src/assets/css/backend.css +++ b/src/assets/css/backend.css @@ -426,7 +426,7 @@ body .form-horizontal .controls { } #calendar .calendar-view { - overflow-x: scroll; + overflow-x: auto; } #calendar .calendar-view > div { diff --git a/src/assets/js/backend_calendar_table_view.js b/src/assets/js/backend_calendar_table_view.js index 6abbd162..4c692d73 100644 --- a/src/assets/js/backend_calendar_table_view.js +++ b/src/assets/js/backend_calendar_table_view.js @@ -421,6 +421,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; } function _createProviderColumn($dateColumn, date, provider, events) { + if (provider.services.length === 0) { + return; + } + var $providerColumn = $('
').appendTo($dateColumn); $providerColumn.data('provider', provider); @@ -591,7 +595,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {}; $('.calendar-view > div').css('min-width', width + 50); - $('.calendar-view .not-working').outerHeight($('.date-column').outerHeight() - 70); + + var dateColumnHeight = $('.date-column').outerHeight(); + + $('.calendar-view .not-working').outerHeight((dateColumnHeight > height ? dateColumnHeight : height ) - 70); }