LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve alarms dialog 

Fixes #3909
pull/228/head
Francis Lachapelle 2016-11-24 19:14:02 -05:00
parent a76f8dca04
commit dc7cb6792a
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -9,6 +9,7 @@ Enhancements
Bug fixes Bug fixes
- [web] restore attributes when rewriting base64-encoded img tags (#3814) - [web] restore attributes when rewriting base64-encoded img tags (#3814)
- [web] improve alarms dialog (#3909)
- [eas] fixed EAS delete operation - [eas] fixed EAS delete operation
3.2.2 (2016-11-23) 3.2.2 (2016-11-23)

75
UI/WebServerResources/js/Common/Alarm.service.js
View File

@ -65,38 +65,43 @@
template: [ template: [
'<md-toast>', '<md-toast>',
' <div class="md-toast-content">', ' <div class="md-toast-content">',
' <md-input-container>', ' <div layout="column" layout="start end">',
' <label style="color: white;">{{ summary }}</label>', ' <p class="sg-padded--top">{{ summary }}</p>',
' <md-select ng-model="reminder">', ' <div layout="row" layout-align="start center">',
' <md-option value=5>', ' <md-input-container>',
l('5 minutes'), ' <label style="color: white">{{ "Snooze for " | loc }}</label>',
' </md-option>', ' <md-select ng-model="reminder">',
' <md-option value=10>', ' <md-option value="5">',
l('10 minutes'), l('5 minutes'),
' </md-option>', ' </md-option>',
' <md-option value=15>', ' <md-option value="10">',
l('15 minutes'), l('10 minutes'),
' </md-option>', ' </md-option>',
' <md-option value=30>', ' <md-option value="15">',
l('30 minutes'), l('15 minutes'),
' </md-option>', ' </md-option>',
' <md-option value=45>', ' <md-option value="30">',
l('45 minutes'), l('30 minutes'),
' </md-option>', ' </md-option>',
' <md-option value=60>', ' <md-option value="45">',
l('1 hour'), l('45 minutes'),
' </md-option>', ' </md-option>',
' <md-option value=1440>', ' <md-option value="60">',
l('1 day'), l('1 hour'),
' </md-option>', ' </md-option>',
' </md-select>', ' <md-option value="1440">',
' </md-input-container>', l('1 day'),
' <md-button ng-click="cancel()">', ' </md-option>',
l('Cancel'), ' </md-select>',
' </md-button>', ' </md-input-container>',
' <md-button ng-click="ok()">', ' <md-button ng-click="cancel()">',
l('Ok'), l('Cancel'),
' </md-button>', ' </md-button>',
' <md-button ng-click="ok()">',
l('Ok'),
' </md-button>',
' </div>',
' </div>',
' </div>', ' </div>',
'</md-toast>' '</md-toast>'
].join(''), ].join(''),
@ -109,9 +114,9 @@
/** /**
* @ngInject * @ngInject
*/ */
AlarmController.$inject = ['scope', '$sanitize', '$mdToast', 'url']; AlarmController.$inject = ['scope', '$mdToast', 'url'];
function AlarmController(scope, $sanitize, $mdToast, url) { function AlarmController(scope, $mdToast, url) {
scope.summary = $sanitize(data.summary); scope.summary = data.summary;
scope.reminder = '10'; scope.reminder = '10';
scope.cancel = function() { scope.cancel = function() {
$mdToast.hide(); $mdToast.hide();