External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

changed the reds and greens in tower

Browse Source
This commit is contained in:
John Mitchell
2015-04-24 15:19:16 -04:00
parent 4441dde4cd
commit f311d62e7b
9 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/templates/api/stdout.html
View File

@@ -14,16 +14,16 @@
.ansi4 { text-decoration: underline; } .ansi4 { text-decoration: underline; }
.ansi9 { text-decoration: line-through; } .ansi9 { text-decoration: line-through; }
.ansi30 { color: #000316; } .ansi30 { color: #000316; }
.ansi31 { color: #AA0000; } .ansi31 { color: #ff5850; }
.ansi32 { color: #00AA00; } .ansi32 { color: #60D66F; }
.ansi33 { color: #AA5500; } .ansi33 { color: #AA5500; }
.ansi34 { color: #0000AA; } .ansi34 { color: #0000AA; }
.ansi35 { color: #E850A8; } .ansi35 { color: #E850A8; }
.ansi36 { color: #00AAAA; } .ansi36 { color: #00AAAA; }
.ansi37 { color: #F5F1DE; } .ansi37 { color: #F5F1DE; }
.ansi40 { background-color: #000000; } .ansi40 { background-color: #000000; }
.ansi41 { background-color: #AA0000; } .ansi41 { background-color: #ff5850; }
.ansi42 { background-color: #00AA00; } .ansi42 { background-color: #60D66F; }
.ansi43 { background-color: #AA5500; } .ansi43 { background-color: #AA5500; }
.ansi44 { background-color: #0000AA; } .ansi44 { background-color: #0000AA; }
.ansi45 { background-color: #E850A8; } .ansi45 { background-color: #E850A8; }

6
awx/ui/static/js/directives/host-status-graph.js
View File

@@ -48,11 +48,11 @@ function HostStatusGraph($compile, $window) {
if(data.hosts.total+data.hosts.failed>0){ if(data.hosts.total+data.hosts.failed>0){
data = [ data = [
{ "label": "Successful", { "label": "Successful",
"color": "#00aa00", "color": "#60D66F",
"value" : data.hosts.total "value" : data.hosts.total
} , } ,
{ "label": "Failed", { "label": "Failed",
"color" : "#aa0000", "color" : "#ff5850",
"value" : data.hosts.failed "value" : data.hosts.failed
} }
]; ];
@@ -68,7 +68,7 @@ function HostStatusGraph($compile, $window) {
return '<b>'+x+'</b>'+ '<p>' + Math.floor(y.replace(',','')) + ' Hosts ' + '</p>'; return '<b>'+x+'</b>'+ '<p>' + Math.floor(y.replace(',','')) + ' Hosts ' + '</p>';
}) })
.labelType("percent") .labelType("percent")
.color(['#00aa00', '#aa0000']); .color(['#60D66F', '#ff5850']);
d3.select(element.find('svg')[0]) d3.select(element.find('svg')[0])
.datum(data) .datum(data)

4
awx/ui/static/js/directives/job-status-graph.js
View File

@@ -46,12 +46,12 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG
scope.jobType = jobtype; scope.jobType = jobtype;
var timeFormat, graphData = [ var timeFormat, graphData = [
{ "color": "#00aa00", { "color": "#60D66F",
"key": "Successful", "key": "Successful",
"values": data.jobs.successful "values": data.jobs.successful
}, },
{ "key" : "Failed" , { "key" : "Failed" ,
"color" : "#aa0000", "color" : "#ff5850",
"values": data.jobs.failed "values": data.jobs.failed
} }
]; ];

4
awx/ui/static/js/helpers/JobDetail.js
View File

@@ -1146,7 +1146,7 @@ export default
graph_data.push({ graph_data.push({
label: 'OK', label: 'OK',
value: (scope.host_summary.ok === scope.host_summary.total) ? 1 : scope.host_summary.ok, value: (scope.host_summary.ok === scope.host_summary.total) ? 1 : scope.host_summary.ok,
color: '#00aa00' color: '#60D66F'
}); });
} }
if (scope.host_summary.changed) { if (scope.host_summary.changed) {
@@ -1167,7 +1167,7 @@ export default
graph_data.push({ graph_data.push({
label: 'Failed', label: 'Failed',
value: (scope.host_summary.failed === scope.host_summary.total) ? 1 : scope.host_summary.failed, value: (scope.host_summary.failed === scope.host_summary.total) ? 1 : scope.host_summary.failed,
color: '#aa0000' color: '#ff5850'
}); });
} }

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

@@ -23,8 +23,8 @@ export default [ function() {
barWidth: 7, barWidth: 7,
barSpacing: 2, barSpacing: 2,
zeroBarColor: 'grey', zeroBarColor: 'grey',
posBarColor: '#00aa00', posBarColor: '#60D66F',
negBarColor: '#aa0000', negBarColor: '#ff5850',
tooltipFormatter: scope.formatter, tooltipFormatter: scope.formatter,
tooltipFormat: '{{value:jobs}}', tooltipFormat: '{{value:jobs}}',
tooltipValueLookups: { tooltipValueLookups: {

6
awx/ui/static/js/widgets/DashboardCounts.js
View File

@@ -45,13 +45,13 @@ angular.module('DashboardCountsWidget', ['RestServices', 'Utilities'])
element.html(html); element.html(html);
$compile(element)(scope); $compile(element)(scope);
if(dashboard.hosts.failed>0 ){ if(dashboard.hosts.failed>0 ){
$('#failed-hosts').replaceWith("<a style=\"color:#aa0000\" href=\"/#/home/hosts/?has_active_failures=true\" id=\"failed-hosts\">"+dashboard.hosts.failed+"</a>"); $('#failed-hosts').replaceWith("<a style=\"color: #ff5850\" href=\"/#/home/hosts/?has_active_failures=true\" id=\"failed-hosts\">"+dashboard.hosts.failed+"</a>");
} }
if(dashboard.inventories.inventory_failed>0 ){ if(dashboard.inventories.inventory_failed>0 ){
$('#failed-inventories').replaceWith("<a style=\"color:#aa0000\" href=/#/inventories/?inventory_sources_with_failures id=\"failed-inventories\">"+dashboard.inventories.inventory_failed+"</a>"); $('#failed-inventories').replaceWith("<a style=\"color: #ff5850\" href=/#/inventories/?inventory_sources_with_failures id=\"failed-inventories\">"+dashboard.inventories.inventory_failed+"</a>");
} }
if(dashboard.projects.failed>0 ){ if(dashboard.projects.failed>0 ){
$('#failed-projects').replaceWith("<a style=\"color:#aa0000\" href=\"/#/projects/?status=failed\" id=\"failed-projects\">"+dashboard.projects.failed+"</a>"); $('#failed-projects').replaceWith("<a style=\"color: #ff5850\" href=\"/#/projects/?status=failed\" id=\"failed-projects\">"+dashboard.projects.failed+"</a>");
} }
scope.$emit('WidgetLoaded'); scope.$emit('WidgetLoaded');

6
awx/ui/static/js/widgets/HostPieChart.js
View File

@@ -63,12 +63,12 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities'])
data = [ data = [
{ {
"label": "Successful", "label": "Successful",
"color": "#00aa00", "color": "#60D66F",
"value" : dashboard.hosts.total "value" : dashboard.hosts.total
} , } ,
{ {
"label": "Failed", "label": "Failed",
"color" : "#aa0000", "color" : "#ff5850",
"value" : dashboard.hosts.failed "value" : dashboard.hosts.failed
} }
]; ];
@@ -85,7 +85,7 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities'])
.tooltipContent(function(x, y) { .tooltipContent(function(x, y) {
return '<b>'+x+'</b>'+ '<p>' + Math.floor(y.replace(',','')) + ' Hosts ' + '</p>'; return '<b>'+x+'</b>'+ '<p>' + Math.floor(y.replace(',','')) + ' Hosts ' + '</p>';
}) })
.color(['#00aa00', '#aa0000']); .color(['#60D66F', '#ff5850']);
host_pie_chart.pie.pieLabelsOutside(true).labelType("percent"); host_pie_chart.pie.pieLabelsOutside(true).labelType("percent");

4
awx/ui/static/js/widgets/JobStatusGraph.js
View File

@@ -117,13 +117,13 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
var timeFormat, graphData = [ var timeFormat, graphData = [
{ {
"color": "#00aa00", "color": "#60D66F",
"key": "Successful", "key": "Successful",
"values": data.jobs.successful "values": data.jobs.successful
}, },
{ {
"key" : "Failed" , "key" : "Failed" ,
"color" : "#aa0000", "color" : "#ff5850",
"values": data.jobs.failed "values": data.jobs.failed
} }
]; ];

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

@@ -12,14 +12,11 @@
@blue: #1778c3; /* logo blue */ @blue: #1778c3; /* logo blue */
@blue-link: #1778c3; @blue-link: #1778c3;
@blue-dark: #2a6496; /* link hover */ @blue-dark: #2a6496; /* link hover */
@green: #00aa00; // Ansible OK
@grey: #A9A9A9; @grey: #A9A9A9;
@grey-txt: #707070; @grey-txt: #707070;
@info: #d9edf7; /* alert info background color */ @info: #d9edf7; /* alert info background color */
@info-border: #bce8f1; /* alert info border color */ @info-border: #bce8f1; /* alert info border color */
@info-color: #3a87ad; @info-color: #3a87ad;
@red: #aa0000; // Ansible Failed
@red-hover: #AE3F3A;
@unreachable: #FF0000; @unreachable: #FF0000;
@changed: #FF9900; // Ansible Changed @changed: #FF9900; // Ansible Changed
@skipped: #00aaaa; // Ansible Skipped @skipped: #00aaaa; // Ansible Skipped
@@ -30,6 +27,10 @@
@tip-background: #0088CC; @tip-background: #0088CC;
@tip-color: #fff; @tip-color: #fff;
@green: #60D66F;
@red: #ff5850;
@red-hover: #FA8C87;
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
@@ -365,6 +366,7 @@ textarea.allowresize {
.prepend-asterisk:before { .prepend-asterisk:before {
content: "\002A\00A0"; content: "\002A\00A0";
color: @red; color: @red;
margin-right: -5px;
} }
.subtitle { .subtitle {