Skip to content

Commit b6aa325

Browse files
Merge pull request #2308 from jwforres/hourglass-icon
Automatic merge from submit-queue. Update pending states to use hourglass - adds icon for Pod Initializing Fixes #2295
2 parents a579667 + 8d28b97 commit b6aa325

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

app/views/directives/_status-icon.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<span ng-switch-when="Active" class="fa fa-refresh" aria-hidden="true"></span>
66
<span ng-switch-when="Error" class="fa fa-times text-danger" aria-hidden="true"></span>
77
<span ng-switch-when="Failed" class="fa fa-times text-danger" aria-hidden="true"></span>
8-
<span ng-switch-when="New" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
9-
<span ng-switch-when="Pending" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
8+
<span ng-switch-when="New" class="fa fa-hourglass-o" aria-hidden="true"></span>
9+
<span ng-switch-when="Pending" class="fa fa-hourglass-half" aria-hidden="true"></span>
1010
<span ng-switch-when="Ready" class="fa fa-check text-success" aria-hidden="true"></span>
1111
<span ng-switch-when="Running" class="fa fa-refresh" aria-hidden="true" ng-class="{'fa-spin' : spinning}"></span>
1212
<span ng-switch-when="Succeeded" class="fa fa-check text-success" aria-hidden="true"></span>
@@ -16,7 +16,7 @@
1616
<span ng-switch-when="Unknown" class="fa fa-question text-danger" aria-hidden="true"></span>
1717

1818
<!-- Container Runtime States -->
19-
<span ng-switch-when="ContainerCreating" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
19+
<span ng-switch-when="ContainerCreating" class="fa fa-hourglass-half" aria-hidden="true"></span>
2020
<span ng-switch-when="CrashLoopBackOff" class="fa fa-times text-danger" aria-hidden="true"></span>
2121
<span ng-switch-when="ImagePullBackOff" class="fa fa-times text-danger" aria-hidden="true"></span>
2222
<span ng-switch-when="ImageInspectError" class="fa fa-times text-danger" aria-hidden="true"></span>
@@ -30,4 +30,5 @@
3030
<span ng-switch-when="SetupNetworkError" class="fa fa-times text-danger" aria-hidden="true"></span>
3131
<span ng-switch-when="TeardownNetworkError" class="fa fa-times text-danger" aria-hidden="true"></span>
3232
<span ng-switch-when="DeadlineExceeded" class="fa fa-times text-danger" aria-hidden="true"></span>
33+
<span ng-switch-when="PodInitializing" class="fa fa-hourglass-half" aria-hidden="true"></span>
3334
</span>

dist/scripts/templates.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -5658,8 +5658,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
56585658
"<span ng-switch-when=\"Active\" class=\"fa fa-refresh\" aria-hidden=\"true\"></span>\n" +
56595659
"<span ng-switch-when=\"Error\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
56605660
"<span ng-switch-when=\"Failed\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
5661-
"<span ng-switch-when=\"New\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
5662-
"<span ng-switch-when=\"Pending\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
5661+
"<span ng-switch-when=\"New\" class=\"fa fa-hourglass-o\" aria-hidden=\"true\"></span>\n" +
5662+
"<span ng-switch-when=\"Pending\" class=\"fa fa-hourglass-half\" aria-hidden=\"true\"></span>\n" +
56635663
"<span ng-switch-when=\"Ready\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
56645664
"<span ng-switch-when=\"Running\" class=\"fa fa-refresh\" aria-hidden=\"true\" ng-class=\"{'fa-spin' : spinning}\"></span>\n" +
56655665
"<span ng-switch-when=\"Succeeded\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
@@ -5668,7 +5668,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
56685668
"<span ng-switch-when=\"Terminated\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
56695669
"<span ng-switch-when=\"Unknown\" class=\"fa fa-question text-danger\" aria-hidden=\"true\"></span>\n" +
56705670
"\n" +
5671-
"<span ng-switch-when=\"ContainerCreating\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
5671+
"<span ng-switch-when=\"ContainerCreating\" class=\"fa fa-hourglass-half\" aria-hidden=\"true\"></span>\n" +
56725672
"<span ng-switch-when=\"CrashLoopBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
56735673
"<span ng-switch-when=\"ImagePullBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
56745674
"<span ng-switch-when=\"ImageInspectError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
@@ -5682,6 +5682,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
56825682
"<span ng-switch-when=\"SetupNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
56835683
"<span ng-switch-when=\"TeardownNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
56845684
"<span ng-switch-when=\"DeadlineExceeded\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
5685+
"<span ng-switch-when=\"PodInitializing\" class=\"fa fa-hourglass-half\" aria-hidden=\"true\"></span>\n" +
56855686
"</span>"
56865687
);
56875688

0 commit comments

Comments
 (0)