extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues with calendar owner name

Browse Source 
- contacts would sometimes show week name and contact name
- Long owner names for first week would overflow onto the times
This commit is contained in:
Nathan Gray 2016-03-31 22:32:13 +00:00
parent ef00fc3122
commit 6f07b8384f
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/js/et2_widget_timegrid.js
View File

@ -1403,6 +1403,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
if(typeof _owner == 'string' && isNaN(_owner)) if(typeof _owner == 'string' && isNaN(_owner))
{ {
this.set_label('');
switch(_owner[0]) switch(_owner[0])
{ {
case 'c': case 'c':

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

@ -283,13 +283,16 @@ Hide subsequent headers in week view with non-consolidated owners
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] { #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] {
display:none; display:none;
} }
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul > li { #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > ul > li {
white-space:nowrap; white-space:nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul > li:hover { #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > ul:hover {
overflow: visible; overflow: visible;
width: auto;
background-color: inherit;
z-index: 100;
} }
/* single row in the time-line you dont need to set a bgcolor, but you can /* single row in the time-line you dont need to set a bgcolor, but you can

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

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @version $Id$
*/ */
/* $Id: app.css 55492 2016-03-22 15:09:39Z nathangray $ */ /* $Id: app.css 55586 2016-03-31 21:55:47Z nathangray $ */
/*Media print classes*/ /*Media print classes*/
@media print { @media print {
#calendar-view.et2_container, #calendar-view.et2_container,
@ -38,7 +38,7 @@
page-break-inside: avoid; page-break-inside: avoid;
} }
.calendar_calTimeGrid .calendar_calTimeGridScroll { .calendar_calTimeGrid .calendar_calTimeGridScroll {
overflow-y: hidden; overflow-y: hidden !important;
} }
/* Let hidden user names be visible */ /* Let hidden user names be visible */
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul { #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul {
@ -292,13 +292,16 @@ Hide subsequent headers in week view with non-consolidated owners
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] { #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] {
display: none; display: none;
} }
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul > li { #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > ul > li {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul > li:hover { #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > ul:hover {
overflow: visible; overflow: visible;
width: auto;
background-color: inherit;
z-index: 100;
} }
/* single row in the time-line you dont need to set a bgcolor, but you can /* single row in the time-line you dont need to set a bgcolor, but you can
*/ */