diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 6c3574ac7..dba5e6d8f 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -162,6 +162,17 @@ + +
+ + + +
+
diff --git a/UI/WebServerResources/js/Common/ui-desktop.js b/UI/WebServerResources/js/Common/ui-desktop.js index a4966ee1f..2d8eb488f 100644 --- a/UI/WebServerResources/js/Common/ui-desktop.js +++ b/UI/WebServerResources/js/Common/ui-desktop.js @@ -475,7 +475,7 @@ var vm = this; vm.showDialog = function() { $mdDialog.show({ - templateUrl: 'UIxContactsUserFolders', + templateUrl: '../Contacts/UIxContactsUserFolders', clickOutsideToClose: true, locals: { folderType: vm.folderType, diff --git a/UI/WebServerResources/js/SchedulerUI.js b/UI/WebServerResources/js/SchedulerUI.js index 0f6ef27fe..9c956eb84 100644 --- a/UI/WebServerResources/js/SchedulerUI.js +++ b/UI/WebServerResources/js/SchedulerUI.js @@ -105,6 +105,15 @@ }); } }, true); // compare for object equality + /** + * subscribeToFolder - Callback of sgSubscribe directive + */ + $scope.subscribeToFolder = function(calendarData) { + console.debug('subscribeToFolder ' + calendarData.owner + calendarData.name); + Calendar.$subscribe(calendarData.owner, calendarData.name).catch(function(data) { + Dialog.alert(l('Warning'), l('An error occured please try again.')); + }); + }; }]) .controller('CalendarListController', ['$scope', '$rootScope', '$timeout', 'sgFocus', 'encodeUriFilter', 'sgDialog', 'sgSettings', 'sgCalendar', 'sgComponent', function($scope, $rootScope, $timeout, focus, encodeUriFilter, Dialog, Settings, Calendar, Component) {