parent
5591b9d423
commit
e0108088ee
1
NEWS
1
NEWS
|
@ -6,6 +6,7 @@ New features
|
||||||
|
|
||||||
Enhancements
|
Enhancements
|
||||||
- [web] prevent using localhost on additional IMAP accounts
|
- [web] prevent using localhost on additional IMAP accounts
|
||||||
|
- [web] renamed buttons of alarm toast (#3945)
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- [web] fixed confusion between owner and active user in ACLs management of Administration module
|
- [web] fixed confusion between owner and active user in ACLs management of Administration module
|
||||||
|
|
|
@ -69,14 +69,6 @@
|
||||||
"delegate is organizer" = "The delegate is the organizer. Please specify a different delegate.";
|
"delegate is organizer" = "The delegate is the organizer. Please specify a different delegate.";
|
||||||
"delegate is a participant" = "The delegate is already a participant.";
|
"delegate is a participant" = "The delegate is already a participant.";
|
||||||
"delegate is a group" = "The specified address corresponds to a group. You can only delegate to a unique person.";
|
"delegate is a group" = "The specified address corresponds to a group. You can only delegate to a unique person.";
|
||||||
"Snooze for " = "Snooze for ";
|
|
||||||
"5 minutes" = "5 minutes";
|
|
||||||
"10 minutes" = "10 minutes";
|
|
||||||
"15 minutes" = "15 minutes";
|
|
||||||
"30 minutes" = "30 minutes";
|
|
||||||
"45 minutes" = "45 minutes";
|
|
||||||
"1 hour" = "1 hour";
|
|
||||||
"1 day" = "1 day";
|
|
||||||
|
|
||||||
/* common buttons */
|
/* common buttons */
|
||||||
"OK" = "OK";
|
"OK" = "OK";
|
||||||
|
@ -89,6 +81,15 @@
|
||||||
"Start" = "Start";
|
"Start" = "Start";
|
||||||
"Due Date" = "Due Date";
|
"Due Date" = "Due Date";
|
||||||
"Location" = "Location";
|
"Location" = "Location";
|
||||||
|
"Snooze" = "Snooze";
|
||||||
|
"Snooze for " = "Snooze for ";
|
||||||
|
"5 minutes" = "5 minutes";
|
||||||
|
"10 minutes" = "10 minutes";
|
||||||
|
"15 minutes" = "15 minutes";
|
||||||
|
"30 minutes" = "30 minutes";
|
||||||
|
"45 minutes" = "45 minutes";
|
||||||
|
"1 hour" = "1 hour";
|
||||||
|
"1 day" = "1 day";
|
||||||
|
|
||||||
/* mail labels */
|
/* mail labels */
|
||||||
"Important" = "Important";
|
"Important" = "Important";
|
||||||
|
|
|
@ -94,11 +94,11 @@
|
||||||
' </md-option>',
|
' </md-option>',
|
||||||
' </md-select>',
|
' </md-select>',
|
||||||
' </md-input-container>',
|
' </md-input-container>',
|
||||||
' <md-button ng-click="cancel()">',
|
' <md-button ng-click="snooze()">',
|
||||||
l('Cancel'),
|
l('Snooze'),
|
||||||
' </md-button>',
|
' </md-button>',
|
||||||
' <md-button ng-click="ok()">',
|
' <md-button ng-click="close()">',
|
||||||
l('Ok'),
|
l('Close'),
|
||||||
' </md-button>',
|
' </md-button>',
|
||||||
' </div>',
|
' </div>',
|
||||||
' </div>',
|
' </div>',
|
||||||
|
@ -118,10 +118,10 @@
|
||||||
function AlarmController(scope, $mdToast, url) {
|
function AlarmController(scope, $mdToast, url) {
|
||||||
scope.summary = data.summary;
|
scope.summary = data.summary;
|
||||||
scope.reminder = '10';
|
scope.reminder = '10';
|
||||||
scope.cancel = function() {
|
scope.close = function() {
|
||||||
$mdToast.hide();
|
$mdToast.hide();
|
||||||
};
|
};
|
||||||
scope.ok = function() {
|
scope.snooze = function() {
|
||||||
_this.$$resource.fetch(url, 'view?snoozeAlarm=' + scope.reminder);
|
_this.$$resource.fetch(url, 'view?snoozeAlarm=' + scope.reminder);
|
||||||
$mdToast.hide();
|
$mdToast.hide();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue