Supress tooltip on holidays shown as events

This commit is contained in:
nathangray 2016-06-15 09:17:12 -06:00
parent e5f35bedae
commit 27ef0c20a9
5 changed files with 29 additions and 3 deletions

View File

@ -434,7 +434,8 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
end: this.options.date, end: this.options.date,
owner: this.options.owner, owner: this.options.owner,
participants: this.options.owner, participants: this.options.owner,
app: 'calendar' app: 'calendar',
class: 'calendar_calBirthday'
}, },
readonly: true, readonly: true,
class: 'calendar_calBirthday' class: 'calendar_calBirthday'
@ -469,7 +470,8 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
end: this.options.date, end: this.options.date,
owner: this.options.owner, owner: this.options.owner,
participants: this.options.owner, participants: this.options.owner,
app: 'calendar' app: 'calendar',
class: 'calendar_calBirthday'
}, },
readonly: true, readonly: true,
class: 'calendar_calHoliday' class: 'calendar_calHoliday'

View File

@ -494,7 +494,8 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
cat.destroy(); cat.destroy();
} }
return '<div class="calendar_calEventTooltip ' + this._status_class() + '" style="border-color: '+border+'; background-color: '+bg_color+';">'+ return '<div class="calendar_calEventTooltip ' + this._status_class() +' '+ this.options.class +
'" style="border-color: '+border+'; background-color: '+bg_color+';">'+
'<div class="calendar_calEventHeaderSmall">'+ '<div class="calendar_calEventHeaderSmall">'+
'<font style="color:'+header_color+'">'+timespan+'</font>'+ '<font style="color:'+header_color+'">'+timespan+'</font>'+
this.icons[0].outerHTML+ this.icons[0].outerHTML+

View File

@ -241,6 +241,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_calBirthday,.calendar_calBirthday a{ .calendar_calBirthday,.calendar_calBirthday a{
color: #626161; color: #626161;
} }
/* Supress tooltips on holidays shown as events */
.calendar_calEventTooltip.calendar_calBirthday, .calendar_calEventTooltip.calendar_calHoliday {
display: none;
}
/* timeGridWidget, contains timeRow's and dayCol's /* timeGridWidget, contains timeRow's and dayCol's
*/ */

View File

@ -261,6 +261,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_calBirthday a { .calendar_calBirthday a {
color: #626161; color: #626161;
} }
/* Supress tooltips on holidays shown as events */
.calendar_calEventTooltip.calendar_calBirthday,
.calendar_calEventTooltip.calendar_calHoliday {
display: none;
}
/* timeGridWidget, contains timeRow's and dayCol's /* timeGridWidget, contains timeRow's and dayCol's
*/ */
.calendar_calTimeGrid { .calendar_calTimeGrid {
@ -1148,6 +1153,7 @@ Hide subsequent headers in week view with non-consolidated owners
.calendar_eventRowsFiller { .calendar_eventRowsFiller {
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 0px;
height: 93%; height: 93%;
background-color: white; background-color: white;
border: 1px dashed gray; border: 1px dashed gray;
@ -1419,6 +1425,10 @@ input#calendar-edit_location {
background-image: linear-gradient(top, #828282, #828282) !important; background-image: linear-gradient(top, #828282, #828282) !important;
background-repeat: repeat-x !important; background-repeat: repeat-x !important;
} }
#calendar-list {
/* Keeps the scrollbar in the window in chrome */
margin-right: 10px;
}
#calendar_sidebox_content .egw_fw_ui_category_content { #calendar_sidebox_content .egw_fw_ui_category_content {
padding-left: 0px !important; padding-left: 0px !important;
} }
@ -2587,6 +2597,10 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
} }
#calendar-sidebox_date .ui-datepicker-year { #calendar-sidebox_date .ui-datepicker-year {
padding-right: 5px !important; padding-right: 5px !important;
min-width: 65px;
}
#calendar-sidebox_date .ui-datepicker-month {
min-width: 60px;
} }
#calendar-sidebox_date .ui-datepicker-header a span { #calendar-sidebox_date .ui-datepicker-header a span {
width: 20px; width: 20px;

View File

@ -249,6 +249,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_calBirthday a { .calendar_calBirthday a {
color: #626161; color: #626161;
} }
/* Supress tooltips on holidays shown as events */
.calendar_calEventTooltip.calendar_calBirthday,
.calendar_calEventTooltip.calendar_calHoliday {
display: none;
}
/* timeGridWidget, contains timeRow's and dayCol's /* timeGridWidget, contains timeRow's and dayCol's
*/ */
.calendar_calTimeGrid { .calendar_calTimeGrid {