External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix UX Hit List items related to Activity Stream

Browse Source
This commit is contained in:
Marliana Lara
2017-07-25 17:29:30 -04:00
parent e904d47122
commit bd45b47445
4 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/activity-stream/factories/show-detail.factory.js
View File

@@ -1,5 +1,5 @@
export default export default
function ShowDetail($filter, Find) { function ShowDetail($filter, Find, ParseTypeChange, ParseVariableString) {
return function (params, scope) { return function (params, scope) {
var activity_id = params.activity_id, var activity_id = params.activity_id,
@@ -20,6 +20,13 @@ export default
scope.operation = activity.description; scope.operation = activity.description;
scope.header = "Event " + activity.id; scope.header = "Event " + activity.id;
scope.variables = ParseVariableString(scope.changes);
scope.parseType = 'json';
ParseTypeChange({ scope: scope,
field_id: 'activity-stream-changes',
readOnly: true });
scope.parseTypeChange('parseType', 'variables');
// Open the modal // Open the modal
$('#stream-detail-modal').modal({ $('#stream-detail-modal').modal({
show: true, show: true,
@@ -35,4 +42,4 @@ export default
}; };
} }
ShowDetail.$inject = ['$filter', 'Find']; ShowDetail.$inject = ['$filter', 'Find', 'ParseTypeChange', 'ParseVariableString'];

1
awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
View File

@@ -9,6 +9,7 @@
.StreamDetail-rowTitle { .StreamDetail-rowTitle {
color: @default-interface-txt; color: @default-interface-txt;
font-size: 12px;
} }
.StreamDetail-inlineRowTitle { .StreamDetail-inlineRowTitle {

61
awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
View File

@@ -1,29 +1,36 @@
<div id="stream-detail-modal" class="modal fade"> <div id="stream-detail-modal" class="modal fade">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="Modal-content modal-content"> <div class="Modal-content modal-content">
<div class="Modal-header"> <div class="Modal-header">
<div class="Modal-title" id="detail-header" ng-bind-html="header"></div> <div class="Modal-title" id="detail-header" ng-bind-html="header"></div>
<div class="Modal-exitHolder"> <div class="Modal-exitHolder">
<button class="close Modal-exit" data-target="#stream-detail-modal" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times-circle"></i></button> <button class="close Modal-exit" data-target="#stream-detail-modal" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times-circle"></i></button>
</div> </div>
</div> </div>
<div class="Modal-body" id="detail-body"> <div class="Modal-body" id="detail-body">
<div ng-show="user" class="StreamDetail-inlineRow"> <div ng-show="user" class="StreamDetail-inlineRow">
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>INITIATED BY</div> <div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>INITIATED BY</div>
<div class="StreamDetail-inlineRowData" ng-bind="user"></div> <div class="StreamDetail-inlineRowData" ng-bind="user"></div>
</div> </div>
<div ng-show="operation" class="StreamDetail-inlineRow"> <div ng-show="operation" class="StreamDetail-inlineRow">
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>ACTION</div> <div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle" translate>ACTION</div>
<div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="operation"></div> <div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind-html="operation"></div>
</div> </div>
<div ng-show="changes"> <div ng-show="changes">
<div class="StreamDetail-rowTitle StreamDetail-changesRowTitle" translate>CHANGES</div> <div class="StreamDetail-rowTitle StreamDetail-changesRowTitle" translate>CHANGES</div>
<pre class="StreamDetail-changes">{{ changes | json : spacing}}</pre> <textarea
</div> rows="6"
</div> ng-model="changes"
<div class="Modal-footer"> name="changes"
<a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-default StreamDetail-actionButton">OK</a> class="form-control Form-textArea Form-textAreaLabel Form-formGroup--fullWidth"
</div> id="activity-stream-changes"
</div> disabled="disabled">
</div> </textarea>
</div>
</div>
<div class="Modal-footer">
<a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-default StreamDetail-actionButton">OK</a>
</div>
</div>
</div>
</div> </div>

1
awx/ui/client/src/activity-stream/streams.list.js
View File

@@ -18,7 +18,6 @@ export default ['i18n', function(i18n) {
selectInstructions: '', selectInstructions: '',
index: false, index: false,
hover: true, hover: true,
"class": "table-condensed",
toolbarAuxAction: "<stream-dropdown-nav></stream-dropdown-nav>", toolbarAuxAction: "<stream-dropdown-nav></stream-dropdown-nav>",
fields: { fields: {