Skip to content

Commit 563f84c

Browse files
committed
Addition of truncate class to tile headers and when no deployments have started.
Fixes #1175
1 parent 9989eef commit 563f84c

File tree

7 files changed

+18
-20
lines changed

7 files changed

+18
-20
lines changed

app/styles/_overview.less

+4-2
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,10 @@
398398
.rc-header {
399399
.text-muted();
400400
padding: 5px 10px;
401-
// Prevent the content from overlapping the deployment shield
402-
margin-right: @shield-width-lg;
401+
&.rc-header-shield {
402+
// Prevent the content from overlapping the deployment shield
403+
margin-right: @shield-width-lg;
404+
}
403405
}
404406
image-names {
405407
// truncate long image names

app/views/overview/_dc.html

+3-6
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">
@@ -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

+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
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/_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

+6-8
Original file line numberDiff line numberDiff line change
@@ -11297,8 +11297,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1129711297
"<div class=\"overview-tile\" ng-class=\"{ 'deployment-in-progress': inProgressDeployment }\">\n" +
1129811298
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1129911299
"<div class=\"overview-tile-header\">\n" +
11300-
"<div class=\"rc-header\">\n" +
11301-
"<div>\n" +
11300+
"<div class=\"rc-header\" ng-class=\"{ 'rc-header-shield' : activeReplicationController}\">\n" +
11301+
"<div class=\"truncate\">\n" +
1130211302
"Deployment Config\n" +
1130311303
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>\n" +
1130411304
"<small class=\"overview-timestamp\" ng-if=\"activeReplicationController && !inProgressDeployment\">\n" +
@@ -11356,10 +11356,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1135611356
"</div>\n" +
1135711357
"</div>\n" +
1135811358
"<div ng-if=\"!pipelinesForDC[deploymentConfig.metadata.name].length\">\n" +
11359-
"<p>\n" +
1136011359
"No deployments have started for\n" +
11361-
"<a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>.\n" +
11362-
"</p>\n" +
11360+
"<div class=\"truncate mar-bottom-xl\"><a ng-href=\"{{deploymentConfig | navigateResourceURL}}\">{{deploymentConfig.metadata.name}}</a>.</div>\n" +
1136311361
"<button ng-if=\"'deploymentconfigs' | canI : 'update'\" class=\"btn btn-primary\" ng-click=\"startDeployment(deploymentConfig)\">\n" +
1136411362
"Start Deployment\n" +
1136511363
"</button>\n" +
@@ -11429,7 +11427,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1142911427
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1143011428
"<div class=\"overview-tile-header\">\n" +
1143111429
"<div class=\"rc-header\">\n" +
11432-
"<div>\n" +
11430+
"<div class=\"truncate\">\n" +
1143311431
"Deployment\n" +
1143411432
"<a ng-href=\"{{deployment | navigateResourceURL}}\">{{deploymentName}}</a>\n" +
1143511433
"<small class=\"overview-timestamp\" ng-if=\"latestReplicaSet\">\n" +
@@ -11499,7 +11497,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1149911497
"<div class=\"overview-tile\" ng-if=\"pod.kind === 'Pod'\">\n" +
1150011498
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1150111499
"<div class=\"rc-header\"> \n" +
11502-
"<div>\n" +
11500+
"<div class=\"truncate\">\n" +
1150311501
"Pod\n" +
1150411502
"<a ng-href=\"{{pod | navigateResourceURL}}\">{{pod.metadata.name}}</a>\n" +
1150511503
"<small class=\"overview-timestamp\">\n" +
@@ -11690,7 +11688,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1169011688
"<ng-include src=\"'views/overview/_service-header.html'\"></ng-include>\n" +
1169111689
"<div class=\"overview-tile-header\">\n" +
1169211690
"<div class=\"rc-header\">\n" +
11693-
"<div>\n" +
11691+
"<div class=\"truncate\">\n" +
1169411692
"{{set.kind | humanizeKind : true}}\n" +
1169511693
"<a ng-href=\"{{set | navigateResourceURL}}\">{{set.metadata.name}}</a>\n" +
1169611694
"<small class=\"overview-timestamp\">\n" +

dist/styles/main.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -4449,7 +4449,8 @@ ul.messenger-theme-flat .messenger-message.alert-info .messenger-message-inner:b
44494449
.overview .service-title .service-name .pficon{margin-right:7px;vertical-align:-2px}
44504450
.overview .overview-tile{border-left:1px solid #d6d6d6;width:100%}
44514451
.overview .overview-tile .overview-tile-header{color:#9c9c9c;position:relative}
4452-
.overview .overview-tile .rc-header{color:#9c9c9c;padding:5px 10px;margin-right:50px}
4452+
.overview .overview-tile .rc-header{color:#9c9c9c;padding:5px 10px}
4453+
.overview .overview-tile .rc-header.rc-header-shield{margin-right:50px}
44534454
.overview .overview-tile image-names{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
44544455
.overview .no-deployments-block,.overview .shield .shield-number{display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex}
44554456
.overview .overview-tile .overview-tile-body{-webkit-flex-direction:column;-moz-flex-direction:column;-ms-flex-direction:column;flex-direction:column;padding:10px;position:relative}

0 commit comments

Comments
 (0)