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

Highlight working hours

Browse Source
This commit is contained in:
Nathan Gray 2016-03-22 15:09:39 +00:00
parent c871b6728d
commit 995c6d38b4
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/js/et2_widget_timegrid.js
View File

@ -703,7 +703,12 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
this._top_time = 0; this._top_time = 0;
for(var t = 0,i = 0; t < 1440; t += granularity,++i) 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 // show time for full hours, always for 45min interval and at least on every 3 row
var time = jQuery.datepicker.formatTime( var time = jQuery.datepicker.formatTime(
egw.preference("timeformat") === "12" ? "h:mmtt" : "HH:mm", egw.preference("timeformat") === "12" ? "h:mmtt" : "HH:mm",
@ -715,10 +720,6 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
}, },
{"ampm": (egw.preference("timeformat") === "12")} {"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 : ''; 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) if(time_label && egw.preference("timeformat") == "12" && time_label.split(':')[0] < 10)

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

@ -276,6 +276,10 @@ Hide subsequent headers in week view with non-consolidated owners
* top: * top:
*/ */
} }
.calendar_calTimeRow:not(.calendar_calWorkHours)
{
background-color: rgba(120,120,120,0.1);
}
/* time in a timeRow /* time in a timeRow
*/ */

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

@ -286,6 +286,9 @@ Hide subsequent headers in week view with non-consolidated owners
* top: * top:
*/ */
} }
.calendar_calTimeRow:not(.calendar_calWorkHours) {
background-color: rgba(120, 120, 120, 0.1);
}
/* time in a timeRow /* time in a timeRow
*/ */
.calendar_calTimeRowTime { .calendar_calTimeRowTime {