r56113 - in /trunk/calendar: js/et2_widget_timegrid.js templates/default/app.css templates/pixelegg/app.css

classic Classic list List threaded Threaded
1 message Options
nathangray nathangray
Reply | Threaded
Open this post in threaded view
|

r56113 - in /trunk/calendar: js/et2_widget_timegrid.js templates/default/app.css templates/pixelegg/app.css

Author: nathangray
Date: Tue May 10 18:03:26 2016
New Revision: 56113

URL: http://svn.stylite.de/viewvc/egroupware?rev=56113&view=rev
Log:
Some more print improvements:
- Fix day & week height in FF
- Fix todos not hidden

Modified:
    trunk/calendar/js/et2_widget_timegrid.js
    trunk/calendar/templates/default/app.css
    trunk/calendar/templates/pixelegg/app.css

Modified: trunk/calendar/js/et2_widget_timegrid.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_timegrid.js?rev=56113&r1=56112&r2=56113&view=diff
==============================================================================
--- trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Tue May 10 18:03:26 2016
@@ -1912,17 +1912,20 @@
  this._resizeTimes();
  }
 
- // update day widgets
- 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
- day.set_left((i*day_width) + '%');
- day.set_width(day_width + '%');
- // For some reason the column's method does not set it correctly in Chrome
- day.header[0].style.width = day_width + '%';
+ // update day widgets, if not on single day view
+ if(this.day_widgets.length > 1)
+ {
+ 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
+ day.set_left((i*day_width) + '%');
+ day.set_width(day_width + '%');
+ // For some reason the column's method does not set it correctly in Chrome
+ day.header[0].style.width = day_width + '%';
+ }
  }
 
  // Stop Firefox from scrolling the day to the top - this would break printing in Chrome
@@ -1935,6 +1938,7 @@
  // Explicitly transform to the correct place
  .css({
  'transform': 'translateY(-'+this.scrolling.scrollTop()+'px)',
+ 'margin-bottom': '-'+this.scrolling.scrollTop()+'px',
  'height': height+'px'
  });
  this.div.css({'height':'','max-height':''});
@@ -1955,7 +1959,7 @@
  // Re-enable out-of-view formatting on scroll
  .on('scroll', jQuery.proxy(this._scroll, this))
  // Remove translation
- .css('transform','');
+ .css({'transform':'', 'margin-bottom':''});
  }
  }
 });}).call(this);

Modified: trunk/calendar/templates/default/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/app.css?rev=56113&r1=56112&r2=56113&view=diff
==============================================================================
--- trunk/calendar/templates/default/app.css (original)
+++ trunk/calendar/templates/default/app.css Tue May 10 18:03:26 2016
@@ -7,7 +7,7 @@
  height: auto !important;
  }
  #calendar-todo.et2_container {
- display: none;
+ display: none !important;
  }
  .calendar_calDayTodos .calendar_calDayTodosTable {
  position: relative;

Modified: trunk/calendar/templates/pixelegg/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.css?rev=56113&r1=56112&r2=56113&view=diff
==============================================================================
--- trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Tue May 10 18:03:26 2016
@@ -11,7 +11,7 @@
  * @package calendar
  * @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 {
   #calendar-view.et2_container,
@@ -21,7 +21,7 @@
     height: auto !important;
   }
   #calendar-todo.et2_container {
-    display: none;
+    display: none !important;
   }
   .calendar_calDayTodos .calendar_calDayTodosTable {
     position: relative;
@@ -2625,3 +2625,5 @@
 #calendar_merge {
   margin: 9px 0 0 0;
 }
+/* ########################################################################################
+/* * Calendar END */


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
eGroupWare-cvs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs