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

AC-232 put the RC back in the output/results section. Changed label on output/results to Results. Added nowrap class to allow horizontal scrolling in textareas

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

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

@ -24,6 +24,10 @@
border-color: #e3e3e3;
}
.nowrap {
white-space: nowrap;
}
/* Attempt to make button heights consistent. For some reason success, info, etc. are
taller than plain .btn */

6
awx/ui/static/js/controllers/JobEvents.js
View File

@ -44,7 +44,7 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
rows = (rows > 10) ? 10 : rows;
found = true;
html += "<label>Traceback:</label>\n";
html += "<textarea readonly class=\"input-xxlarge\" rows=\"" + rows + "\">" + eventData.res + "</textarea>\n";
html += "<textarea readonly class=\"input-xxlarge nowrap\" rows=\"" + rows + "\">" + eventData.res + "</textarea>\n";
}
else {
for (var fld in eventData.res) {
@ -64,7 +64,7 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
n = eventData['res'][fld].match(/\n/g);
rows = (n) ? n.length : 1;
rows = (rows > 10) ? 10 : rows;
html += "<textarea readonly class=\"input-xxlarge\" rows=\"" + rows + "\">" + eventData.res[fld] + "</textarea>\n";
html += "<textarea readonly class=\"input-xxlarge nowrap\" rows=\"" + rows + "\">" + eventData.res[fld] + "</textarea>\n";
found = true;
}
if ( fld == "results" && Array.isArray(eventData.res[fld]) && eventData.res[fld].length > 0 ) {
@ -78,7 +78,7 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
rows = (rows > 10) ? 10 : rows;
if (txt !== '') {
html += "<label>Results:</label>\n";
html += "<textarea readonly class=\"input-xxlarge\" rows=\"" + rows + "\">" + txt + "</textarea>\n";
html += "<textarea readonly class=\"input-xxlarge nowrap\" rows=\"" + rows + "\">" + txt + "</textarea>\n";
found = true;
}
}

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'
'class': 'modal-input-xxxlarge nowrap'
}
}

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

@ -71,7 +71,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
label: 'Return Code',
type: 'text',
readonly: true,
section: 'Event',
section: 'Results',
'class': 'span1',
ngShow: "rc !== ''"
},
@ -79,8 +79,8 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
label: false,
type: 'textarea',
readonly: true,
section: 'Output',
'class': 'modal-input-xxlarge',
section: 'Results',
'class': 'modal-input-xxlarge nowrap',
ngShow: "msg !== ''",
rows: 10
},
@ -88,8 +88,8 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
label: false,
type: 'textarea',
readonly: true,
section: 'Output',
'class': 'modal-input-xxlarge',
section: 'Results',
'class': 'modal-input-xxlarge nowrap',
ngShow: "stdout !== ''",
rows: 10
},
@ -97,8 +97,8 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
label: false,
type: 'textarea',
readonly: true,
section: 'Output',
'class': 'modal-input-xxlarge',
section: 'Results',
'class': 'modal-input-xxlarge nowrap',
ngShow: "stderr !== ''",
rows: 10
},
@ -106,7 +106,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
label: false,
type: 'textarea',
readonly: true,
'class': 'modal-input-xxlarge',
'class': 'modal-input-xxlarge nowrap',
ngShow: "results !== ''",
rows: 10
},
@ -122,7 +122,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
type: 'textarea',
readonly: true,
section: 'Traceback',
'class': 'modal-input-xxlarge',
'class': 'modal-input-xxlarge nowrap',
ngShow: "traceback !== ''",
rows: 10
},