Skip to content

Commit a05779d

Browse files
author
OpenShift Bot
authored
Merge pull request #1188 from sg00dwin/overview-long-strings1175
Merged by openshift-bot
2 parents cdb8a24 + 901d64f commit a05779d

10 files changed

+57
-58
lines changed

‎app/styles/_overview.less

+17-8
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@
299299
.flex-wrap(@wrap: wrap);
300300
.flex-direction(@direction: column);
301301
overview-service {
302+
// default width needed to enable truncation on elements within
303+
width: 100%;
302304
&:nth-child(n+3) {
303305
margin-top: @service-group-vertical-margin;
304306
}
@@ -380,8 +382,10 @@
380382
.service-name {
381383
.h3();
382384
font-weight: @overview-font-weight;
383-
margin-top: 3px;
384-
margin-bottom: 3px;
385+
// minimum line-height to prevent descender clipping since they use truncate
386+
line-height: 1.2;
387+
margin-top: 2px;
388+
margin-bottom: 2px;
385389
.pficon {
386390
margin-right: 7px;
387391
vertical-align: -2px;
@@ -398,8 +402,10 @@
398402
.rc-header {
399403
.text-muted();
400404
padding: 5px 10px;
401-
// Prevent the content from overlapping the deployment shield
402-
margin-right: @shield-width-lg;
405+
&.rc-header-shield {
406+
// Prevent the content from overlapping the deployment shield
407+
margin-right: @shield-width-lg;
408+
}
403409
}
404410
image-names {
405411
// truncate long image names
@@ -570,7 +576,6 @@
570576
width: 50%;
571577
}
572578
.no-child-services-message, .no-deployments-message {
573-
.text-center();
574579
.text-muted();
575580
.well();
576581
margin-bottom: 0;
@@ -589,23 +594,27 @@
589594
}
590595
}
591596
.no-deployments-message {
592-
.flex(@columns: 1 0 0%); // the parent overview-service is where width with flex-basis is set.
597+
width: 100%;
593598
}
594599
.no-child-services-message {
595600
display: none;
596601
@media (min-width: @two-column-min-width) {
597602
.flex-display(@display: flex);
598603
.flex(@columns: 1 0 0%);
599604
.flex-direction(@direction: column);
605+
height: 100%;
600606
}
601607
}
602608
.empty-tile {
603-
padding: 50px;
609+
.text-center();
610+
padding: 50px 20px;
611+
.word-break();
604612
}
605613
.empty-dc {
606614
.text-center();
607615
.text-muted();
608-
padding: 0 50px 70px;
616+
padding: 0 20px 70px;
617+
.word-break();
609618
}
610619
@media (min-width: @screen-md-min) {
611620
.overview-services.single-alternate-service {

‎app/views/overview/_dc.html

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="overview-tile" ng-class="{ 'deployment-in-progress': inProgressDeployment }">
22
<ng-include src="'views/overview/_service-header.html'"></ng-include>
33
<div class="overview-tile-header">
4-
<div class="rc-header">
5-
<div>
4+
<div class="rc-header" ng-class="{ 'rc-header-shield' : activeReplicationController}">
5+
<div class="truncate">
66
Deployment Config
77
<a ng-href="{{deploymentConfig | navigateResourceURL}}">{{deploymentConfig.metadata.name}}</a>
88
<small class="overview-timestamp" ng-if="activeReplicationController && !inProgressDeployment">
@@ -43,8 +43,7 @@ <h2>No deployments.</h2>
4343
A new deployment will start automatically when
4444
<span ng-if="imageChangeTriggers.length === 1">
4545
an image is available for
46-
<a ng-href="{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}">
47-
{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.
46+
<a ng-href="{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}">{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.
4847
</span>
4948
<span ng-if="imageChangeParams.length > 1">
5049
one of the images for this deployment config changes.
@@ -63,11 +62,8 @@ <h2>No deployments.</h2>
6362
</div>
6463
</div>
6564
<div ng-if="!pipelinesForDC[deploymentConfig.metadata.name].length">
66-
<p>
67-
No deployments have started for
68-
<a ng-href="{{deploymentConfig | navigateResourceURL}}">{{deploymentConfig.metadata.name}}</a>.
69-
</p>
70-
65+
<p>No deployments have started for
66+
<a ng-href="{{deploymentConfig | navigateResourceURL}}">{{deploymentConfig.metadata.name}}</a>.</p>
7167
<button ng-if="'deploymentconfigs' | canI : 'update'" class="btn btn-primary" ng-click="startDeployment(deploymentConfig)">
7268
Start Deployment
7369
</button>

‎app/views/overview/_deployment.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="overview-tile" ng-class="{ 'deployment-in-progress': inProgressDeployment }">
22
<ng-include src="'views/overview/_service-header.html'"></ng-include>
33
<div class="overview-tile-header">
4-
<div class="rc-header">
5-
<div>
4+
<div class="rc-header" ng-class="{ 'rc-header-shield' : latestReplicaSet && latestRevision && !inProgressDeployment}">
5+
<div class="truncate">
66
Deployment
77
<a ng-href="{{deployment | navigateResourceURL}}">{{deploymentName}}</a>
88
<small class="overview-timestamp" ng-if="latestReplicaSet">

‎app/views/overview/_pod.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="overview-tile" ng-if="pod.kind === 'Pod'">
22
<ng-include src="'views/overview/_service-header.html'"></ng-include>
33
<div class="rc-header"> <!-- TODO may want different treatment for a pod-name? -->
4-
<div>
4+
<div class="truncate">
55
Pod
66
<a ng-href="{{pod | navigateResourceURL}}">{{pod.metadata.name}}</a>
77
<small class="overview-timestamp">

‎app/views/overview/_service-group.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,13 @@ <h3 class="route-title truncate">
6767
ng-repeat="service in childServices">
6868
</overview-service>
6969

70-
<div flex column ng-if="alternateServices.length === 0 && childServices.length === 0 && service" class="no-child-services-block">
70+
<div column ng-if="alternateServices.length === 0 && childServices.length === 0 && service" class="no-child-services-block">
7171
<div class="no-child-services-message">
7272
<div class="empty-tile">
7373
<h2>No grouped services.</h2>
74-
<p>
75-
No services are grouped with <a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>.
76-
<span ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">Add a service to group them together.</span>
77-
</p>
74+
<p>No services are grouped with <a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>.
75+
<span ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">Add a service to group them together.</span>
76+
</p>
7877
<div ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">
7978
<button class="btn btn-primary" ng-click="linkService()">
8079
Group Service

‎app/views/overview/_service-header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div row class="service-title" ng-if="service">
2-
<div class="service-name">
2+
<div class="service-name truncate">
33
<span class="pficon pficon-service" aria-hidden="true" title="Service"></span>
44
<span class="sr-only">Service</span>
55
<a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>

‎app/views/overview/_service.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<div ng-if="!tileCount" class="no-deployments-block">
2-
<div column class="no-deployments-message">
2+
<div column class="no-deployments-message overview-tile">
33
<ng-include src="'views/overview/_service-header.html'"></ng-include>
44
<div class="empty-tile">
55
<h2>No deployments or pods.</h2>
66
<p>
7-
Service
8-
<a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>
7+
Service <a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>
98
does not route to any deployments or pods.
109
</p>
1110
</div>

‎app/views/overview/_set.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ng-include src="'views/overview/_service-header.html'"></ng-include>
33
<div class="overview-tile-header">
44
<div class="rc-header">
5-
<div>
5+
<div class="truncate">
66
{{set.kind | humanizeKind : true}}
77
<a ng-href="{{set | navigateResourceURL}}">{{set.metadata.name}}</a>
88
<small class="overview-timestamp">

‎dist/scripts/templates.js

+14-19
Original file line numberDiff line numberDiff line change
@@ -11378,8 +11378,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1137811378
"<div class=\"overview-tile\" ng-class=\"{ 'deployment-in-progress': inProgressDeployment }\">\n" +
1137911379
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1138011380
"<div class=\"overview-tile-header\">\n" +
11381-
"<div class=\"rc-header\">\n" +
11382-
"<div>\n" +
11381+
"<div class=\"rc-header\" ng-class=\"{ 'rc-header-shield' : activeReplicationController}\">\n" +
11382+
"<div class=\"truncate\">\n" +
1138311383
"Deployment Config\n" +
1138411384
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>\n" +
1138511385
"<small class=\"overview-timestamp\" ng-if=\"activeReplicationController && !inProgressDeployment\">\n" +
@@ -11417,8 +11417,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1141711417
"A new deployment will start automatically when\n" +
1141811418
"<span ng-if=\"imageChangeTriggers.length === 1\">\n" +
1141911419
"an image is available for\n" +
11420-
"<a ng-href=\"{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}\">\n" +
11421-
"{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.\n" +
11420+
"<a ng-href=\"{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}\">{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.\n" +
1142211421
"</span>\n" +
1142311422
"<span ng-if=\"imageChangeParams.length > 1\">\n" +
1142411423
"one of the images for this deployment config changes.\n" +
@@ -11437,10 +11436,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1143711436
"</div>\n" +
1143811437
"</div>\n" +
1143911438
"<div ng-if=\"!pipelinesForDC[deploymentConfig.metadata.name].length\">\n" +
11440-
"<p>\n" +
11441-
"No deployments have started for\n" +
11442-
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>.\n" +
11443-
"</p>\n" +
11439+
"<p>No deployments have started for\n" +
11440+
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>.</p>\n" +
1144411441
"<button ng-if=\"'deploymentconfigs' | canI : 'update'\" class=\"btn btn-primary\" ng-click=\"startDeployment(deploymentConfig)\">\n" +
1144511442
"Start Deployment\n" +
1144611443
"</button>\n" +
@@ -11509,8 +11506,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1150911506
"<div class=\"overview-tile\" ng-class=\"{ 'deployment-in-progress': inProgressDeployment }\">\n" +
1151011507
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1151111508
"<div class=\"overview-tile-header\">\n" +
11512-
"<div class=\"rc-header\">\n" +
11513-
"<div>\n" +
11509+
"<div class=\"rc-header\" ng-class=\"{ 'rc-header-shield' : latestReplicaSet && latestRevision && !inProgressDeployment}\">\n" +
11510+
"<div class=\"truncate\">\n" +
1151411511
"Deployment\n" +
1151511512
"<a ng-href=\"{{deployment | navigateResourceURL}}\">{{deploymentName}}</a>\n" +
1151611513
"<small class=\"overview-timestamp\" ng-if=\"latestReplicaSet\">\n" +
@@ -11580,7 +11577,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1158011577
"<div class=\"overview-tile\" ng-if=\"pod.kind === 'Pod'\">\n" +
1158111578
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1158211579
"<div class=\"rc-header\"> \n" +
11583-
"<div>\n" +
11580+
"<div class=\"truncate\">\n" +
1158411581
"Pod\n" +
1158511582
"<a ng-href=\"{{pod | navigateResourceURL}}\">{{pod.metadata.name}}</a>\n" +
1158611583
"<small class=\"overview-timestamp\">\n" +
@@ -11665,12 +11662,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1166511662
"</overview-service>\n" +
1166611663
"<overview-service ng-init=\"isChild = true\" ng-repeat=\"service in childServices\">\n" +
1166711664
"</overview-service>\n" +
11668-
"<div flex column ng-if=\"alternateServices.length === 0 && childServices.length === 0 && service\" class=\"no-child-services-block\">\n" +
11665+
"<div column ng-if=\"alternateServices.length === 0 && childServices.length === 0 && service\" class=\"no-child-services-block\">\n" +
1166911666
"<div class=\"no-child-services-message\">\n" +
1167011667
"<div class=\"empty-tile\">\n" +
1167111668
"<h2>No grouped services.</h2>\n" +
11672-
"<p>\n" +
11673-
"No services are grouped with <a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>.\n" +
11669+
"<p>No services are grouped with <a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>.\n" +
1167411670
"<span ng-if=\"(services | hashSize) > 1 && ('services' | canI : 'update')\">Add a service to group them together.</span>\n" +
1167511671
"</p>\n" +
1167611672
"<div ng-if=\"(services | hashSize) > 1 && ('services' | canI : 'update')\">\n" +
@@ -11690,7 +11686,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1169011686

1169111687
$templateCache.put('views/overview/_service-header.html',
1169211688
"<div row class=\"service-title\" ng-if=\"service\">\n" +
11693-
"<div class=\"service-name\">\n" +
11689+
"<div class=\"service-name truncate\">\n" +
1169411690
"<span class=\"pficon pficon-service\" aria-hidden=\"true\" title=\"Service\"></span>\n" +
1169511691
"<span class=\"sr-only\">Service</span>\n" +
1169611692
"<a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>\n" +
@@ -11718,13 +11714,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1171811714

1171911715
$templateCache.put('views/overview/_service.html',
1172011716
"<div ng-if=\"!tileCount\" class=\"no-deployments-block\">\n" +
11721-
"<div column class=\"no-deployments-message\">\n" +
11717+
"<div column class=\"no-deployments-message overview-tile\">\n" +
1172211718
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1172311719
"<div class=\"empty-tile\">\n" +
1172411720
"<h2>No deployments or pods.</h2>\n" +
1172511721
"<p>\n" +
11726-
"Service\n" +
11727-
"<a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>\n" +
11722+
"Service <a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>\n" +
1172811723
"does not route to any deployments or pods.\n" +
1172911724
"</p>\n" +
1173011725
"</div>\n" +
@@ -11771,7 +11766,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1177111766
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1177211767
"<div class=\"overview-tile-header\">\n" +
1177311768
"<div class=\"rc-header\">\n" +
11774-
"<div>\n" +
11769+
"<div class=\"truncate\">\n" +
1177511770
"{{set.kind | humanizeKind : true}}\n" +
1177611771
"<a ng-href=\"{{set | navigateResourceURL}}\">{{set.metadata.name}}</a>\n" +
1177711772
"<small class=\"overview-timestamp\">\n" +

0 commit comments

Comments
 (0)