extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix calendar-planer SiteMgr block to working with Mambo templates like (javascript free) simple_plain

Browse Source
This commit is contained in:
Ralf Becker 2016-06-25 12:28:52 +02:00
parent 1a27a7b840
commit 381b9fa1a4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -90,7 +90,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
init: function() init: function()
{ {
// categories have nothing to do with calendar, but eT2 objects loads calendars app.js // 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')) framework.applications.calendar.browser.currentLocation.match('menuaction=preferences\.preferences_categories_ui\.index'))
{ {
this._super.apply(this, arguments); this._super.apply(this, arguments);
@ -2031,7 +2031,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
); );
var loading = false; var loading = false;
var value = []; var value = [];
state.state.first = view.start_date(state.state).toJSON(); 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(); view.etemplates[i].resize();
} }
// If we need to fetch data from the server, it will hide the loader // 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. // when done but if everything is in the cache, hide from here.
if(!loading) if(!loading)
@ -2434,7 +2434,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
egw.loading_prompt(this.appname,false); egw.loading_prompt(this.appname,false);
},this),500); },this),500);
} }
return; return;
} }
// old calendar state handling on server-side (incl. switching to and from listview) // old calendar state handling on server-side (incl. switching to and from listview)

4
calendar/sitemgr/class.module_calendar_planner.inc.php
View File

@ -344,14 +344,14 @@ class module_calendar_planner extends Module
)).');' )).');'
. '});});' . '});});'
. '</script>'; . '</script>';
ob_end_clean();
} }
else else
{ {
$html .= '<div class="message" align="center">'.lang('No owner selected').'</div>'; $html .= '<div class="message" align="center">'.lang('No owner selected').'</div>';
} }
while(@ob_end_clean());
return $html; return $html;
} }
} }