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

Added jt details popover when adding/eding workflow node

Browse Source
This commit is contained in:
Michael Abashian 2016-12-07 16:29:27 -05:00
parent ffe6ec97ef
commit bf6ee24a0c
4 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/client/legacy-styles/lists.less
View File

@ -43,7 +43,7 @@ table, tbody {
border-top-right-radius: 5px;
}
.List-tableHeader--actions {
.List-tableHeader--info, .List-tableHeader--actions {
text-align: right;
}
@ -387,6 +387,21 @@ table, tbody {
border-left: 4px solid transparent;
}
.List-infoCell {
display: flex;
justify-content: flex-end;
font-size: 0.8em;
cursor: pointer;
}
.List-infoCell a {
color: @default-icon;
}
.List-infoCell a:hover, .List-infoCell a:focus {
color: @default-interface-txt;
}
@media (max-width: 991px) {
.List-searchWidget + .List-searchWidget {
margin-top: 20px;

3
awx/ui/client/src/partials/job-template-details.html Normal file
View File

@ -0,0 +1,3 @@
<div class="List-infoCell">
<a aw-pop-over="<div>INVENTORY: {{job_template.summary_fields.inventory.name || 'NONE SELECTED'}}</div><div>PROJECT: {{job_template.summary_fields.project.name}}</div><div>PLAYBOOK: {{job_template.playbook}}</div><div>CREDENTIAL: {{job_template.summary_fields.credential.name || 'NONE SELECTED'}}</div>" data-popover-title="{{job_template.name}}">INFO</a>
</div>

15
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -492,6 +492,21 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
column-custom-class="${customClass}">
</th>`;
if(list.fields.info) {
customClass = list.fields.name.modalColumnClass || '';
html += `<th
class="List-tableHeader--info"
base-path="${list.basePath || list.name}"
collection="${list.name}"
dataset="${list.iterator}_dataset"
column-sort
column-field="info"
column-iterator="${list.iterator}"
column-no-sort="${list.fields.info.nosort}"
column-label="${list.fields.info.label}"
column-custom-class="${customClass}">
</th>`;
}
}
if (options.mode === 'select') {
html += "<th class=\"List-tableHeader col-lg-1 col-md-1 col-sm-2 col-xs-2\">Select</th>";

9
awx/ui/client/src/templates/main.js
View File

@ -342,9 +342,16 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
delete list.fields.smart_status;
delete list.fields.labels;
delete list.fieldActions;
list.fields.name.columnClass = "col-md-11";
list.fields.name.columnClass = "col-md-8";
list.iterator = 'job_template';
list.name = 'job_templates';
list.fields.info = {
ngInclude: "'/static/partials/job-template-details.html'",
type: 'template',
columnClass: 'col-md-3',
label: '',
nosort: true
};
return list;
}