maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

UI improvements in the table calendar view.

Browse source
This commit is contained in:
Alex Tselegidis 2016-07-20 22:37:56 +02:00
parent bc1b82b7da
commit 310e472189
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/css/backend.css
View file

@ -426,7 +426,7 @@ body .form-horizontal .controls {
} }
#calendar .calendar-view { #calendar .calendar-view {
overflow-x: scroll; overflow-x: auto;
} }
#calendar .calendar-view > div { #calendar .calendar-view > div {

9
src/assets/js/backend_calendar_table_view.js
View file

@ -421,6 +421,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
} }
function _createProviderColumn($dateColumn, date, provider, events) { function _createProviderColumn($dateColumn, date, provider, events) {
if (provider.services.length === 0) {
return;
}
var $providerColumn = $('<div class="provider-column" />').appendTo($dateColumn); var $providerColumn = $('<div class="provider-column" />').appendTo($dateColumn);
$providerColumn.data('provider', provider); $providerColumn.data('provider', provider);
@ -591,7 +595,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$('.calendar-view > div').css('min-width', width + 50); $('.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);
} }