extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 19:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more print improvements:

Browse Source 
- Fix day & week height in FF
- Fix todos not hidden
This commit is contained in:
Nathan Gray 2016-05-10 16:03:26 +00:00
parent 419f90f2e9
commit e7763189b1
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/js/et2_widget_timegrid.js
View File

@ -1912,17 +1912,20 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
this._resizeTimes(); this._resizeTimes();
} }
// update day widgets // update day widgets, if not on single day view
var day_width = (100 / this.day_widgets.length); if(this.day_widgets.length > 1)
for(var i = 0; i < this.day_widgets.length; i++)
{ {
var day = this.day_widgets[i]; var day_width = (100 / this.day_widgets.length);
for(var i = 0; i < this.day_widgets.length; i++)
{
var day = this.day_widgets[i];
// Position // Position
day.set_left((i*day_width) + '%'); day.set_left((i*day_width) + '%');
day.set_width(day_width + '%'); day.set_width(day_width + '%');
// For some reason the column's method does not set it correctly in Chrome // For some reason the column's method does not set it correctly in Chrome
day.header[0].style.width = day_width + '%'; day.header[0].style.width = day_width + '%';
}
} }
// Stop Firefox from scrolling the day to the top - this would break printing in Chrome // Stop Firefox from scrolling the day to the top - this would break printing in Chrome
@ -1935,6 +1938,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// Explicitly transform to the correct place // Explicitly transform to the correct place
.css({ .css({
'transform': 'translateY(-'+this.scrolling.scrollTop()+'px)', 'transform': 'translateY(-'+this.scrolling.scrollTop()+'px)',
'margin-bottom': '-'+this.scrolling.scrollTop()+'px',
'height': height+'px' 'height': height+'px'
}); });
this.div.css({'height':'','max-height':''}); this.div.css({'height':'','max-height':''});
@ -1955,7 +1959,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// Re-enable out-of-view formatting on scroll // Re-enable out-of-view formatting on scroll
.on('scroll', jQuery.proxy(this._scroll, this)) .on('scroll', jQuery.proxy(this._scroll, this))
// Remove translation // Remove translation
.css('transform',''); .css({'transform':'', 'margin-bottom':''});
} }
} }
});}).call(this); });}).call(this);

2
calendar/templates/default/app.css
View File

@ -7,7 +7,7 @@
height: auto !important; height: auto !important;
} }
#calendar-todo.et2_container { #calendar-todo.et2_container {
display: none; display: none !important;
} }
.calendar_calDayTodos .calendar_calDayTodosTable { .calendar_calDayTodos .calendar_calDayTodosTable {
position: relative; position: relative;

6
calendar/templates/pixelegg/app.css
View File

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @version $Id$
*/ */
/* $Id: app.css 56001 2016-05-03 21:58:58Z nathangray $ */ /* $Id: app.css 56059 2016-05-06 09:32:17Z hnategh $ */
/*Media print classes*/ /*Media print classes*/
@media print { @media print {
#calendar-view.et2_container, #calendar-view.et2_container,
@ -21,7 +21,7 @@
height: auto !important; height: auto !important;
} }
#calendar-todo.et2_container { #calendar-todo.et2_container {
display: none; display: none !important;
} }
.calendar_calDayTodos .calendar_calDayTodosTable { .calendar_calDayTodos .calendar_calDayTodosTable {
position: relative; position: relative;
@ -2625,3 +2625,5 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
#calendar_merge { #calendar_merge {
margin: 9px 0 0 0; margin: 9px 0 0 0;
} }
/* ########################################################################################
/* * Calendar END */