External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from marshmalien/ux/fix/notifications

Browse Source 
[UX] Fix Notification radio buttons and add close button to Toaster alert
This commit is contained in:
Marliana Lara 2017-07-28 11:18:18 -04:00 committed by GitHub
commit 86fc441d68
6 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/app.js
View File

@ -151,7 +151,8 @@ var awApp = angular.module('awApp', [
.config(['ngToastProvider', function(ngToastProvider) {
ngToastProvider.configure({
animation: 'slide',
dismissOnTimeout: true,
dismissOnTimeout: false,
dismissButton: true,
timeout: 4000
});
}])

12
awx/ui/client/src/notifications/add/add.controller.js
View File

@ -134,10 +134,22 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
$scope.emailOptionsChange = function () {
if ($scope.email_options === 'use_ssl') {
if ($scope.use_ssl) {
$scope.email_options = null;
$scope.use_ssl = false;
return;
}
$scope.use_ssl = true;
$scope.use_tls = false;
}
else if ($scope.email_options === 'use_tls') {
if ($scope.use_tls) {
$scope.email_options = null;
$scope.use_tls = false;
return;
}
$scope.use_ssl = false;
$scope.use_tls = true;
}

14
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@ -205,10 +205,22 @@ export default ['Rest', 'Wait',
$scope.emailOptionsChange = function () {
if ($scope.email_options === 'use_ssl') {
if ($scope.use_ssl) {
$scope.email_options = null;
$scope.use_ssl = false;
return;
}
$scope.use_ssl = true;
$scope.use_tls = false;
}
else if ($scope.email_options === 'use_tls') {
if ($scope.use_tls) {
$scope.email_options = null;
$scope.use_tls = false;
return;
}
$scope.use_ssl = false;
$scope.use_tls = true;
}
@ -263,7 +275,7 @@ export default ['Rest', 'Wait',
Rest.setUrl(url + id + '/');
Rest.put(params)
.success(function() {
$state.go($state.current, null, { reload: true });
$state.go('notifications', {}, { reload: true });
Wait('stop');
})
.error(function(data, status) {

2
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@ -398,7 +398,7 @@ export default ['i18n', function(i18n) {
type: 'radio_group',
subForm: 'typeSubForm',
ngShow: "notification_type.value == 'email'",
ngChange: "emailOptionsChange()",
ngClick: "emailOptionsChange()",
ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)',
options: [{
value: 'use_tls',

22
awx/ui/client/src/notifications/notifications.block.less
View File

@ -25,3 +25,25 @@
.NotificationsForm-radioButtons{
display:block!important;
}
#notification_templates_table .name-column {
padding-left: 10px;
}
.notificationsList {
margin-top: 0;
}
.ng-toast {
.alert {
margin: 0;
}
.close {
position: absolute;
right: 5px;
top: 0px;
color: white;
opacity: 1;
text-shadow: none;
}
}

1
awx/ui/client/src/shared/form-generator.js
View File

@ -1287,6 +1287,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "value=\"" + field.options[i].value + "\" ";
html += "ng-model=\"" + fld + "\" ";
html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
html += (field.ngClick) ? this.attr(field, 'ngClick') : "";
html += (field.ngDisabled) ? `ng-disabled="${field.ngDisabled}"` : "";
html += (field.readonly) ? "disabled " : "";
html += (field.required) ? "required " : "";