External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Stacking ssl/tls radio buttons on notification templates form

Browse Source
This commit is contained in:
jaredevantabor
2017-01-20 10:01:02 -08:00
parent 5afa2ab264
commit 857780b0c3
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,18 +393,17 @@ export default ['i18n', function(i18n) {
type: 'radio_group', type: 'radio_group',
subForm: 'typeSubForm', subForm: 'typeSubForm',
ngShow: "notification_type.value == 'email'", ngShow: "notification_type.value == 'email'",
class: 'squeeze',
ngChange: "emailOptionsChange()", ngChange: "emailOptionsChange()",
options: [{ options: [{
value: 'use_tls', value: 'use_tls',
label: 'Use TLS', label: 'Use TLS',
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
labelClass: 'checkbox-options stack-inline' labelClass: 'NotificationsForm-radioButtons'
}, { }, {
value: 'use_ssl', value: 'use_ssl',
label: 'Use SSL', label: 'Use SSL',
ngShow: "notification_type.value == 'email'", ngShow: "notification_type.value == 'email'",
labelClass: 'checkbox-options stack-inline' labelClass: 'NotificationsForm-radioButtons'
}] }]
} }
}, },

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

@@ -23,3 +23,7 @@
vertical-align: middle; vertical-align: middle;
padding-right: 10px; padding-right: 10px;
} }
.NotificationsForm-radioButtons{
display:block!important;
}

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

@@ -1264,7 +1264,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += ">\n"; html += ">\n";
for (i = 0; i < field.options.length; i++) { for (i = 0; i < field.options.length; i++) {
html += "<label class=\"radio-inline\" "; html += "<label class=\"radio-inline ";
html += (field.options[i].labelClass) ? ` ${field.options[i].labelClass} "` : "\"";
html += (field.options[i].ngShow) ? this.attr(field.options[i], 'ngShow') : ""; html += (field.options[i].ngShow) ? this.attr(field.options[i], 'ngShow') : "";
html += ">"; html += ">";
html += "<input type=\"radio\" "; html += "<input type=\"radio\" ";