holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix planner view sizing issue where row headers overlapped row data when planner was not wide enough

Browse Source
This commit is contained in:
Nathan Gray 2016-01-15 20:51:12 +00:00
parent 1a5d137ede
commit c146da8106
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/js/et2_widget_planner.js
View File

@ -1868,6 +1868,8 @@ var et2_calendar_planner = et2_calendar_view.extend([et2_IDetachedDOM, et2_IResi
this.options.height = height;
this.div.css('height', this.options.height);
// Set height for rows
this.rows.height(this.div.height() - this.headers.outerHeight());
}
});
et2_register_widget(et2_calendar_planner, ["calendar-planner"]);

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

@ -858,7 +858,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
padding-right: 2px;
}
.calendar_plannerRowHeader:hover {
width: initial !important;
overflow:visible;
z-index: 30;
cursor: pointer;
@ -869,14 +868,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_eventRows, .calendar_plannerHeaderRows {
position: relative;
top: 0px;
left: 15%; /* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
width: 85%;
left: 0px;
right: 0px;
margin-left: 172px;/* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
min-height: 20px;
height: 100%;
}
.calendar_eventRows {
margin-left: 2px;
}
.calendar_plannerWidget .verticalBar {
width: 8ex;
height: 100%;

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

@ -1059,14 +1059,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_plannerHeaderTitle {
line-height: 20px;
}
/* calendar_eventRows contain multiple eventRowWidgets
*/
.calendar_eventRows,
.calendar_plannerHeaderRows {
left: 15%;
/* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
width: 85%;
}
/**
* Filler for month with less then 31 days in yearly planner
*/

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

@ -1133,13 +1133,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
line-height: 20px;
}
/* calendar_eventRows contain multiple eventRowWidgets
*/
.calendar_eventRows, .calendar_plannerHeaderRows {
left: 15%; /* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
width: 85%;
}
/**
* Filler for month with less then 31 days in yearly planner
*/