Skip to content

Commit 977c76b

Browse files
author
OpenShift Bot
authored
Merge pull request #1818 from spadgett/routes-table
Merged by openshift-bot
2 parents fcc70eb + 393c062 commit 977c76b

File tree

8 files changed

+61
-20
lines changed

8 files changed

+61
-20
lines changed

‎app/styles/_typography.less

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ h1 {
7070

7171
// Misc
7272
// --------------------------------------------------
73+
a > .fa-external-link {
74+
font-size: 75%;
75+
}
76+
7377
.action-inline {
7478
margin-left: @action-link-inline-margin;
7579
font-size: @font-size-small;

‎app/views/browse/route.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ <h1 class="contains-actions">
6464
<div ng-repeat="ingress in route.status.ingress" ng-init="admittedCondition = (ingress | routeIngressCondition : 'Admitted')" class="route-status">
6565
<div class="h3">
6666
<span ng-if="(route | isWebRoute)">
67-
<a ng-href="{{route | routeWebURL : ingress.host}}" target="_blank">{{route | routeLabel : ingress.host : true}}</a>
67+
<a ng-href="{{route | routeWebURL : ingress.host}}" target="_blank">
68+
{{route | routeLabel : ingress.host : true}}
69+
<i class="fa fa-external-link" aria-hidden="true"></i>
70+
</a>
6871
</span>
6972
<span ng-if="!(route | isWebRoute)">
7073
{{route | routeLabel : ingress.host}}

‎app/views/browse/routes.html

+14-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ <h1>
4343
<tr>
4444
<th>{{customNameHeader || 'Name'}}</th>
4545
<th>Hostname</th>
46-
<th>Routes To</th>
46+
<!--
47+
Right now only services are supported. If other types are
48+
added, we'll need to change the table header.
49+
-->
50+
<th>Service</th>
4751
<th>Target Port</th>
4852
<th>TLS Termination</th>
4953
</tr>
@@ -62,7 +66,10 @@ <h1>
6266
</td>
6367
<td data-title="Hostname">
6468
<span ng-if="(route | isWebRoute)">
65-
<a href="{{route | routeWebURL}}" target="_blank">{{route | routeLabel}}</a>
69+
<a href="{{route | routeWebURL}}" target="_blank">
70+
{{route | routeLabel}}
71+
<i class="fa fa-external-link" aria-hidden="true"></i>
72+
</a>
6673
</span>
6774
<span ng-if="!(route | isWebRoute)">
6875
{{route | routeLabel}}
@@ -72,7 +79,11 @@ <h1>
7279
<span class="sr-only">Pending</span>
7380
</span>
7481
</td>
75-
<td data-title="Routes To">
82+
<!--
83+
Right now only services are supported. If other types are
84+
added, we'll need to change the table header.
85+
-->
86+
<td data-title="Service">
7687
<span ng-if="route.spec.to.kind !== 'Service'">{{route.spec.to.kind}}: {{route.spec.to.name}}</span>
7788
<span ng-if="route.spec.to.kind === 'Service'"><a ng-href="{{route.spec.to.name | navigateResourceURL : 'Service': route.metadata.namespace}}">{{route.spec.to.name}}</a></span>
7889
</td>

‎app/views/directives/traffic-table.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
</td>
3939
<td data-title="Hostname">
4040
<span ng-if="(routes[routeName] | isWebRoute)" class="word-break">
41-
<a href="{{routes[routeName] | routeWebURL}}" target="_blank">{{routes[routeName] | routeLabel}}</a>
41+
<a href="{{routes[routeName] | routeWebURL}}" target="_blank">
42+
{{routes[routeName] | routeLabel}}
43+
<i class="fa fa-external-link" aria-hidden="true"></i>
44+
</a>
4245
</span>
4346
<span ng-if="!(routes[routeName] | isWebRoute)" class="word-break">
4447
{{routes[routeName] | routeLabel}}

‎app/views/overview.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,10 @@ <h2>
124124
<div ng-if="route = overview.bestRouteByApp[app]" class="pull-right">
125125
<h3 class="overview-route">
126126
<span ng-if="route | isWebRoute">
127-
<a ng-href="{{route | routeWebURL}}" target="_blank">{{route | routeLabel}}</a>
128-
<i class="fa fa-external-link small" aria-hidden="true"></i>
127+
<a ng-href="{{route | routeWebURL}}" target="_blank">
128+
{{route | routeLabel}}
129+
<i class="fa fa-external-link" aria-hidden="true"></i>
130+
</a>
129131
</span>
130132
<span ng-if="!(route | isWebRoute)">{{route | routeLabel}}</span>
131133
</h3>

‎app/views/overview/_networking.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ <h3>
3232
<div ng-repeat="route in networking.routesByService[service.metadata.name] | limitTo : 2 track by (route | uid)" class="overview-routes">
3333
<h3>
3434
<span ng-if="route | isWebRoute">
35-
<a ng-href="{{route | routeWebURL}}" target="_blank">{{route | routeLabel}}</a>
36-
<i class="fa fa-external-link small" aria-hidden="true"></i>
35+
<a ng-href="{{route | routeWebURL}}" target="_blank">
36+
{{route | routeLabel}}
37+
<i class="fa fa-external-link" aria-hidden="true"></i>
38+
</a>
3739
</span>
3840
<span ng-if="!(route | isWebRoute)">{{route | routeLabel}}</span>
3941
<route-warnings route="route" services="networking.allServices"></route-warnings>

‎dist/scripts/templates.js

+24-9
Original file line numberDiff line numberDiff line change
@@ -3408,7 +3408,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
34083408
"<div ng-repeat=\"ingress in route.status.ingress\" ng-init=\"admittedCondition = (ingress | routeIngressCondition : 'Admitted')\" class=\"route-status\">\n" +
34093409
"<div class=\"h3\">\n" +
34103410
"<span ng-if=\"(route | isWebRoute)\">\n" +
3411-
"<a ng-href=\"{{route | routeWebURL : ingress.host}}\" target=\"_blank\">{{route | routeLabel : ingress.host : true}}</a>\n" +
3411+
"<a ng-href=\"{{route | routeWebURL : ingress.host}}\" target=\"_blank\">\n" +
3412+
"{{route | routeLabel : ingress.host : true}}\n" +
3413+
"<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
3414+
"</a>\n" +
34123415
"</span>\n" +
34133416
"<span ng-if=\"!(route | isWebRoute)\">\n" +
34143417
"{{route | routeLabel : ingress.host}}\n" +
@@ -3610,7 +3613,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
36103613
"<tr>\n" +
36113614
"<th>{{customNameHeader || 'Name'}}</th>\n" +
36123615
"<th>Hostname</th>\n" +
3613-
"<th>Routes To</th>\n" +
3616+
"\n" +
3617+
"<th>Service</th>\n" +
36143618
"<th>Target Port</th>\n" +
36153619
"<th>TLS Termination</th>\n" +
36163620
"</tr>\n" +
@@ -3627,7 +3631,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
36273631
"</td>\n" +
36283632
"<td data-title=\"Hostname\">\n" +
36293633
"<span ng-if=\"(route | isWebRoute)\">\n" +
3630-
"<a href=\"{{route | routeWebURL}}\" target=\"_blank\">{{route | routeLabel}}</a>\n" +
3634+
"<a href=\"{{route | routeWebURL}}\" target=\"_blank\">\n" +
3635+
"{{route | routeLabel}}\n" +
3636+
"<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
3637+
"</a>\n" +
36313638
"</span>\n" +
36323639
"<span ng-if=\"!(route | isWebRoute)\">\n" +
36333640
"{{route | routeLabel}}\n" +
@@ -3637,7 +3644,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
36373644
"<span class=\"sr-only\">Pending</span>\n" +
36383645
"</span>\n" +
36393646
"</td>\n" +
3640-
"<td data-title=\"Routes To\">\n" +
3647+
"\n" +
3648+
"<td data-title=\"Service\">\n" +
36413649
"<span ng-if=\"route.spec.to.kind !== 'Service'\">{{route.spec.to.kind}}: {{route.spec.to.name}}</span>\n" +
36423650
"<span ng-if=\"route.spec.to.kind === 'Service'\"><a ng-href=\"{{route.spec.to.name | navigateResourceURL : 'Service': route.metadata.namespace}}\">{{route.spec.to.name}}</a></span>\n" +
36433651
"</td>\n" +
@@ -8932,7 +8940,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
89328940
"</td>\n" +
89338941
"<td data-title=\"Hostname\">\n" +
89348942
"<span ng-if=\"(routes[routeName] | isWebRoute)\" class=\"word-break\">\n" +
8935-
"<a href=\"{{routes[routeName] | routeWebURL}}\" target=\"_blank\">{{routes[routeName] | routeLabel}}</a>\n" +
8943+
"<a href=\"{{routes[routeName] | routeWebURL}}\" target=\"_blank\">\n" +
8944+
"{{routes[routeName] | routeLabel}}\n" +
8945+
"<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
8946+
"</a>\n" +
89368947
"</span>\n" +
89378948
"<span ng-if=\"!(routes[routeName] | isWebRoute)\" class=\"word-break\">\n" +
89388949
"{{routes[routeName] | routeLabel}}\n" +
@@ -11459,8 +11470,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1145911470
"<div ng-if=\"route = overview.bestRouteByApp[app]\" class=\"pull-right\">\n" +
1146011471
"<h3 class=\"overview-route\">\n" +
1146111472
"<span ng-if=\"route | isWebRoute\">\n" +
11462-
"<a ng-href=\"{{route | routeWebURL}}\" target=\"_blank\">{{route | routeLabel}}</a>\n" +
11463-
"<i class=\"fa fa-external-link small\" aria-hidden=\"true\"></i>\n" +
11473+
"<a ng-href=\"{{route | routeWebURL}}\" target=\"_blank\">\n" +
11474+
"{{route | routeLabel}}\n" +
11475+
"<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
11476+
"</a>\n" +
1146411477
"</span>\n" +
1146511478
"<span ng-if=\"!(route | isWebRoute)\">{{route | routeLabel}}</span>\n" +
1146611479
"</h3>\n" +
@@ -12155,8 +12168,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1215512168
"<div ng-repeat=\"route in networking.routesByService[service.metadata.name] | limitTo : 2 track by (route | uid)\" class=\"overview-routes\">\n" +
1215612169
"<h3>\n" +
1215712170
"<span ng-if=\"route | isWebRoute\">\n" +
12158-
"<a ng-href=\"{{route | routeWebURL}}\" target=\"_blank\">{{route | routeLabel}}</a>\n" +
12159-
"<i class=\"fa fa-external-link small\" aria-hidden=\"true\"></i>\n" +
12171+
"<a ng-href=\"{{route | routeWebURL}}\" target=\"_blank\">\n" +
12172+
"{{route | routeLabel}}\n" +
12173+
"<i class=\"fa fa-external-link\" aria-hidden=\"true\"></i>\n" +
12174+
"</a>\n" +
1216012175
"</span>\n" +
1216112176
"<span ng-if=\"!(route | isWebRoute)\">{{route | routeLabel}}</span>\n" +
1216212177
"<route-warnings route=\"route\" services=\"networking.allServices\"></route-warnings>\n" +

‎dist/styles/main.css

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)