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

Fix bug where if daily view is in a window that is to small, vertical scrollbar is in the wrong place

Browse Source
This commit is contained in:
nathangray 2016-12-21 08:12:16 -07:00
parent ce58542f3d
commit 0211be26ba
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -2306,11 +2306,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{ {
if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile()) if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile())
{ {
view.etemplates[0].widgetContainer.iterateOver(function(w) { // Set width to 70%, otherwise if a scrollbar is needed for the view, it will conflict with the todo list
w.set_width(jQuery(view.etemplates[0].DOMContainer).width() * 0.69); jQuery(app.classes.calendar.views.day.etemplates[0].DOMContainer).css("width","70%");
},this,et2_calendar_timegrid); jQuery(view.etemplates[1].DOMContainer).css({"left":"70%", "height":(jQuery(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'});
jQuery(view.etemplates[1].DOMContainer).css({"left":"69%", "height":(jQuery(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'});
// TODO: Maybe some caching here // TODO: Maybe some caching here
this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) { this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) {
this.getWidgetById('label').set_value(data.label||''); this.getWidgetById('label').set_value(data.label||'');

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

@ -1004,7 +1004,6 @@ Hide subsequent headers in week view with non-consolidated owners
} }
.calendar_calDayTodos { .calendar_calDayTodos {
width: 98%; width: 98%;
margin-left: 10px;
border: 1px solid silver; border: 1px solid silver;
} }
.calendar_calDayTodosHeader { .calendar_calDayTodosHeader {
@ -1026,7 +1025,7 @@ Hide subsequent headers in week view with non-consolidated owners
border: 1px solid silver; border: 1px solid silver;
background-color: #fafafa; background-color: #fafafa;
position: absolute; position: absolute;
left: 12px; left: 2px;
} }
/****************************************************** /******************************************************

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

@ -973,7 +973,6 @@ Hide subsequent headers in week view with non-consolidated owners
} }
.calendar_calDayTodos { .calendar_calDayTodos {
width: 98%; width: 98%;
margin-left: 10px;
border: 1px solid silver; border: 1px solid silver;
} }
.calendar_calDayTodosHeader { .calendar_calDayTodosHeader {
@ -994,7 +993,7 @@ Hide subsequent headers in week view with non-consolidated owners
border: 1px solid silver; border: 1px solid silver;
background-color: #fafafa; background-color: #fafafa;
position: absolute; position: absolute;
left: 12px; left: 2px;
} }
/****************************************************** /******************************************************
* CSS settings for the planner views (calendar_plannerWidget) * * CSS settings for the planner views (calendar_plannerWidget) *
@ -1631,7 +1630,7 @@ div.calendar {
} }
.calendar thead .active { .calendar thead .active {
/* Active (pressed) buttons in header */ /* Active (pressed) buttons in header */
background_color: #408DD2; background_color: #408dd2;
/*padding: 2px 0px 0px 2px;*/ /*padding: 2px 0px 0px 2px;*/
} }
.calendar tbody tr, .calendar tbody tr,
@ -2118,7 +2117,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
overflow: auto; overflow: auto;
} }
.calendar_calAddEvent:hover { .calendar_calAddEvent:hover {
background-color: #FFDD73; background-color: #ffdd73;
cursor: pointer; cursor: pointer;
color: #ffffff; color: #ffffff;
} }
@ -2267,11 +2266,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
background-color: #1aa200; background-color: #1aa200;
background-color: #189800 !important; background-color: #189800 !important;
} }
.calendar_calDayTodos {
width: 98%;
margin-left: 10px;
border: 1px solid silver;
}
.calendar_calDayTodosHeader { .calendar_calDayTodosHeader {
text-align: center; text-align: center;
} }

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

@ -899,11 +899,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
} }
.calendar_calDayTodos {
width: 98%;
margin-left: 10px;
border: 1px solid silver;
}
.calendar_calDayTodosHeader { .calendar_calDayTodosHeader {
text-align: center; text-align: center;
} }