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

Remove panel header directive from instance modals

Browse Source
This commit is contained in:
Marliana Lara
2018-06-12 15:38:06 -04:00
parent 769e714f71
commit 625ae5d1bf
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/instance-groups/add-edit/instance-list-policy.directive.js
View File

@@ -66,6 +66,10 @@ function InstanceListPolicyController ($scope, $state, strings) {
$state.go("^.^"); $state.go("^.^");
}; };
vm.dismiss = () => {
$state.go('^.^');
};
} }
InstanceListPolicyController.$inject = [ InstanceListPolicyController.$inject = [

18
awx/ui/client/src/instance-groups/add-edit/instance-list-policy.partial.html
View File

@@ -1,8 +1,16 @@
<div id="instance-modal" class="modal-dialog"> <div id="instance-modal" class="modal-dialog">
<at-panel on-dismiss="^.^"> <div class="modal-content">
<at-panel-heading> <div class="row at-Panel-headingRow">
{{:: vm.strings.get('instance.PANEL_TITLE') }} <div class="col-xs-10">
</at-panel-heading> <h3 class="at-Panel-headingTitle">{{:: vm.strings.get('instance.PANEL_TITLE') }}</h3>
</div>
<div class="col-xs-2">
<div class="at-Panel-dismiss">
<i class="fa fa-times-circle fa-lg" ng-click="vm.dismiss()"></i>
</div>
</div>
</div>
<multi-select-preview selected-rows='vm.selectedRows' available-rows='instances'></multi-select-preview> <multi-select-preview selected-rows='vm.selectedRows' available-rows='instances'></multi-select-preview>
<at-panel-body> <at-panel-body>
<div class="at-List-toolbar"> <div class="at-List-toolbar">
@@ -49,5 +57,5 @@
</div> </div>
</div> </div>
</at-panel-body> </at-panel-body>
</at-panel> </div>
</div> </div>

6
awx/ui/client/src/instance-groups/instances/instance-modal.controller.js
View File

@@ -36,7 +36,7 @@ function InstanceModalController ($scope, $state, models, strings, ProcessErrors
$scope.$watch('vm.instances', function() { $scope.$watch('vm.instances', function() {
vm.selectedRows = _.filter(vm.instances, 'isSelected'); vm.selectedRows = _.filter(vm.instances, 'isSelected');
vm.deselectedRows = _.filter(vm.instances, 'isSelected', false); vm.deselectedRows = _.filter(vm.instances, 'isSelected', false);
}, true); }, true);
vm.submit = () => { vm.submit = () => {
Wait('start'); Wait('start');
@@ -70,6 +70,10 @@ function InstanceModalController ($scope, $state, models, strings, ProcessErrors
vm.onSaveSuccess = () => { vm.onSaveSuccess = () => {
$state.go('instanceGroups.instances', {}, {reload: 'instanceGroups.instances'}); $state.go('instanceGroups.instances', {}, {reload: 'instanceGroups.instances'});
}; };
vm.dismiss = () => {
$state.go('instanceGroups.instances');
};
} }
InstanceModalController.$inject = [ InstanceModalController.$inject = [

18
awx/ui/client/src/instance-groups/instances/instance-modal.partial.html
View File

@@ -1,8 +1,16 @@
<div id="instance-modal" class="modal-dialog"> <div id="instance-modal" class="modal-dialog">
<at-panel on-dismiss="instanceGroups.instances"> <div class="modal-content">
<at-panel-heading> <div class="row at-Panel-headingRow">
{{ vm.panelTitle }} | {{ vm.instanceGroupName}} <div class="col-xs-10">
</at-panel-heading> <h3 class="at-Panel-headingTitle">{{ vm.panelTitle }} | {{ vm.instanceGroupName}}</h3>
</div>
<div class="col-xs-2">
<div class="at-Panel-dismiss">
<i class="fa fa-times-circle fa-lg" ng-click="vm.dismiss()"></i>
</div>
</div>
</div>
<multi-select-preview selected-rows='vm.selectedRows' available-rows='vm.instances'></multi-select-preview> <multi-select-preview selected-rows='vm.selectedRows' available-rows='vm.instances'></multi-select-preview>
<at-panel-body> <at-panel-body>
<div class="at-List-toolbar"> <div class="at-List-toolbar">
@@ -51,5 +59,5 @@
</div> </div>
</div> </div>
</at-panel-body> </at-panel-body>
</at-panel> </div>
</div> </div>