From 6618cc877c4f9e9769d5fee40c62cba3cd8b1efc Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 13 May 2014 12:04:50 -0400 Subject: [PATCH] AC-1259 inventory delete/promote. Promoted inventory group delete dialog style. Added matching styling to host delete dialog. --- awx/ui/static/js/helpers/Hosts.js | 6 +++--- awx/ui/static/less/ansible-ui.less | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js index 5a0ec2da5d..0dbd880c78 100644 --- a/awx/ui/static/js/helpers/Hosts.js +++ b/awx/ui/static/js/helpers/Hosts.js @@ -773,9 +773,9 @@ function($rootScope, $location, $log, $routeParams, Rest, Alert, Prompt, Process } }; - body = (group) ? '

Are you sure you want to remove host ' + host_name + ' from group ' + group.name + '?' + - ' It will still be part of the inventory and available in All Hosts.

' : - '

Are you sure you want to permanently delete host ' + host_name + ' from the inventory?

'; + body = (group) ? '

Are you sure you want to remove host ' + host_name + ' from group ' + group.name + '?' + + ' It will still be part of the inventory and available in All Hosts.

' : + '

Are you sure you want to permanently delete host ' + host_name + ' from the inventory?

'; Prompt({ hdr: 'Delete Host', body: body, action: action_to_take, 'class': 'btn-danger' }); }; diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index 302dc72def..c9bf5b8cf4 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -1377,6 +1377,18 @@ input[type="checkbox"].checkbox-no-label { text-overflow: clip;*/ } + #group-delete-dialog .help-container { + .help-link, + .help-link:active, + .help-link:visited { + color: @blue-link; + } + + .help-link:hover { + color: @blue-dark; + } + } + // Inventory edit dialog, source form, ec2 #source_form.squeeze .form-group { margin-bottom: 10px;