Skip to content

Commit

Permalink
Merge pull request #2308 from jwforres/hourglass-icon
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Update pending states to use hourglass - adds icon for Pod Initializing

Fixes #2295
  • Loading branch information
openshift-merge-robot authored Oct 19, 2017
2 parents a579667 + 8d28b97 commit b6aa325
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions app/views/directives/_status-icon.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<span ng-switch-when="Active" class="fa fa-refresh" aria-hidden="true"></span>
<span ng-switch-when="Error" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="Failed" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="New" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
<span ng-switch-when="Pending" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
<span ng-switch-when="New" class="fa fa-hourglass-o" aria-hidden="true"></span>
<span ng-switch-when="Pending" class="fa fa-hourglass-half" aria-hidden="true"></span>
<span ng-switch-when="Ready" class="fa fa-check text-success" aria-hidden="true"></span>
<span ng-switch-when="Running" class="fa fa-refresh" aria-hidden="true" ng-class="{'fa-spin' : spinning}"></span>
<span ng-switch-when="Succeeded" class="fa fa-check text-success" aria-hidden="true"></span>
Expand All @@ -16,7 +16,7 @@
<span ng-switch-when="Unknown" class="fa fa-question text-danger" aria-hidden="true"></span>

<!-- Container Runtime States -->
<span ng-switch-when="ContainerCreating" class="spinner spinner-xs spinner-inline" aria-hidden="true"></span>
<span ng-switch-when="ContainerCreating" class="fa fa-hourglass-half" aria-hidden="true"></span>
<span ng-switch-when="CrashLoopBackOff" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="ImagePullBackOff" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="ImageInspectError" class="fa fa-times text-danger" aria-hidden="true"></span>
Expand All @@ -30,4 +30,5 @@
<span ng-switch-when="SetupNetworkError" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="TeardownNetworkError" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="DeadlineExceeded" class="fa fa-times text-danger" aria-hidden="true"></span>
<span ng-switch-when="PodInitializing" class="fa fa-hourglass-half" aria-hidden="true"></span>
</span>
7 changes: 4 additions & 3 deletions dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -5658,8 +5658,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span ng-switch-when=\"Active\" class=\"fa fa-refresh\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Error\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Failed\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"New\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Pending\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"New\" class=\"fa fa-hourglass-o\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Pending\" class=\"fa fa-hourglass-half\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Ready\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Running\" class=\"fa fa-refresh\" aria-hidden=\"true\" ng-class=\"{'fa-spin' : spinning}\"></span>\n" +
"<span ng-switch-when=\"Succeeded\" class=\"fa fa-check text-success\" aria-hidden=\"true\"></span>\n" +
Expand All @@ -5668,7 +5668,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span ng-switch-when=\"Terminated\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"Unknown\" class=\"fa fa-question text-danger\" aria-hidden=\"true\"></span>\n" +
"\n" +
"<span ng-switch-when=\"ContainerCreating\" class=\"spinner spinner-xs spinner-inline\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"ContainerCreating\" class=\"fa fa-hourglass-half\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"CrashLoopBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"ImagePullBackOff\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"ImageInspectError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
Expand All @@ -5682,6 +5682,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span ng-switch-when=\"SetupNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"TeardownNetworkError\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"DeadlineExceeded\" class=\"fa fa-times text-danger\" aria-hidden=\"true\"></span>\n" +
"<span ng-switch-when=\"PodInitializing\" class=\"fa fa-hourglass-half\" aria-hidden=\"true\"></span>\n" +
"</span>"
);

Expand Down

0 comments on commit b6aa325

Please sign in to comment.