manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve user experience in weekly and diary views

Browse source
This commit is contained in:
Manuel Cillero 2017-07-26 20:19:23 +02:00
parent 474b46ba16
commit 7abff11841
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sites/all/modules/calendar/calendar_multiday/calendar-overlap.css
View file

@ -124,9 +124,9 @@
border-bottom : 0px; border-bottom : 0px;
} }
.calendar-calendar .week-view table.full { .calendar-calendar .week-view table.full { /*
table-layout : fixed; table-layout : fixed;
width : 925px; width : 925px; */
margin : 0px; margin : 0px;
} }
@ -719,7 +719,7 @@
} }
.calendar-calendar .week-view div.single-day .i_0.md_0 .view-item .calendar { .calendar-calendar .week-view div.single-day .i_0.md_0 .view-item .calendar {
width : 115px !important; width : 100px !important;
width : auto; width : auto;
} }

11
sites/all/modules/calendar/calendar_multiday/calendar_overlap.js
View file

@ -21,12 +21,7 @@ Drupal.behaviors.calendarSetScroll = function (context) {
function performDrag(e) { function performDrag(e) {
var offset = e.pageY - start_y; var offset = e.pageY - start_y;
var mwc = $('#multi-day-container'); var mwc = $('#multi-day-container');
var sdc = $('#single-day-container'); mwc.height(Math.max(0,mwc.height() + offset));
var mwc_height = mwc.height();
var sdc_height = sdc.height();
var max_height = mwc_height + sdc_height;
mwc.height(Math.min(max_height,Math.max(0,mwc_height + offset)));
sdc.height(Math.min(max_height,Math.max(0,sdc_height - offset)));
start_y = divider.offset().top; start_y = divider.offset().top;
return false; return false;
} }
@ -76,12 +71,12 @@ function calendar_scrollToFirst() {
// Size the single day view // Size the single day view
function calendar_resizeViewport() { function calendar_resizeViewport() {
// Size of the browser window // Size of the browser window
var viewportHeight = window.innerHeight ? window.innerHeight : $(window).height(); var viewportHeight = window.innerHeight ? window.innerHeight : $(window).height();
var top = $('#single-day-container').offset().top; var top = $('#single-day-container').offset().top;
$('#multi-day-container').height(75);
// Give it a 20 pixel margin at the bottom // Give it a 20 pixel margin at the bottom
$('#single-day-container').height(viewportHeight - top - 20); $('#single-day-container').height(Math.max(400,viewportHeight - top - 20));
} }