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

Move week view's user label to span the whole week, just above the all day events

Browse Source
This commit is contained in:
nathangray 2016-09-06 09:44:52 -06:00
parent ac070b5c98
commit 11ef29c359
4 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/et2_widget_daycol.js
View File

@ -70,6 +70,9 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
.css('left', this.options.left);
this.title = jQuery(document.createElement('div'))
.appendTo(this.header);
this.user_spacer = jQuery(document.createElement('div'))
.addClass("calendar_calDayColHeader_spacer")
.appendTo(this.header);
this.all_day = jQuery(document.createElement('div'))
.addClass("calendar_calDayColAllDay")
.css('max-height', (egw.preference('limit_all_day_lines', 'calendar') || 3 ) * 1.4 + 'em')
@ -126,6 +129,7 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
this.div = null;
this.header = null;
this.title = null;
this.user_spacer = null;
// date_helper has no parent, so we must explicitly remove it
this.date_helper.destroy();

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

@ -325,16 +325,27 @@ 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] {
display:none;
}
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > span.et2_label
{
position: absolute;
top: 2em;
}
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer
{
height: ~"calc(1.5em + 5px)";
}
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
white-space:nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label:hover {
overflow: visible;
width: auto;
background-color: inherit;
z-index: 100;
display: block;
position: static;
width: ~"calc(100% - 58px)";
margin-left: 58px;
color: white;
background-color: #0C5DA5;
text-align: center;
line-height: 1.5em;
font-size: 14px;
z-index: 35;
}
/* single row in the time-line you dont need to set a bgcolor, but you can
@ -545,6 +556,8 @@ Hide subsequent headers in week view with non-consolidated owners
line-height: 27px;
width: 58px;
text-align: center;
position: absolute;
top: 0px;
}
.calendar_calGridHeader > span.et2_label {
@ -734,7 +747,6 @@ Hide subsequent headers in week view with non-consolidated owners
}
.calendar_calDayColHeader .calendar_calEvent .calendar_calEventBody {
white-space: nowrap;
background-color: #f0f0f0;
}
.calendar_calEventTooltip{
padding-left: 6px;

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

@ -327,16 +327,25 @@ 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] {
display: none;
}
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > span.et2_label {
position: absolute;
top: 2em;
}
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
height: calc(1.5em + 5px);
}
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label:hover {
overflow: visible;
width: auto;
background-color: inherit;
z-index: 100;
display: block;
position: static;
width: calc(100% - 58px);
margin-left: 58px;
color: white;
background-color: #0C5DA5;
text-align: center;
line-height: 1.5em;
font-size: 14px;
z-index: 35;
}
/* single row in the time-line you dont need to set a bgcolor, but you can
*/
@ -542,6 +551,8 @@ Hide subsequent headers in week view with non-consolidated owners
line-height: 27px;
width: 58px;
text-align: center;
position: absolute;
top: 0px;
}
.calendar_calGridHeader > span.et2_label {
position: absolute;
@ -720,7 +731,6 @@ Hide subsequent headers in week view with non-consolidated owners
}
.calendar_calDayColHeader .calendar_calEvent .calendar_calEventBody {
white-space: nowrap;
background-color: #f0f0f0;
}
.calendar_calEventTooltip {
padding-left: 6px;
@ -2053,11 +2063,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_calViewUserNameFirst:after {
content: ", ";
}
/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
*/
.calendar_calGridHeader {
background-color: #f0f0f0;
}
/* contains one event: header-row & -body
*/
.calendar_calEvent {

6
calendar/templates/pixelegg/app.less
View File

@ -755,12 +755,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
content: ", ";
}
/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
*/
.calendar_calGridHeader{
.background_color_10_gray;
}
/* contains one event: header-row & -body
*/
.calendar_calEvent {