mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-15 04:24:41 +01:00
Move week view's user label to span the whole week, just above the all day events
This commit is contained in:
parent
ac070b5c98
commit
11ef29c359
@ -70,6 +70,9 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
|
|||||||
.css('left', this.options.left);
|
.css('left', this.options.left);
|
||||||
this.title = jQuery(document.createElement('div'))
|
this.title = jQuery(document.createElement('div'))
|
||||||
.appendTo(this.header);
|
.appendTo(this.header);
|
||||||
|
this.user_spacer = jQuery(document.createElement('div'))
|
||||||
|
.addClass("calendar_calDayColHeader_spacer")
|
||||||
|
.appendTo(this.header);
|
||||||
this.all_day = jQuery(document.createElement('div'))
|
this.all_day = jQuery(document.createElement('div'))
|
||||||
.addClass("calendar_calDayColAllDay")
|
.addClass("calendar_calDayColAllDay")
|
||||||
.css('max-height', (egw.preference('limit_all_day_lines', 'calendar') || 3 ) * 1.4 + 'em')
|
.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.div = null;
|
||||||
this.header = null;
|
this.header = null;
|
||||||
this.title = null;
|
this.title = null;
|
||||||
|
this.user_spacer = null;
|
||||||
|
|
||||||
// date_helper has no parent, so we must explicitly remove it
|
// date_helper has no parent, so we must explicitly remove it
|
||||||
this.date_helper.destroy();
|
this.date_helper.destroy();
|
||||||
|
@ -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] {
|
#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: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 {
|
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
|
||||||
white-space:nowrap;
|
white-space:nowrap;
|
||||||
text-overflow: ellipsis;
|
display: block;
|
||||||
overflow: hidden;
|
position: static;
|
||||||
}
|
width: ~"calc(100% - 58px)";
|
||||||
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label:hover {
|
margin-left: 58px;
|
||||||
overflow: visible;
|
color: white;
|
||||||
width: auto;
|
background-color: #0C5DA5;
|
||||||
background-color: inherit;
|
text-align: center;
|
||||||
z-index: 100;
|
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
|
/* 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;
|
line-height: 27px;
|
||||||
width: 58px;
|
width: 58px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
position: absolute;
|
||||||
|
top: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.calendar_calGridHeader > span.et2_label {
|
.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 {
|
.calendar_calDayColHeader .calendar_calEvent .calendar_calEventBody {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
background-color: #f0f0f0;
|
|
||||||
}
|
}
|
||||||
.calendar_calEventTooltip{
|
.calendar_calEventTooltip{
|
||||||
padding-left: 6px;
|
padding-left: 6px;
|
||||||
|
@ -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] {
|
#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: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 {
|
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
display: block;
|
||||||
overflow: hidden;
|
position: static;
|
||||||
}
|
width: calc(100% - 58px);
|
||||||
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label:hover {
|
margin-left: 58px;
|
||||||
overflow: visible;
|
color: white;
|
||||||
width: auto;
|
background-color: #0C5DA5;
|
||||||
background-color: inherit;
|
text-align: center;
|
||||||
z-index: 100;
|
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
|
/* 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;
|
line-height: 27px;
|
||||||
width: 58px;
|
width: 58px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
position: absolute;
|
||||||
|
top: 0px;
|
||||||
}
|
}
|
||||||
.calendar_calGridHeader > span.et2_label {
|
.calendar_calGridHeader > span.et2_label {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@ -720,7 +731,6 @@ Hide subsequent headers in week view with non-consolidated owners
|
|||||||
}
|
}
|
||||||
.calendar_calDayColHeader .calendar_calEvent .calendar_calEventBody {
|
.calendar_calDayColHeader .calendar_calEvent .calendar_calEventBody {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
background-color: #f0f0f0;
|
|
||||||
}
|
}
|
||||||
.calendar_calEventTooltip {
|
.calendar_calEventTooltip {
|
||||||
padding-left: 6px;
|
padding-left: 6px;
|
||||||
@ -2053,11 +2063,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
|
|||||||
.calendar_calViewUserNameFirst:after {
|
.calendar_calViewUserNameFirst:after {
|
||||||
content: ", ";
|
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
|
/* contains one event: header-row & -body
|
||||||
*/
|
*/
|
||||||
.calendar_calEvent {
|
.calendar_calEvent {
|
||||||
|
@ -755,12 +755,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
|
|||||||
content: ", ";
|
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
|
/* contains one event: header-row & -body
|
||||||
*/
|
*/
|
||||||
.calendar_calEvent {
|
.calendar_calEvent {
|
||||||
|
Loading…
Reference in New Issue
Block a user