mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
fix calendar-planer SiteMgr block to working with Mambo templates like (javascript free) simple_plain
This commit is contained in:
parent
1a27a7b840
commit
381b9fa1a4
@ -90,7 +90,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
|
||||
init: function()
|
||||
{
|
||||
// categories have nothing to do with calendar, but eT2 objects loads calendars app.js
|
||||
if (framework && framework.applications.calendar.browser &&
|
||||
if (window.framework && framework.applications.calendar.browser &&
|
||||
framework.applications.calendar.browser.currentLocation.match('menuaction=preferences\.preferences_categories_ui\.index'))
|
||||
{
|
||||
this._super.apply(this, arguments);
|
||||
@ -2031,7 +2031,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
|
||||
);
|
||||
|
||||
var loading = false;
|
||||
|
||||
|
||||
|
||||
var value = [];
|
||||
state.state.first = view.start_date(state.state).toJSON();
|
||||
@ -2424,7 +2424,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
|
||||
{
|
||||
view.etemplates[i].resize();
|
||||
}
|
||||
|
||||
|
||||
// If we need to fetch data from the server, it will hide the loader
|
||||
// when done but if everything is in the cache, hide from here.
|
||||
if(!loading)
|
||||
@ -2434,7 +2434,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
|
||||
egw.loading_prompt(this.appname,false);
|
||||
},this),500);
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
// old calendar state handling on server-side (incl. switching to and from listview)
|
||||
|
@ -344,14 +344,14 @@ class module_calendar_planner extends Module
|
||||
)).');'
|
||||
. '});});'
|
||||
. '</script>';
|
||||
|
||||
ob_end_clean();
|
||||
}
|
||||
else
|
||||
{
|
||||
$html .= '<div class="message" align="center">'.lang('No owner selected').'</div>';
|
||||
}
|
||||
|
||||
while(@ob_end_clean());
|
||||
|
||||
return $html;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user