extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-09 15:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Add framework loader back until calendar templates are loaded

Browse Source 
- Use pointer cursor for week view so it looks clickable
This commit is contained in:
Nathan Gray 2016-04-05 21:38:49 +00:00
parent 1b4deda76f
commit 51be1aa2a9
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -94,6 +94,13 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
// call parent // call parent
this._super.apply(this, arguments); 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 // Scroll
jQuery(jQuery.proxy(this._scroll,this)); jQuery(jQuery.proxy(this._scroll,this));
@ -3273,6 +3280,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{ {
$j(window).trigger('resize'); $j(window).trigger('resize');
this.setState({state:this.state}); this.setState({state:this.state});
egw.loading_prompt(this.appname,false);
} }
}, },

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

@ -581,7 +581,8 @@ Hide subsequent headers in week view with non-consolidated owners
#calendar-view_view tbody.ui-sortable .calendar_calGridHeader { #calendar-view_view tbody.ui-sortable .calendar_calGridHeader {
cursor: ns-resize; 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; cursor: pointer;
} }

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

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @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 classes*/
@media print { @media print {
#calendar-view.et2_container, #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 { #calendar-view_view tbody.ui-sortable .calendar_calGridHeader {
cursor: ns-resize; 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; cursor: pointer;
} }
/* contains (multiple) events's /* contains (multiple) events's