Skip to content

Commit 695c74d

Browse files
author
OpenShift Bot
authored
Merge pull request #1130 from rhamilto/issue-1112
Merged by openshift-bot
2 parents 738a098 + 4a5162c commit 695c74d

16 files changed

+115
-112
lines changed

‎app/styles/_typography.less

+12-7
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,18 @@
3535
}
3636
}
3737

38-
h1 small.meta,
39-
.build-config-summary .meta,
40-
.deployment-config-summary .meta {
41-
font-size: 12px;
42-
@media (max-width: @screen-xs-min) {
43-
display: block;
44-
margin-top: 5px;
38+
h1 {
39+
&.contains-actions {
40+
.word-break();
41+
}
42+
small.meta,
43+
.build-config-summary .meta,
44+
.deployment-config-summary .meta {
45+
font-size: 12px;
46+
@media (max-width: @screen-xs-min) {
47+
display: block;
48+
margin-top: 5px;
49+
}
4550
}
4651
}
4752

‎app/views/browse/build-config.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@
77
<div class="container-fluid">
88
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
99
<alerts alerts="alerts"></alerts>
10-
<h1>
11-
{{buildConfigName}}
12-
<span class="pficon pficon-warning-triangle-o"
13-
ng-if="buildConfigPaused || buildConfigDeleted"
14-
aria-hidden="true"
15-
data-toggle="tooltip"
16-
data-original-title="{{buildConfigDeleted ? 'This build configuration no longer exists' : 'Building from build configuration ' + buildConfig.metadata.name + ' has been paused.'}}">
17-
</span>
10+
<h1 class="contains-actions">
1811
<div class="pull-right dropdown" ng-if="buildConfig" ng-hide="!('buildConfigs' | canIDoAny)">
1912
<!-- Primary Actions -->
2013
<button
@@ -64,6 +57,12 @@ <h1>
6457
</li>
6558
</ul>
6659
</div>
60+
{{buildConfigName}}
61+
<span class="pficon pficon-warning-triangle-o"
62+
aria-hidden="true"
63+
data-toggle="tooltip"
64+
data-original-title="{{buildConfigDeleted ? 'This build configuration no longer exists' : 'Building from build configuration ' + buildConfig.metadata.name + ' has been paused.'}}">
65+
</span>
6766
<small class="meta" ng-if="buildConfig">created <span am-time-ago="buildConfig.metadata.creationTimestamp"></span></small>
6867
</h1>
6968
<labels labels="buildConfig.metadata.labels" clickable="true" kind="builds" title-kind="build configs" project-name="{{buildConfig.metadata.namespace}}" limit="3"></labels>

‎app/views/browse/build.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!loaded" class="mar-top-xl">Loading...</div>
1212
<div ng-if="build">
13-
<h1>
14-
{{build.metadata.name}}
15-
<span class="pficon pficon-warning-triangle-o"
16-
ng-if="buildConfigPaused || buildConfigDeleted"
17-
aria-hidden="true"
18-
data-toggle="tooltip"
19-
data-original-title="{{buildConfigDeleted ? 'The build configuration for this build no longer exists.' : 'Building from build configuration ' + buildConfig.metadata.name + ' has been paused.'}}">
20-
</span>
21-
<small class="meta">created <span am-time-ago="build.metadata.creationTimestamp"></span></small>
13+
<h1 class="contains-actions">
2214
<div class="pull-right dropdown" ng-hide="!('builds' | canIDoAny)">
2315
<!-- Primary Actions -->
2416
<button class="btn btn-default hidden-xs"
@@ -78,6 +70,14 @@ <h1>
7870
</li>
7971
</ul>
8072
</div>
73+
{{build.metadata.name}}
74+
<span class="pficon pficon-warning-triangle-o"
75+
ng-if="buildConfigPaused || buildConfigDeleted"
76+
aria-hidden="true"
77+
data-toggle="tooltip"
78+
data-original-title="{{buildConfigDeleted ? 'The build configuration for this build no longer exists.' : 'Building from build configuration ' + buildConfig.metadata.name + ' has been paused.'}}">
79+
</span>
80+
<small class="meta">created <span am-time-ago="build.metadata.creationTimestamp"></span></small>
8181
</h1>
8282
<labels ng-if="buildConfigName" labels="build.metadata.labels" clickable="true" kind="builds" title-kind="builds for build config {{buildConfigName}}" project-name="{{build.metadata.namespace}}" limit="3" navigate-url="project/{{build.metadata.namespace}}/browse/builds/{{buildConfigName}}"></labels>
8383
<labels ng-if="!buildConfigName" labels="build.metadata.labels" limit="3"></labels>

‎app/views/browse/config-map.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h2>The config map could not be loaded.</h2>
1313
<p>{{error | getErrorDetails}}</p>
1414
</div>
1515
<div ng-if="loaded && !error">
16-
<h1>
16+
<h1 class="contains-actions">
1717
<div class="pull-right dropdown" ng-if="'configmaps' | canIDoAny">
1818
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
1919
Actions

‎app/views/browse/deployment-config.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
1010
<alerts alerts="alerts"></alerts>
1111
<div>
12-
<h1>
13-
{{deploymentConfigName}}
14-
12+
<h1 class="contains-actions">
1513
<div class="pull-right dropdown" ng-if="deploymentConfig" ng-hide="!('deploymentConfigs' | canIDoAny)">
1614
<!-- Primary Actions -->
1715
<button
@@ -84,6 +82,7 @@ <h1>
8482
</li>
8583
</ul>
8684
</div>
85+
{{deploymentConfigName}}
8786
<!-- <span ng-if="deploymentConfig.status.details.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{deploymentConfig.status.details.message}}"></span> -->
8887
<small class="meta" ng-if="deploymentConfig">created <span am-time-ago="deploymentConfig.metadata.creationTimestamp"></span></small>
8988
</h1>

‎app/views/browse/deployment.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
1010
<alerts alerts="alerts"></alerts>
1111
<div>
12-
<h1>
13-
{{name}}
12+
<h1 class="contains-actions">
1413
<div class="pull-right dropdown" ng-if="deployment" ng-hide="!('deployments' | canIDoAny)">
1514
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
1615
Actions
@@ -64,6 +63,7 @@ <h1>
6463
</li>
6564
</ul>
6665
</div>
66+
{{name}}
6767
<small class="meta" ng-if="deployment">created <span am-time-ago="deployment.metadata.creationTimestamp"></span></small>
6868
</h1>
6969
<labels labels="deployment.metadata.labels" clickable="true" kind="deployments" project-name="{{deployment.metadata.namespace}}" limit="3"></labels>

‎app/views/browse/imagestream.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!imageStream" class="mar-top-xl">Loading...</div>
1212
<div ng-if="imageStream">
13-
<h1>
14-
{{imageStream.metadata.name}}
13+
<h1 class="contains-actions">
1514
<div class="pull-right dropdown" ng-hide="!('imageStreams' | canIDoAny)">
1615
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
1716
Actions
@@ -34,6 +33,7 @@ <h1>
3433
</li>
3534
</ul>
3635
</div>
36+
{{imageStream.metadata.name}}
3737
<small class="meta">created <span am-time-ago="imageStream.metadata.creationTimestamp"></span></small>
3838
</h1>
3939
<labels labels="imageStream.metadata.labels" clickable="true" kind="images" project-name="{{imageStream.metadata.namespace}}" limit="3"></labels>

‎app/views/browse/persistent-volume-claim.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!loaded">Loading...</div>
1212
<div ng-if="pvc">
13-
<h1>
14-
{{pvc.metadata.name}}
15-
<small class="meta" ng-if="!pvc.spec.volumeName">
16-
<span ng-if="pvc.spec.resources.requests['storage']">
17-
waiting for {{pvc.spec.resources.requests['storage'] | usageWithUnits: 'storage'}} allocation,
18-
</span>
19-
<span ng-if="!pvc.spec.resources.requests['storage']">waiting for allocation,</span>
20-
</small>
21-
<small class="meta">created <span am-time-ago="pvc.metadata.creationTimestamp"></span></small>
13+
<h1 class="contains-actions">
2214
<div class="pull-right dropdown" ng-hide="!('persistentVolumeClaims' | canIDoAny)">
2315
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
2416
Actions
@@ -42,6 +34,14 @@ <h1>
4234
</li>
4335
</ul>
4436
</div>
37+
{{pvc.metadata.name}}
38+
<small class="meta" ng-if="!pvc.spec.volumeName">
39+
<span ng-if="pvc.spec.resources.requests['storage']">
40+
waiting for {{pvc.spec.resources.requests['storage'] | usageWithUnits: 'storage'}} allocation,
41+
</span>
42+
<span ng-if="!pvc.spec.resources.requests['storage']">waiting for allocation,</span>
43+
</small>
44+
<small class="meta">created <span am-time-ago="pvc.metadata.creationTimestamp"></span></small>
4545
</h1>
4646
<labels labels="pvc.metadata.labels" clickable="true" kind="storage" project-name="{{pvc.metadata.namespace}}" limit="3"></labels>
4747
</div><!-- /deployment -->

‎app/views/browse/pod.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!loaded" class="mar-top-xl">Loading...</div>
1212
<div ng-if="pod">
13-
<h1>
14-
{{pod.metadata.name}}
15-
13+
<h1 class="contains-actions">
1614
<div class="pull-right dropdown" ng-hide="!('pods' | canIDoAny)">
1715
<button type="button" class="dropdown-toggle actions-dropdown-btn btn btn-default hidden-xs" data-toggle="dropdown">
1816
Actions
@@ -39,6 +37,7 @@ <h1>
3937
</li>
4038
</ul>
4139
</div>
40+
{{pod.metadata.name}}
4241
<span ng-if="pod | isTroubledPod">
4342
<pod-warnings pod="pod"></pod-warnings>
4443
</span>

‎app/views/browse/replica-set.html

+8-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!loaded" class="mar-top-md">Loading...</div>
1212
<div ng-if="replicaSet">
13-
<h1>
13+
<h1 class="contains-actions">
14+
<!-- Actions -->
15+
<ng-include ng-if="kind === 'ReplicaSet'"
16+
src=" 'views/browse/_replica-set-actions.html' ">
17+
</ng-include>
18+
<ng-include ng-if="kind === 'ReplicationController'"
19+
src=" 'views/browse/_replication-controller-actions.html' ">
20+
</ng-include>
1421
{{replicaSet.metadata.name}}
1522
<span
1623
ng-if="deploymentConfigMissing"
@@ -23,14 +30,6 @@ <h1>
2330
</span>
2431
<span ng-if="deploymentConfigMissing" class="sr-only">Warning: The deployment's deployment config is missing.</span>
2532
<small class="meta">created <span am-time-ago="replicaSet.metadata.creationTimestamp"></span></small>
26-
27-
<!-- Actions -->
28-
<ng-include ng-if="kind === 'ReplicaSet'"
29-
src=" 'views/browse/_replica-set-actions.html' ">
30-
</ng-include>
31-
<ng-include ng-if="kind === 'ReplicationController'"
32-
src=" 'views/browse/_replication-controller-actions.html' ">
33-
</ng-include>
3433
</h1>
3534
<labels ng-if="deploymentConfigName" labels="replicaSet.metadata.labels" clickable="true" kind="deployments" title-kind="deployments for deployment config {{deploymentConfigName}}" project-name="{{replicaSet.metadata.namespace}}" limit="3" navigate-url="{{replicaSet | configURLForResource}}"></labels>
3635
<labels ng-if="!deploymentConfigName" labels="replicaSet.metadata.labels" clickable="true" kind="deployments" project-name="{{replicaSet.metadata.namespace}}" limit="3"></labels>

‎app/views/browse/route.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,7 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!loaded" class="mar-top-xl">Loading...</div>
1212
<div ng-if="route">
13-
<h1>
14-
{{route.metadata.name}}
15-
<route-warnings ng-if="route.spec.to.kind !== 'Service' || services"
16-
route="route"
17-
service="services[route.spec.to.name]">
18-
</route-warnings>
19-
<small class="meta">created <span am-time-ago="route.metadata.creationTimestamp"></span></small>
13+
<h1 class="contains-actions">
2014
<div class="pull-right dropdown" ng-hide="!('routes' | canIDoAny)">
2115
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
2216
Actions
@@ -42,6 +36,12 @@ <h1>
4236
</li>
4337
</ul>
4438
</div>
39+
{{route.metadata.name}}
40+
<route-warnings ng-if="route.spec.to.kind !== 'Service' || services"
41+
route="route"
42+
service="services[route.spec.to.name]">
43+
</route-warnings>
44+
<small class="meta">created <span am-time-ago="route.metadata.creationTimestamp"></span></small>
4545
</h1>
4646
<labels labels="route.metadata.labels" clickable="true" kind="routes" project-name="{{route.metadata.namespace}}" limit="3"></labels>
4747
</div>

‎app/views/browse/secret.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<alerts alerts="alerts"></alerts>
1010
<div ng-if="!loaded" class="mar-top-xl">Loading...</div>
1111
<div ng-if="loaded">
12-
<h1>
12+
<h1 class="contains-actions">
1313
<div class="pull-right dropdown" ng-hide="!('secrets' | canIDoAny)">
1414
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
1515
Actions

‎app/views/browse/service.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<alerts alerts="alerts"></alerts>
1111
<div ng-if="!loaded" class="mar-top-xl">Loading...</div>
1212
<div ng-if="service">
13-
<h1>
14-
{{service.metadata.name}}
13+
<h1 class="contains-actions">
1514
<div class="pull-right dropdown" ng-hide="!('services' | canIDoAny)">
1615
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
1716
Actions
@@ -38,6 +37,7 @@ <h1>
3837
</li>
3938
</ul>
4039
</div>
40+
{{service.metadata.name}}
4141
<small class="meta">created <span am-time-ago="service.metadata.creationTimestamp"></span></small>
4242
</h1>
4343
<labels labels="service.metadata.labels" clickable="true" kind="services" project-name="{{service.metadata.namespace}}" limit="3"></labels>

‎app/views/settings.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
<div class="container-fluid">
99
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
1010
<alerts alerts="alerts"></alerts>
11-
<h1>
12-
Project Settings
11+
<h1 class="contains-actions">
1312
<div class="pull-right dropdown" ng-hide="!project || !('projects' | canIDoAny)">
1413
<button type="button" class="dropdown-toggle btn btn-default actions-dropdown-btn hidden-xs" data-toggle="dropdown">
1514
Actions
@@ -40,6 +39,7 @@ <h1>
4039
</li>
4140
</ul>
4241
</div>
42+
Project Settings
4343
</h1>
4444
</div>
4545
</div><!-- /middle-header-->

0 commit comments

Comments
 (0)