External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 19:50:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Notification form UX Audit cleanup

Browse Source
This commit is contained in:
Jared Tabor
2016-05-06 16:59:51 -04:00
parent fd40135d9d
commit 71ea4cb465
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/legacy-styles/forms.less
View File

@@ -217,6 +217,7 @@
border-radius: 5px; border-radius: 5px;
border:1px solid @field-border; border:1px solid @field-border;
color: @field-input-text; color: @field-input-text;
width:100%
} }
.ui-spinner-input{ .ui-spinner-input{

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

@@ -81,7 +81,7 @@ export default
master.notification_type = $scope.notification_type; master.notification_type = $scope.notification_type;
CreateSelect2({ CreateSelect2({
element: '#notification_template_notification_typex', element: '#notification_template_notification_type',
multiple: false multiple: false
}); });
NotificationsTypeChange.getDetailFields($scope.notification_type.value).forEach(function(field) { NotificationsTypeChange.getDetailFields($scope.notification_type.value).forEach(function(field) {

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

@@ -66,12 +66,7 @@ export default function() {
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm' subForm: 'typeSubForm'
}, },
use_tls: {
label: 'Use TLS',
type: 'checkbox',
ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm'
},
host: { host: {
label: 'Host', label: 'Host',
type: 'text', type: 'text',
@@ -119,12 +114,6 @@ export default function() {
ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ", ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
subForm: 'typeSubForm' subForm: 'typeSubForm'
}, },
use_ssl: {
labelBind: 'sslLabel',
type: 'checkbox',
ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
subForm: 'typeSubForm'
},
port: { port: {
labelBind: 'portLabel', labelBind: 'portLabel',
type: 'number', type: 'number',
@@ -325,7 +314,8 @@ export default function() {
}, },
targets: { targets: {
label: 'Destination Channels or Users', label: 'Destination Channels or Users',
type: 'text', type: 'textarea',
rows: 3,
awPopOver: '<p>Type an option on each line. The pound symbol (#) is not required.</p>'+ awPopOver: '<p>Type an option on each line. The pound symbol (#) is not required.</p>'+
'<p>For example:<br>#support or support<br>\n @username or username<br>\n', '<p>For example:<br>#support or support<br>\n @username or username<br>\n',
dataTitle: 'Destination Channels', dataTitle: 'Destination Channels',
@@ -338,6 +328,18 @@ export default function() {
ngShow: "notification_type.value == 'irc' ", ngShow: "notification_type.value == 'irc' ",
subForm: 'typeSubForm' subForm: 'typeSubForm'
}, },
use_tls: {
label: 'Use TLS',
type: 'checkbox',
ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm'
},
use_ssl: {
labelBind: 'sslLabel',
type: 'checkbox',
ngShow: "notification_type.value == 'email' || notification_type.value == 'irc' ",
subForm: 'typeSubForm'
},
}, },