External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

More styling on the tooltip for smart status

Browse Source
This commit is contained in:
Jared Tabor
2015-03-10 10:57:35 -04:00
parent ec39c5c864
commit 23254beb6c
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/smart-status/smart-status.controller.js
View File

@@ -1,6 +1,6 @@
export default ['$scope', function ($scope) { export default ['$scope', function ($scope) {
var str = $scope.job_template.id+'_spark', var str = $scope.job_template.id+'_smart',
recentJobs = $scope.job_template.summary_fields.recent_jobs; recentJobs = $scope.job_template.summary_fields.recent_jobs;
$scope[str] = { $scope[str] = {
id: $scope.job_template.id, id: $scope.job_template.id,

19
awx/ui/static/js/smart-status/smart-status.directive.js
View File

@@ -3,7 +3,8 @@ export default [ function() {
return { return {
restrict: 'E', restrict: 'E',
link: function (scope){ link: function (scope){
var str = scope.job_template.id+'_spark'; var str = scope.job_template.id+'_smart';
scope[str].formatter = function(sparklines, options, point){ scope[str].formatter = function(sparklines, options, point){
var status; var status;
if(point.value === 1){ if(point.value === 1){
@@ -12,9 +13,9 @@ export default [ function() {
else if(point.value === -1){ else if(point.value === -1){
status = "Failed"; status = "Failed";
} }
// else if(isNaN(point.value)){ else if(isNaN(point.value)){
// status = "Running"; status = "Running";
// } }
return "<div class=\"smart-status-tooltip\">Job ID: " + return "<div class=\"smart-status-tooltip\">Job ID: " +
options.userOptions.tooltipValueLookups.jobs[point.offset] + options.userOptions.tooltipValueLookups.jobs[point.offset] +
"<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status+"</div>" ; "<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status+"</div>" ;
@@ -27,18 +28,12 @@ export default [ function() {
barWidth: 7, barWidth: 7,
barSpacing: 2, barSpacing: 2,
zeroBarColor: 'grey', zeroBarColor: 'grey',
posBarColor: '#00aa00', //@green on ansible-ui posBarColor: '#00aa00',
negBarColor: '#aa0000', //@red negBarColor: '#aa0000',
tooltipFormatter: scope[str].formatter, tooltipFormatter: scope[str].formatter,
tooltipFormat: '{{value:jobs}}', tooltipFormat: '{{value:jobs}}',
tooltipValueLookups: { tooltipValueLookups: {
jobs: scope[str].jobIds jobs: scope[str].jobIds
// $.range_map({
// '1': 'Success',
// '-1': 'Failed',
// '0' : 'Queued'
// // '7:': 'High'
// })
} }
}); });

3
awx/ui/static/less/ansible-ui.less
View File

@@ -187,12 +187,15 @@ a:focus {
.jqstooltip{ .jqstooltip{
background-color: black !important; background-color: black !important;
border-radius:4px;
border: 1px solid black;
} }
.smart-status-tooltip{ .smart-status-tooltip{
font-size: 12px; font-size: 12px;
font-family: 'Open Sans'; font-family: 'Open Sans';
background-color: black; background-color: black;
border-radius:4px;
span { span {
padding: 3px; padding: 3px;
} }