Skip to content

Commit

Permalink
fix(web(js)): position notifications to the bottom right
Browse files Browse the repository at this point in the history 
Fixes #5127
Fixes #5423
  • Loading branch information
@cgx
cgx committed Dec 3, 2021
1 parent f9ed639 commit e064e9a
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 36 deletions.
3 changes: 2 additions & 1 deletion UI/WebServerResources/js/Common/Common.app.js
View file
Expand Up @@ -128,7 +128,8 @@
'lg' : '(min-width: 1024px) and (max-width: 1279px)',
'gt-lg' : '(min-width: 1280px)' ,
'xl' : '(min-width: 1920px)' ,
'print' : 'print'
'print' : 'print',
toastPosition: 'bottom right'
})

.config(configure)
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/js/Common/navController.js
View file
Expand Up @@ -125,7 +125,7 @@
'</md-toast>'
].join(''),
hideDelay: 5000,
position: 'top right'
position: sgConstant.toastPosition
});
else
$log.debug('untrap error');
Expand Down
8 changes: 4 additions & 4 deletions UI/WebServerResources/js/Contacts/AddressBookController.js
View file
Expand Up @@ -6,8 +6,8 @@
/**
* @ngInject
*/
AddressBookController.$inject = ['$scope', '$q', '$window', '$state', '$timeout', '$mdDialog', '$mdToast', 'Account', 'Card', 'AddressBook', 'sgFocus', 'Dialog', 'sgSettings', 'sgHotkeys', 'stateAddressbooks', 'stateAddressbook'];
function AddressBookController($scope, $q, $window, $state, $timeout, $mdDialog, $mdToast, Account, Card, AddressBook, focus, Dialog, Settings, sgHotkeys, stateAddressbooks, stateAddressbook) {
AddressBookController.$inject = ['$scope', '$q', '$window', '$state', '$timeout', '$mdDialog', '$mdToast', 'Account', 'Card', 'AddressBook', 'sgFocus', 'Dialog', 'sgConstant', 'sgHotkeys', 'stateAddressbooks', 'stateAddressbook'];
function AddressBookController($scope, $q, $window, $state, $timeout, $mdDialog, $mdToast, Account, Card, AddressBook, focus, Dialog, sgConstant, sgHotkeys, stateAddressbooks, stateAddressbook) {
var vm = this, hotkeys = [], sortLabels;

sortLabels = {
Expand Down Expand Up @@ -261,7 +261,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l("Lists can't be moved or copied."))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(2000));

if (cards.length) {
Expand All @@ -284,7 +284,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(success)
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(2000));
});
}
Expand Down
12 changes: 6 additions & 6 deletions UI/WebServerResources/js/Contacts/AddressBooksController.js
View file
Expand Up @@ -188,7 +188,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(msg)
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));
},
onErrorItem: function(item, response, status, headers) {
Expand All @@ -201,7 +201,7 @@
' </div>',
'</md-toast>'
].join(''),
position: 'top right',
position: Settings.toastPosition,
hideDelay: 3000
});
}
Expand All @@ -225,7 +225,7 @@
' </div>',
'</md-toast>'
].join(''),
position: 'top right',
position: Settings.toastPosition,
hideDelay: 3000
});

Expand Down Expand Up @@ -336,7 +336,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('Successfully subscribed to address book'))
.position('top right')
.position(Settings.toastPosition)
.hideDelay(3000));
});
};
Expand Down Expand Up @@ -364,7 +364,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l("Lists can't be moved or copied."))
.position('top right')
.position(Settings.toastPosition)
.hideDelay(2000));

