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

AC-232 final tweaks

Browse Source
This commit is contained in:
chouseknecht 2013-07-22 11:04:04 -04:00
parent 0c0ab177ce
commit a1fdb95b0b
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/static/css/ansible-ui.css
View File

@ -614,10 +614,6 @@
}
.modal-input-xxlarge {
width: 460px;
}
.modal-input-xxxlarge {
width: 98%;
}
@ -629,13 +625,15 @@
margin-top: 0;
}
.modal-backdrop,
.modal-backdrop.fade.in {
opacity: 0.6;
filter: alpha(opacity=60);
}
.modal-body .ui-accordion .ui-accordion-content {
padding: 10px;
}
/* overrides to TB modal */

2
awx/ui/static/js/forms/JobEventData.js
View File

@ -21,7 +21,7 @@ angular.module('JobEventDataDefinition', [])
type: 'textarea',
readonly: true,
rows: 18,
'class': 'modal-input-xxxlarge nowrap'
'class': 'modal-input-xxlarge'
}
}

3
awx/ui/static/js/helpers/Events.js
View File

@ -181,6 +181,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
case 'results':
case 'module_name':
case 'module_args':
case 'rc':
delete form.fields[fld];
break;
}
@ -201,6 +202,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
case 'stdout':
case 'stderr':
case 'msg':
case 'rc':
if (data['event_data'] && data['event_data']['res'] && data['event_data']['res'][fld] == undefined) {
delete form.fields[fld];
}
@ -273,6 +275,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
var scope = generator.inject(JobEventDataForm, { mode: 'edit', modal: true, related: false,
modal_selector: '#form-modal2', modal_body_id: 'form-modal2-body' });
generator.reset();
scope.formModalInfo = 'View JSON';
scope.formModal2Action = function() {
$('#form-modal2').modal("hide");
}

6
awx/ui/templates/ui/index.html
View File

@ -188,8 +188,8 @@
</div>
<div class="modal-body" id="form-modal-body"></div>
<div class="modal-footer">
<a href="" ng-bind="formModalInfo" ng-show="formModalInfo !== undefined && formModalInfo != ''" ng-click="formModalInfoAction()"
class="btn btn-small pull-left"></a>
<a href="" ng-show="formModalInfo !== undefined && formModalInfo != ''" ng-click="formModalInfoAction()"
class="btn btn-small pull-left"><i class="icon-zoom-in"></i> <span ng-bind="formModalInfo"></span></a>
<a href="#" ng-show="formModalCancelShow" data-target="#form-modal" data-dismiss="modal" class="btn btn">Cancel</a>
<a href="" ng-bind="formModalActionLabel" ng-click="formModalAction()" class="btn btn-primary"></a>
</div>
@ -204,7 +204,7 @@
<div class="modal-body" id="form-modal2-body"></div>
<div class="modal-footer">
<a href="" ng-bind="formModal2Info" ng-show="formModal2Info !== undefined && formModal2Info != ''" ng-click="formModal2InfoAction()"
class="btn btn-small pull-left"></a>
class="btn btn-small pull-left"><i class="icon-zoom-in"></i> <span ng-bind="formModal2Info"></span></a>
<a href="#" ng-show="formModal2CancelShow" data-target="#form-modal2" data-dismiss="modal" class="btn btn">Cancel</a>
<a href="" ng-bind="formModal2ActionLabel" ng-click="formModal2Action()" class="btn btn-primary"></a>
</div>