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

Approval drawer cleanup and workflow node form UX cleanup

Browse Source
This commit is contained in:
mabashian
2019-07-15 15:39:06 -04:00
committed by Ryan Petrello
parent 1d814beca1
commit e0cdc4ff80
8 changed files with 166 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
awx/ui/client/lib/components/approvalsDrawer/approvalsDrawer.partial.html
View File

@@ -1,79 +1,79 @@
<div style="width: 100%;height: 100%;position: fixed;top: 0;right: 0;opacity: 0.5;background-color: black;z-index: 10000;"></div>
<div class="at-ApprovalsDrawer" ng-if="vm.listLoaded">
<div class="at-ApprovalsDrawer-header">
<div class="at-ApprovalsDrawer-title">
<span>
NOTIFICATIONS
</span>
<span class="at-Panel-headingTitleBadge">
{{vm.count}}
</span>
</div>
<div class="at-ApprovalsDrawer-exit">
<button class="close" ng-click="closeApprovals()">
<i class="fa fa-times-circle"></i>
</button>
</div>
</div>
<at-list-toolbar
ng-if="vm.approvals.length > 0"
sort-only="true"
sort-value="vm.toolbarSortValue"
sort-options="vm.toolbarSortOptions"
on-sort="vm.onToolbarSort">
</at-list-toolbar>
<at-list results="vm.approvals" id="approvals_list" empty-list-reason="{{ vm.emptyListReason }}">
<at-row ng-repeat="approval in vm.approvals"
id="approval-row-{{ approval.id }}">
<div class="at-Row-items">
<div class="at-Row-container">
<div class="at-Row-container">
<!-- TODO: translate header tag -->
<at-row-item
header-value="{{ approval.summary_fields.source_workflow_job.name }}"
header-state="workflowResults({id: {{approval.summary_fields.source_workflow_job.id}}})"
header-tag="Workflow Template">
</at-row-item>
</div>
</div>
<div class="at-Row-container--wrapped">
<at-row-item
value-bind-html="{{ approval.created | longDate }}">
</at-row-item>
<at-row-item
style="color: red;"
value-bind-html="Expires: Never">
</at-row-item>
<!-- <at-row-item
style="color: red;"
value-bind-html="Expires {{ approval.created | longDate }}">
</at-row-item> -->
</div>
<div class="at-Row-container--wrapped">
<div style="display: flex; justify-content: flex-end; width: 100%; margin-top: 10px;">
<div>Continue workflow job?</div>
<button class="btn at-Button--success"
style="margin-left: 15px;"
ng-click="vm.approve(approval)"
type="button">
APPROVE
</button>
<button class="btn at-Button--error"
style="margin-left: 15px;"
ng-click="vm.deny(approval)"
type="button">
DENY
</button>
</div>
</div>
<div class="at-ApprovalsDrawer">
<div class="at-ApprovalsDrawer-drawer" ng-if="vm.listLoaded">
<div class="at-ApprovalsDrawer-header">
<div class="at-ApprovalsDrawer-title">
<span>
{{:: vm.strings.get('approvals.NOTIFICATIONS') }}
</span>
<span class="at-Panel-headingTitleBadge">
{{vm.count}}
</span>
</div>
</at-row>
</at-list>
<paginate
collection="vm.approvals"
dataset="vm.dataset"
iterator="template"
base-path="unified_job_templates"
query-set="vm.queryset">
</paginate>
<div class="at-ApprovalsDrawer-exit">
<button class="close" ng-click="closeApprovals()">
<i class="fa fa-times-circle"></i>
</button>
</div>
</div>
<at-list-toolbar
ng-if="vm.approvals.length > 0"
sort-only="true"
sort-value="vm.toolbarSortValue"
sort-options="vm.toolbarSortOptions"
on-sort="vm.onToolbarSort">
</at-list-toolbar>
<at-list results="vm.approvals" id="approvals_list" empty-list-reason="{{ vm.emptyListReason }}">
<at-row ng-repeat="approval in vm.approvals"
id="approval-row-{{ approval.id }}">
<div class="at-Row-items">
<div class="at-Row-container">
<div class="at-Row-container">
<!-- TODO: translate header tag -->
<at-row-item
header-value="{{ approval.summary_fields.source_workflow_job.name }}"
header-state="workflowResults({id: {{approval.summary_fields.source_workflow_job.id}}})"
header-tag="{{:: vm.strings.get('approvals.WORKFLOW_TEMPLATE') }}">
</at-row-item>
</div>
</div>
<div class="at-Row-container--wrapped">
<at-row-item
value-bind-html="{{ approval.created | longDate }}">
</at-row-item>
<at-row-item
style="color: red;"
value-bind-html="Expires: Never">
</at-row-item>
<!-- <at-row-item
style="color: red;"
value-bind-html="Expires {{ approval.created | longDate }}">
</at-row-item> -->
</div>
<div class="at-Row-container--wrapped">
<div class="at-ApprovalsDrawer-actionRow">
<div>{{:: vm.strings.get('approvals.CONTINUE') }}</div>
<button class="btn at-Button--success"
ng-click="vm.approve(approval)"
type="button">
{{:: vm.strings.get('approvals.APPROVE') }}
</button>
<button class="btn at-Button--error"
ng-click="vm.deny(approval)"
type="button">
{{:: vm.strings.get('approvals.DENY') }}
</button>
</div>
</div>
</div>
</at-row>
</at-list>
<paginate
collection="vm.approvals"
dataset="vm.dataset"
iterator="template"
base-path="unified_job_templates"
query-set="vm.queryset"
hide-view-per-page="true">
</paginate>
</div>
</div>