app.css

nathangray 2016-03-22 15:09:39 UTC #1

Author: nathangray
New Revision: 55492

URL: http://svn.stylite.de/viewvc/egroupware?rev=55492&view=rev
Log:
Highlight working hours

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=55492&r1=55491&r2=55492&view=diff

— trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Tue Mar 22 16:09:39 2016
@@ -703,7 +703,12 @@
this._top_time = 0;
for(var t = 0,i = 0; t < 1440; t += granularity,++i)
{

  	html += '<div class="calendar_calTimeRow" style="height: '+(100/row_count)+'%;">';

  	if(t <= wd_start && t + granularity > wd_start)

```
  	{
```

  		this._top_time = this.rowHeight * (i+1+(wd_start - (t+granularity))/granularity);

```
  	}
```

  	var working_hours = (t >= wd_start && t < wd_end) ? ' calendar_calWorkHours' : '';

  	html += '<div class="calendar_calTimeRow' + working_hours + '" style="height: '+(100/row_count)+'%;">';
  	// show time for full hours, always for 45min interval and at least on every 3 row
  	var time = jQuery.datepicker.formatTime(
  			egw.preference("timeformat") === "12" ? "h:mmtt" : "HH:mm",

@@ -715,10 +720,6 @@
},
{“ampm”: (egw.preference(“timeformat”) === “12”)}
);

  	if(t <= wd_start && t + granularity > wd_start)

```
  	{
```

  		this._top_time = this.rowHeight * (i+1+(wd_start - (t+granularity))/granularity);

  	}

  	var time_label = (typeof show[granularity] === 'undefined' ? t % 60 === 0 : show[granularity].indexOf(t % 60) !== -1) ? time : '';
  	if(time_label && egw.preference("timeformat") == "12" && time_label.split(':')[0] < 10)

Modified: trunk/calendar/templates/default/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/app.css?rev=55492&r1=55491&r2=55492&view=diff

— trunk/calendar/templates/default/app.css (original)
+++ trunk/calendar/templates/default/app.css Tue Mar 22 16:09:39 2016
@@ -276,6 +276,10 @@

top:
*/
}
+.calendar_calTimeRow:not(.calendar_calWorkHours)
+{

background-color: rgba(120,120,120,0.1);
+}

/* time in a timeRow
*/

Modified: trunk/calendar/templates/pixelegg/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.css?rev=55492&r1=55491&r2=55492&view=diff

— trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Tue Mar 22 16:09:39 2016
@@ -285,6 +285,9 @@

height:
top:
*/
+}
+.calendar_calTimeRow:not(.calendar_calWorkHours) {

background-color: rgba(120, 120, 120, 0.1);
}
/* time in a timeRow
*/

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs