Skip to content

Commit

Permalink
Merge pull request #5571 from spadgett/terminal-icon
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Nov 2, 2015
2 parents 14aa7ba + b098c98 commit 4d58cb4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions assets/app/views/browse/pod.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ <h1>
ng-init="containers = pod.status.containerStatuses"
ng-if="containersRunning(pod.status.containerStatuses) > 0">
<tab-heading>Terminal</tab-heading>
<div><span class="fa fa-lg fa-info-circle"></span>
<div>
<span class="pficon pficon-info" aria-hidden="true"></span>
When you navigate away from this pod, any processes running
in these terminals will quit.</div>
in these terminals will quit.
</div>
<div class="pod-container-terminal"
ng-repeat="container in containers | orderBy:'name' track by container.name"
ng-if="container.state.running">
Expand Down
2 changes: 1 addition & 1 deletion assets/app/views/directives/logs/_log-viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span ng-if="end">to {{end}}</span>
</div>
<div ng-if="largeLog" class="log-size-warning">
<span class="pficon pficon-info"></span>
<span class="pficon pficon-info" aria-hidden="true"></span>
Only the previous {{options.tailLines || 1000}} log lines and new log
messages will be displayed because of the large log size.
</div>
Expand Down
8 changes: 5 additions & 3 deletions pkg/assets/bindata.go
Original file line number Diff line number Diff line change
Expand Up @@ -7456,8 +7456,10 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</tab>\n" +
"<tab active=\"selectedTab.terminal\" select=\"terminalTabWasSelected = true\" ng-init=\"containers = pod.status.containerStatuses\" ng-if=\"containersRunning(pod.status.containerStatuses) > 0\">\n" +
"<tab-heading>Terminal</tab-heading>\n" +
"<div><span class=\"fa fa-lg fa-info-circle\"></span>\n" +
"When you navigate away from this pod, any processes running in these terminals will quit.</div>\n" +
"<div>\n" +
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
"When you navigate away from this pod, any processes running in these terminals will quit.\n" +
"</div>\n" +
"<div class=\"pod-container-terminal\" ng-repeat=\"container in containers | orderBy:'name' track by container.name\" ng-if=\"container.state.running\">\n" +
"<h3 ng-if=\"containers.length > 1\">{{container.name}}</h3>\n" +
"<kubernetes-container-terminal pod=\"pod\" container=\"container.name\" prevent=\"!terminalTabWasSelected\">\n" +
Expand Down Expand Up @@ -8640,7 +8642,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<span ng-if=\"end\">to {{end}}</span>\n" +
"</div>\n" +
"<div ng-if=\"largeLog\" class=\"log-size-warning\">\n" +
"<span class=\"pficon pficon-info\"></span>\n" +
"<span class=\"pficon pficon-info\" aria-hidden=\"true\"></span>\n" +
"Only the previous {{options.tailLines || 1000}} log lines and new log messages will be displayed because of the large log size.\n" +
"</div>\n" +
"<div ng-if=\"!chromeless\" row flex sm=\"column\">\n" +
Expand Down

0 comments on commit 4d58cb4

Please sign in to comment.