if (cards.length) {
Expand All @@ -387,7 +387,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(success)
.position('top right')
.position(Settings.toastPosition)
.hideDelay(2000));
});
}
Expand Down
8 changes: 4 additions & 4 deletions UI/WebServerResources/js/Mailer/MailboxController.js
View file
Expand Up @@ -6,8 +6,8 @@
/**
* @ngInject
*/
MailboxController.$inject = ['$window', '$scope', '$timeout', '$q', '$state', '$mdDialog', '$mdToast', 'stateAccounts', 'stateAccount', 'stateMailbox', 'sgHotkeys', 'encodeUriFilter', 'sgSettings', 'sgFocus', 'Dialog', 'Preferences', 'Account', 'Mailbox'];
function MailboxController($window, $scope, $timeout, $q, $state, $mdDialog, $mdToast, stateAccounts, stateAccount, stateMailbox, sgHotkeys, encodeUriFilter, sgSettings, focus, Dialog, Preferences, Account, Mailbox) {
MailboxController.$inject = ['$window', '$scope', '$timeout', '$q', '$state', '$mdDialog', '$mdToast', 'stateAccounts', 'stateAccount', 'stateMailbox', 'sgHotkeys', 'encodeUriFilter', 'sgConstant', 'sgSettings', 'sgFocus', 'Dialog', 'Preferences', 'Account', 'Mailbox'];
function MailboxController($window, $scope, $timeout, $q, $state, $mdDialog, $mdToast, stateAccounts, stateAccount, stateMailbox, sgHotkeys, encodeUriFilter, sgConstant, sgSettings, focus, Dialog, Preferences, Account, Mailbox) {
var vm = this,
defaultWindowTitle = angular.element($window.document).find('title').attr('sg-default') || "SOGo",
hotkeys = [],
Expand Down Expand Up @@ -490,7 +490,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('%{0} message(s) copied', vm.selectedFolder.selectedCount()))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(2000));
});
};
Expand All @@ -504,7 +504,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('%{0} message(s) moved', count))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(2000));
if (Mailbox.$virtualMode) {
// When performing an advanced search, we refresh the view if the selected message
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/js/Mailer/MailboxesController.js
View file
Expand Up @@ -299,7 +299,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(success)
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(2000));
});
};
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/js/Mailer/MessageController.js
View file
Expand Up @@ -286,7 +286,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('Successfully created card'))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(2000));
});
});
Expand Down
10 changes: 5 additions & 5 deletions UI/WebServerResources/js/Mailer/MessageEditorController.js
View file
Expand Up @@ -6,8 +6,8 @@
/**
* @ngInject
*/
MessageEditorController.$inject = ['$scope', '$window', '$stateParams', '$mdConstant', '$mdUtil', '$mdDialog', '$mdToast', 'FileUploader', 'stateParent', 'stateAccount', 'stateMessage', 'onCompletePromise', 'encodeUriFilter', '$timeout', 'sgFocus', 'Dialog', 'AddressBook', 'Card', 'Preferences'];
function MessageEditorController($scope, $window, $stateParams, $mdConstant, $mdUtil, $mdDialog, $mdToast, FileUploader, stateParent, stateAccount, stateMessage, onCompletePromise, encodeUriFilter, $timeout, focus, Dialog, AddressBook, Card, Preferences) {
MessageEditorController.$inject = ['$scope', '$window', '$stateParams', '$mdConstant', '$mdUtil', '$mdDialog', '$mdToast', 'FileUploader', 'stateParent', 'stateAccount', 'stateMessage', 'onCompletePromise', 'encodeUriFilter', '$timeout', 'sgConstant', 'sgFocus', 'Dialog', 'AddressBook', 'Card', 'Preferences'];
function MessageEditorController($scope, $window, $stateParams, $mdConstant, $mdUtil, $mdDialog, $mdToast, FileUploader, stateParent, stateAccount, stateMessage, onCompletePromise, encodeUriFilter, $timeout, sgConstant, focus, Dialog, AddressBook, Card, Preferences) {
var vm = this;

this.$onInit = function() {
Expand Down Expand Up @@ -150,7 +150,7 @@
$mdToast.simple()
.textContent(l('Error while uploading the file \"%{0}\":', item.file.name) +
' ' + (response.message? l(response.message) : ''))
.position('top right')
.position(sgConstant.toastPosition)
.action(l('OK'))
.hideDelay(false));
this.removeFromQueue(item);
Expand Down Expand Up @@ -227,7 +227,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('Your email has been saved'))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));
}
});
Expand Down Expand Up @@ -259,7 +259,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('Your email has been sent'))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));

