diff --git a/calendar/js/app.js b/calendar/js/app.js index 298764cb2f..2d77339fba 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -94,6 +94,13 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend( // call parent this._super.apply(this, arguments); + + // Show loading div + egw.loading_prompt( + this.appname,true,egw.lang('please wait...'), + framework.applications.calendar.tab.contentDiv, + egwIsMobile()?'horizental':'spinner' + ); // Scroll jQuery(jQuery.proxy(this._scroll,this)); @@ -3273,6 +3280,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend( { $j(window).trigger('resize'); this.setState({state:this.state}); + egw.loading_prompt(this.appname,false); } }, diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index e4637f7c65..a6d4ca27c2 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -581,7 +581,8 @@ Hide subsequent headers in week view with non-consolidated owners #calendar-view_view tbody.ui-sortable .calendar_calGridHeader { cursor: ns-resize; } -#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader { +#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader, +#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader label { cursor: pointer; } diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 412fc720aa..a152c84d18 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -11,7 +11,7 @@ * @package calendar * @version $Id$ */ -/* $Id: app.css 55613 2016-04-04 16:38:23Z nathangray $ */ +/* $Id: app.css 55614 2016-04-04 17:55:49Z nathangray $ */ /*Media print classes*/ @media print { #calendar-view.et2_container, @@ -584,7 +584,8 @@ Hide subsequent headers in week view with non-consolidated owners #calendar-view_view tbody.ui-sortable .calendar_calGridHeader { cursor: ns-resize; } -#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader { +#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader, +#calendar-view_view tbody.ui-sortable-disabled .calendar_calGridHeader label { cursor: pointer; } /* contains (multiple) events's