Skip to content

Commit 5e7583e

Browse files
sg00dwinsg00dwin
committed
Addition of truncate class to tile headers and when no deployments have started.
Fixes #1175
1 parent 936eff7 commit 5e7583e

10 files changed

+50
-55
lines changed

‎app/styles/_overview.less

+14-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,7 +594,7 @@
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;
@@ -600,12 +605,13 @@
600605
}
601606
}
602607
.empty-tile {
603-
padding: 50px;
608+
.text-center();
609+
padding: 50px 20px;
604610
}
605611
.empty-dc {
606612
.text-center();
607613
.text-muted();
608-
padding: 0 50px 70px;
614+
padding: 0 20px 70px;
609615
}
610616
@media (min-width: @screen-md-min) {
611617
.overview-services.single-alternate-service {

‎app/views/overview/_dc.html

+5-8
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,8 @@ <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+
<div class="truncate mar-bottom-xl"><a ng-href="{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}">
47+
{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.</div>
4848
</span>
4949
<span ng-if="imageChangeParams.length > 1">
5050
one of the images for this deployment config changes.
@@ -63,11 +63,8 @@ <h2>No deployments.</h2>
6363
</div>
6464
</div>
6565
<div ng-if="!pipelinesForDC[deploymentConfig.metadata.name].length">
66-
<p>
6766
No deployments have started for
68-
<a ng-href="{{deploymentConfig | navigateResourceURL}}">{{deploymentConfig.metadata.name}}</a>.
69-
</p>
70-
67+
<div class="truncate mar-bottom-xl"><a ng-href="{{deploymentConfig | navigateResourceURL}}">{{deploymentConfig.metadata.name}}</a>.</div>
7168
<button ng-if="'deploymentconfigs' | canI : 'update'" class="btn btn-primary" ng-click="startDeployment(deploymentConfig)">
7269
Start Deployment
7370
</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

+2-4
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ <h3 class="route-title truncate">
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>.
74+
No services are grouped with <div class="word-break-all"><a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a>.</div>
7675
<span ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">Add a service to group them together.</span>
77-
</p>
7876
<div ng-if="(services | hashSize) > 1 && ('services' | canI : 'update')">
79-
<button class="btn btn-primary" ng-click="linkService()">
77+
<button class="btn btn-primary mar-lg" ng-click="linkService()">
8078
Group Service
8179
</button>
8280
</div>

‎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+
<div class="word-break-all">Service <a ng-href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a></div>
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
@@ -11342,8 +11342,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1134211342
"<div class=\"overview-tile\" ng-class=\"{ 'deployment-in-progress': inProgressDeployment }\">\n" +
1134311343
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1134411344
"<div class=\"overview-tile-header\">\n" +
11345-
"<div class=\"rc-header\">\n" +
11346-
"<div>\n" +
11345+
"<div class=\"rc-header\" ng-class=\"{ 'rc-header-shield' : activeReplicationController}\">\n" +
11346+
"<div class=\"truncate\">\n" +
1134711347
"Deployment Config\n" +
1134811348
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>\n" +
1134911349
"<small class=\"overview-timestamp\" ng-if=\"activeReplicationController && !inProgressDeployment\">\n" +
@@ -11381,8 +11381,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1138111381
"A new deployment will start automatically when\n" +
1138211382
"<span ng-if=\"imageChangeTriggers.length === 1\">\n" +
1138311383
"an image is available for\n" +
11384-
"<a ng-href=\"{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}\">\n" +
11385-
"{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.\n" +
11384+
"<div class=\"truncate mar-bottom-xl\"><a ng-href=\"{{urlForImageChangeTrigger(imageChangeTriggers[0], deploymentConfig)}}\">\n" +
11385+
"{{imageChangeTriggers[0].imageChangeParams.from | imageObjectRef : deploymentConfig.metadata.namespace}}</a>.</div>\n" +
1138611386
"</span>\n" +
1138711387
"<span ng-if=\"imageChangeParams.length > 1\">\n" +
1138811388
"one of the images for this deployment config changes.\n" +
@@ -11401,10 +11401,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1140111401
"</div>\n" +
1140211402
"</div>\n" +
1140311403
"<div ng-if=\"!pipelinesForDC[deploymentConfig.metadata.name].length\">\n" +
11404-
"<p>\n" +
1140511404
"No deployments have started for\n" +
11406-
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>.\n" +
11407-
"</p>\n" +
11405+
"<div class=\"truncate mar-bottom-xl\"><a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>.</div>\n" +
1140811406
"<button ng-if=\"'deploymentconfigs' | canI : 'update'\" class=\"btn btn-primary\" ng-click=\"startDeployment(deploymentConfig)\">\n" +
1140911407
"Start Deployment\n" +
1141011408
"</button>\n" +
@@ -11473,8 +11471,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1147311471
"<div class=\"overview-tile\" ng-class=\"{ 'deployment-in-progress': inProgressDeployment }\">\n" +
1147411472
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1147511473
"<div class=\"overview-tile-header\">\n" +
11476-
"<div class=\"rc-header\">\n" +
11477-
"<div>\n" +
11474+
"<div class=\"rc-header\" ng-class=\"{ 'rc-header-shield' : latestReplicaSet && latestRevision && !inProgressDeployment}\">\n" +
11475+
"<div class=\"truncate\">\n" +
1147811476
"Deployment\n" +
1147911477
"<a ng-href=\"{{deployment | navigateResourceURL}}\">{{deploymentName}}</a>\n" +
1148011478
"<small class=\"overview-timestamp\" ng-if=\"latestReplicaSet\">\n" +
@@ -11544,7 +11542,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1154411542
"<div class=\"overview-tile\" ng-if=\"pod.kind === 'Pod'\">\n" +
1154511543
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1154611544
"<div class=\"rc-header\"> \n" +
11547-
"<div>\n" +
11545+
"<div class=\"truncate\">\n" +
1154811546
"Pod\n" +
1154911547
"<a ng-href=\"{{pod | navigateResourceURL}}\">{{pod.metadata.name}}</a>\n" +
1155011548
"<small class=\"overview-timestamp\">\n" +
@@ -11633,12 +11631,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1163311631
"<div class=\"no-child-services-message\">\n" +
1163411632
"<div class=\"empty-tile\">\n" +
1163511633
"<h2>No grouped services.</h2>\n" +
11636-
"<p>\n" +
11637-
"No services are grouped with <a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>.\n" +
11634+
"No services are grouped with <div class=\"word-break-all\"><a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>.</div>\n" +
1163811635
"<span ng-if=\"(services | hashSize) > 1 && ('services' | canI : 'update')\">Add a service to group them together.</span>\n" +
11639-
"</p>\n" +
1164011636
"<div ng-if=\"(services | hashSize) > 1 && ('services' | canI : 'update')\">\n" +
11641-
"<button class=\"btn btn-primary\" ng-click=\"linkService()\">\n" +
11637+
"<button class=\"btn btn-primary mar-lg\" ng-click=\"linkService()\">\n" +
1164211638
"Group Service\n" +
1164311639
"</button>\n" +
1164411640
"</div>\n" +
@@ -11654,7 +11650,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1165411650

1165511651
$templateCache.put('views/overview/_service-header.html',
1165611652
"<div row class=\"service-title\" ng-if=\"service\">\n" +
11657-
"<div class=\"service-name\">\n" +
11653+
"<div class=\"service-name truncate\">\n" +
1165811654
"<span class=\"pficon pficon-service\" aria-hidden=\"true\" title=\"Service\"></span>\n" +
1165911655
"<span class=\"sr-only\">Service</span>\n" +
1166011656
"<a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>\n" +
@@ -11682,13 +11678,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1168211678

1168311679
$templateCache.put('views/overview/_service.html',
1168411680
"<div ng-if=\"!tileCount\" class=\"no-deployments-block\">\n" +
11685-
"<div column class=\"no-deployments-message\">\n" +
11681+
"<div column class=\"no-deployments-message overview-tile\">\n" +
1168611682
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1168711683
"<div class=\"empty-tile\">\n" +
1168811684
"<h2>No deployments or pods.</h2>\n" +
1168911685
"<p>\n" +
11690-
"Service\n" +
11691-
"<a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a>\n" +
11686+
"<div class=\"word-break-all\">Service <a ng-href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a></div>\n" +
1169211687
"does not route to any deployments or pods.\n" +
1169311688
"</p>\n" +
1169411689
"</div>\n" +
@@ -11735,7 +11730,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1173511730
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1173611731
"<div class=\"overview-tile-header\">\n" +
1173711732
"<div class=\"rc-header\">\n" +
11738-
"<div>\n" +
11733+
"<div class=\"truncate\">\n" +
1173911734
"{{set.kind | humanizeKind : true}}\n" +
1174011735
"<a ng-href=\"{{set | navigateResourceURL}}\">{{set.metadata.name}}</a>\n" +
1174111736
"<small class=\"overview-timestamp\">\n" +

0 commit comments

Comments
 (0)