// Let the user see the succesfull message before closing the dialog
Expand Down
4 changes: 2 additions & 2 deletions UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js
View file
Expand Up @@ -255,7 +255,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('Folder compacted'))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));
});
};
Expand All @@ -273,7 +273,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(successMsg)
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));
});
};
Expand Down
9 changes: 5 additions & 4 deletions UI/WebServerResources/js/Preferences/Preferences.service.js
View file
Expand Up @@ -251,7 +251,7 @@
* @desc The factory we'll use to register with Angular
* @returns the Preferences constructor
*/
Preferences.$factory = ['$window', '$document', '$rootScope', '$q', '$timeout', '$log', '$state', '$mdDateLocale', '$mdToast', 'sgSettings', 'Gravatar', 'Resource', 'User', function($window, $document, $rootScope, $q, $timeout, $log, $state, $mdDateLocaleProvider, $mdToast, Settings, Gravatar, Resource, User) {
Preferences.$factory = ['$window', '$document', '$rootScope', '$q', '$timeout', '$log', '$state', '$mdDateLocale', '$mdToast', 'sgConstant', 'sgSettings', 'Gravatar', 'Resource', 'User', function($window, $document, $rootScope, $q, $timeout, $log, $state, $mdDateLocaleProvider, $mdToast, sgConstant, Settings, Gravatar, Resource, User) {
angular.extend(Preferences, {
$window: $window,
$document: $document,
Expand All @@ -265,7 +265,8 @@
$gravatar: Gravatar,
$$resource: new Resource(Settings.activeUser('folderURL'), Settings.activeUser()),
$resourcesURL: Settings.resourcesURL(),
$User: User
$User: User,
$sgConstant: sgConstant
});

return new Preferences(); // return unique instance
Expand Down Expand Up @@ -511,7 +512,7 @@
' </div>',
'</md-toast>'
].join(''),
position: 'top right',
position: Preferences.$sgConstant.toastPosition,
hideDelay: 5000,
controller: toastController,
viewInboxMessage: _this.viewInboxMessage
Expand Down Expand Up @@ -612,7 +613,7 @@
}
_this.currentToast = _this.currentToast.then(function () {
return Preferences.$toast.show({
position: 'top right',
position: Preferences.$sgConstant.toastPosition,
hideDelay: 0,
template: [
'<md-toast>',
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/js/Scheduler/CalendarsController.js
View file
Expand Up @@ -163,7 +163,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(l('Successfully subscribed to calendar'))
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));
});
};
Expand Down
6 changes: 3 additions & 3 deletions UI/WebServerResources/js/Scheduler/ComponentController.js
View file
Expand Up @@ -6,8 +6,8 @@
/**
* @ngInject
*/
ComponentController.$inject = ['$rootScope', '$scope', '$q', '$mdDialog', 'Preferences', 'Calendar', 'Component', 'AddressBook', 'Account', 'stateComponent'];
function ComponentController($rootScope, $scope, $q, $mdDialog, Preferences, Calendar, Component, AddressBook, Account, stateComponent) {
ComponentController.$inject = ['$rootScope', '$scope', '$q', '$mdDialog', 'sgConstant', 'Preferences', 'Calendar', 'Component', 'AddressBook', 'Account', 'stateComponent'];
function ComponentController($rootScope, $scope, $q, $mdDialog, sgConstant, Preferences, Calendar, Component, AddressBook, Account, stateComponent) {
var vm = this, component;

this.$onInit = function () {
Expand Down Expand Up @@ -424,7 +424,7 @@
'</md-toast>'
].join(''),
hideDelay: 5000,
position: 'top right'
position: sgConstant.toastPosition
});
}).finally(function () {
$timeout(scrollToStart);
Expand Down
6 changes: 3 additions & 3 deletions UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
View file
Expand Up @@ -340,7 +340,7 @@
$mdToast.show(
$mdToast.simple()
.textContent(msg)
.position('top right')
.position(sgConstant.toastPosition)
.hideDelay(3000));
},
onErrorItem: function(item, response, status, headers) {
Expand All @@ -353,7 +353,7 @@
' </div>',
'</md-toast>'
].join(''),
position: 'top right',
position: sgConstant.toastPosition,
hideDelay: 3000
});
}
Expand All @@ -377,7 +377,7 @@
' </div>',
'</md-toast>'
].join(''),
position: 'top right',
position: sgConstant.toastPosition,
hideDelay: 3000
});

Expand Down

0 comments on commit e064e9a

Please sign in to comment.