Skip to content

Commit 6cbd1a7

Browse files
author
OpenShift Bot
authored
Merge pull request #978 from spadgett/inline-action-case
Merged by openshift-bot
2 parents 8bca523 + 3ac1443 commit 6cbd1a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+253
-246
lines changed

‎app/scripts/controllers/buildConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ angular.module('openshiftConsole')
149149
message: "This build configuration has been updated in the background. Saving your changes may create a conflict or cause loss of data.",
150150
links: [
151151
{
152-
label: 'Reload environment variables',
152+
label: 'Reload Environment Variables',
153153
onClick: function() {
154154
$scope.clearEnvVarUpdates();
155155
return true;

‎app/scripts/controllers/deployment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ angular.module('openshiftConsole')
142142
message: "This deployment has been updated in the background. Saving your changes may create a conflict or cause loss of data.",
143143
links: [
144144
{
145-
label: 'Reload environment variables',
145+
label: 'Reload Environment Variables',
146146
onClick: function() {
147147
$scope.clearEnvVarUpdates();
148148
return true;

‎app/scripts/controllers/deploymentConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ angular.module('openshiftConsole')
136136
message: "This deployment configuration has been updated in the background. Saving your changes may create a conflict or cause loss of data.",
137137
links: [
138138
{
139-
label: 'Reload environment variables',
139+
label: 'Reload Environment Variables',
140140
onClick: function() {
141141
$scope.clearEnvVarUpdates();
142142
return true;

‎app/scripts/controllers/overview.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ angular.module('openshiftConsole')
486486
label: "View Quota"
487487
},{
488488
href: "",
489-
label: "Don't show me again",
489+
label: "Don't Show Me Again",
490490
onClick: function() {
491491
// Hide the alert on future page loads.
492492
AlertMessageService.permanentlyHideAlert("overview-quota-limit-reached", $scope.projectName);
@@ -583,11 +583,11 @@ angular.module('openshiftConsole')
583583
message: 'An error occurred getting metrics.',
584584
links: [{
585585
href: data.url,
586-
label: 'Open metrics URL',
586+
label: 'Open Metrics URL',
587587
target: '_blank'
588588
}, {
589589
href: '',
590-
label: "Don't show me again",
590+
label: "Don't Show Me Again",
591591
onClick: function() {
592592
// Hide the alert on future page loads.
593593
AlertMessageService.permanentlyHideAlert('metrics-connection-failed');

‎app/scripts/controllers/replicaSet.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ angular.module('openshiftConsole')
374374
message: "This " + displayKind + " has been updated in the background. Saving your changes may create a conflict or cause loss of data.",
375375
links: [
376376
{
377-
label: 'Reload environment variables',
377+
label: 'Reload Environment Variables',
378378
onClick: function() {
379379
$scope.clearEnvVarUpdates();
380380
return true;

‎app/scripts/directives/serviceGroupNotifications.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ angular.module('openshiftConsole')
4747
if (canI(resourceGroupVersion, "update")) {
4848
alerts[id].links = [{
4949
href: Navigate.healthCheckURL(object.metadata.namespace, object.kind, object.metadata.name, resourceGroupVersion.group),
50-
label: "Add health checks"
50+
label: "Add Health Checks"
5151
}];
5252
}
5353
}
@@ -199,7 +199,7 @@ angular.module('openshiftConsole')
199199

200200
alert.links = [{
201201
href: "",
202-
label: "Don't show me again",
202+
label: "Don't Show Me Again",
203203
onClick: function() {
204204
// Hide the alert on future page loads.
205205
hideAlert(alertID);

‎app/views/_pod-template.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<span ng-if="podTemplate.spec.containers.length === 1">This container has no health checks</span>
1414
<span ng-if="podTemplate.spec.containers.length > 1">Not all containers have health checks</span>
1515
to ensure your application is running correctly.
16-
<a ng-href="{{addHealthCheckUrl}}" class="nowrap">Add health checks</a>
16+
<a ng-href="{{addHealthCheckUrl}}" class="nowrap">Add Health Checks</a>
1717
</div>
1818

1919
<div class="pod-template-container">

‎app/views/_tasks.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<span class="task-links">
1111
<span>
1212
<a href="" ng-click="expanded = !expanded" role="button">
13-
<span ng-hide="expanded">Show details</span>
14-
<span ng-show="expanded">Hide details</span>
13+
<span ng-hide="expanded">Show Details</span>
14+
<span ng-show="expanded">Hide Details</span>
1515
</a>
1616
</span>
1717
<span ng-show="task.status=='completed'">

‎app/views/_webhook-trigger-cause.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<span ng-if="trigger.genericWebHook && !trigger.genericWebHook.revision">
1313
no revision information,
1414
</span>
15-
<a href="" ng-if="!showSecret" ng-click="toggleSecret()"> show obfuscated secret</a>
15+
<a href="" ng-if="!showSecret" ng-click="toggleSecret()">Show Obfuscated Secret</a>
1616
<span ng-if="showSecret">
1717
{{trigger.githubWebHook.secret || trigger.genericWebHook.secret}}
1818
</span>

‎app/views/add-config-volume.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ <h1>Add Config Files</h1>
5757
</ui-select>
5858
<div ng-if="('configmaps' | canI : 'create') || ('secrets' | canI : 'create')" class="mar-top-md">
5959
<span ng-if="'configmaps' | canI : 'create'">
60-
<a ng-href="project/{{project.metadata.name}}/create-config-map">Create config map</a>
60+
<a ng-href="project/{{project.metadata.name}}/create-config-map">Create Config Map</a>
6161
</span>
6262
<span ng-if="'secrets' | canI : 'create'">
6363
<span ng-if="'configmaps' | canI : 'create'" class="action-divider" aria-hidden="true">|</span>
64-
<a ng-href="project/{{project.metadata.name}}/create-secret?then={{returnURL | encodeURIComponent}}">Create secret</a>
64+
<a ng-href="project/{{project.metadata.name}}/create-secret?then={{returnURL | encodeURIComponent}}">Create Secret</a>
6565
</span>
6666
</div>
6767
<div class="help-block">

‎app/views/browse/_pod-details.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h4>Container {{containerStatus.name}}</h4>
6363
<dt>Restart Count:</dt>
6464
<dd>{{containerStatus.restartCount}}</dd>
6565
<div ng-if="pod.status.phase !== 'Completed' && !(pod | annotation : 'openshift.io/build.name') && (!containerStatus.state.running || !containerStatus.ready) && !(pod | isDebugPod) && ('pods' | canI : 'create')" class="debug-pod-action">
66-
<a href="" ng-click="debugTerminal(containerStatus.name)" role="button">Debug in terminal</a>
66+
<a href="" ng-click="debugTerminal(containerStatus.name)" role="button">Debug in Terminal</a>
6767
</div>
6868
</dl>
6969
</div>
@@ -81,9 +81,9 @@ <h4>Volumes</h4>
8181
<volumes ng-if="pod.spec.volumes.length" volumes="pod.spec.volumes" namespace="project.metadata.name"></volumes>
8282
<div ng-if="!pod.spec.volumes.length">none</div>
8383
<p ng-if="(pod | annotation:'deploymentConfig') && ('deploymentconfigs' | canI : 'update')">
84-
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{pod | annotation:'deploymentConfig'}}">Add storage to {{pod | annotation : 'deploymentConfig'}}</a>
84+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{pod | annotation:'deploymentConfig'}}">Add Storage to {{pod | annotation : 'deploymentConfig'}}</a>
8585
<span class="action-divider" aria-hidden="true">|</span>
86-
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=DeploymentConfig&name={{pod | annotation : 'deploymentConfig'}}">Add config files to {{pod | annotation : 'deploymentConfig'}}</a>
86+
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=DeploymentConfig&name={{pod | annotation : 'deploymentConfig'}}">Add Config Files to {{pod | annotation : 'deploymentConfig'}}</a>
8787
</p>
8888
</div>
8989
</div>

‎app/views/browse/_replica-set-details.html

+17-17
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ <h4>Volumes</h4>
9393
<div ng-if="deployment">
9494
<volumes volumes="replicaSet.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
9595
<div ng-if="{ group: 'extensions', resource: 'deployments' } | canI : 'update'">
96-
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions">Add storage</a>
96+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=Deployment&name={{deployment.metadata.name}}&group=extensions">Add Storage</a>
9797
<span class="action-divider" aria-hidden="true">|</span>
98-
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=Deployment&name={{deployment.metadata.name}}">Add config files</a>
98+
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=Deployment&name={{deployment.metadata.name}}">Add Config Files</a>
9999
</div>
100100
<div ng-if="!replicaSet.spec.template.spec.volumes.length && !({ group: 'extensions', resource: 'deployments' } | canI : 'update')">none</div>
101101
</div>
@@ -107,9 +107,9 @@ <h4>Volumes</h4>
107107
can-remove="true"
108108
remove-fn="removeVolume(volume)">
109109
</volumes>
110-
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions">Add storage</a>
110+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions">Add Storage</a>
111111
<span class="action-divider" aria-hidden="true">|</span>
112-
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions">Add config files</a>
112+
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions">Add Config Files</a>
113113
</div>
114114
<div ng-if="!(resource | canI : 'update')">
115115
<volumes volumes="replicaSet.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
@@ -121,9 +121,9 @@ <h4>Volumes</h4>
121121
<div ng-if="deploymentConfigName">
122122
<volumes volumes="replicaSet.spec.template.spec.volumes" namespace="project.metadata.name"></volumes>
123123
<div ng-if="'deploymentconfigs' | canI : 'update'">
124-
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{deploymentConfigName}}">Add storage to {{deploymentConfigName}}</a>
124+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=DeploymentConfig&name={{deploymentConfigName}}">Add Storage to {{deploymentConfigName}}</a>
125125
<span class="action-divider" aria-hidden="true">|</span>
126-
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=DeploymentConfig&name={{deploymentConfigName}}">Add config files to {{deploymentConfigName}}</a>
126+
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=DeploymentConfig&name={{deploymentConfigName}}">Add Config Files to {{deploymentConfigName}}</a>
127127
</div>
128128
<div ng-if="!replicaSet.spec.template.spec.volumes.length && !('deploymentconfigs' | canI : 'update')">none</div>
129129
</div>
@@ -135,7 +135,7 @@ <h4>Volumes</h4>
135135
can-remove="true"
136136
remove-fn="removeVolume(volume)">
137137
</volumes>
138-
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicationController&name={{replicaSet.metadata.name}}">Add storage</a>
138+
<a ng-href="project/{{project.metadata.name}}/attach-pvc?kind=ReplicationController&name={{replicaSet.metadata.name}}">Add Storage</a>
139139
<span class="action-divider" aria-hidden="true">|</span>
140140
<a ng-href="project/{{project.metadata.name}}/add-config-volume?kind=ReplicationController&name={{replicaSet.metadata.name}}">Add config files</a>
141141
</div>
@@ -164,17 +164,17 @@ <h3>Autoscaling</h3>
164164
<!-- Prompt to set CPU request on the DC if this is a deployment. -->
165165
<a ng-href="project/{{projectName}}/set-limits?kind=DeploymentConfig&name={{deploymentConfigName}}"
166166
ng-if="deploymentConfigName && !deploymentConfigMissing && ('deploymentconfigs' | canI : 'update')"
167-
role="button">Edit resource
168-
<span ng-if="!('cpu' | isRequestCalculated : project)">requests and</span> limits</a>
167+
role="button">Edit Resource
168+
<span ng-if="!('cpu' | isRequestCalculated : project)">Requests and</span> Limits</a>
169169
<!-- Prompt to set CPU request on the RC if not a deployment. -->
170170
<a ng-href="project/{{projectName}}/set-limits?kind=ReplicationController&name={{replicaSet.metadata.name}}"
171171
ng-if="!deploymentConfigName && kind === 'ReplicationController' && (resource | canI : 'update')"
172-
role="button">Edit resource
173-
<span ng-if="!('cpu' | isRequestCalculated : project)">requests and</span> limits</a>
172+
role="button">Edit Resource
173+
<span ng-if="!('cpu' | isRequestCalculated : project)">Requests and</span> Limits</a>
174174
<a ng-href="project/{{projectName}}/set-limits?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
175175
ng-if="!deploymentConfigName && kind === 'ReplicaSet' && (resource | canI : 'update')"
176-
role="button">Edit resource
177-
<span ng-if="!('cpu' | isRequestCalculated : project)">requests and</span> limits</a>
176+
role="button">Edit Resource
177+
<span ng-if="!('cpu' | isRequestCalculated : project)">Requests and</span> Limits</a>
178178
</span>
179179
</div>
180180

@@ -183,16 +183,16 @@ <h3>Autoscaling</h3>
183183
<span ng-if="{resource: 'horizontalpodautoscalers', group: 'extensions'} | canI : 'create'">
184184
<a ng-if="replicaSet.kind === 'ReplicaSet' && !deployment"
185185
ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicaSet&name={{replicaSet.metadata.name}}&group=extensions"
186-
role="button">Add autoscaler</a>
186+
role="button">Add Autoscaler</a>
187187
<a ng-if="replicaSet.kind === 'ReplicaSet' && deployment"
188188
ng-href="project/{{projectName}}/edit/autoscaler?kind=Deployment&name={{deployment.metadata.name}}&group=extensions"
189-
role="button">Add autoscaler</a>
189+
role="button">Add Autoscaler</a>
190190
<a ng-if="replicaSet.kind === 'ReplicationController' && !deploymentConfigName"
191191
ng-href="project/{{projectName}}/edit/autoscaler?kind=ReplicationController&name={{replicaSet.metadata.name}}"
192-
role="button">Add autoscaler</a>
192+
role="button">Add Autoscaler</a>
193193
<a ng-if="replicaSet.kind === 'ReplicationController' && deploymentConfigName"
194194
ng-href="project/{{projectName}}/edit/autoscaler?kind=DeploymentConfig&name={{deploymentConfigName}}"
195-
role="button">Add autoscaler</a>
195+
role="button">Add Autoscaler</a>
196196
</span>
197197
<span ng-if="!({resource: 'horizontalpodautoscalers', group: 'extensions'} | canI : 'create')">
198198
Autoscaling is not enabled. There are no autoscalers for this

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -367,16 +367,15 @@ <h3>Triggers</h3>
367367
<div ng-switch="trigger.type">
368368
<div ng-switch-when="GitHub">
369369
<dt>GitHub Webhook URL:
370-
<a href="{{'webhooks' | helpLink}}" target="_blank"><span class="learn-more-block">Learn more
371-
<i class="fa fa-external-link"></i></span></a>
370+
<a href="{{'webhooks' | helpLink}}" target="_blank"><span class="learn-more-block">Learn More&nbsp;<i class="fa fa-external-link" aria-hidden="true"></i></span></a>
372371
</dt>
373372
<dd>
374373
<copy-to-clipboard clipboard-text="buildConfig.metadata.name | webhookURL : trigger.type : trigger.github.secret : project.metadata.name"></copy-to-clipboard>
375374
</dd>
376375
</div>
377376
<div ng-switch-when="Generic">
378377
<dt>Generic Webhook URL:
379-
<a href="{{'webhooks' | helpLink}}" target="_blank"><span class="learn-more-block">Learn more <i class="fa fa-external-link"></i></span></a>
378+
<a href="{{'webhooks' | helpLink}}" target="_blank"><span class="learn-more-block">Learn More&nbsp;<i class="fa fa-external-link" aria-hidden="true"></i></span></a>
380379
</dt>
381380
<dd>
382381
<copy-to-clipboard clipboard-text="buildConfig.metadata.name | webhookURL : trigger.type : trigger.generic.secret : project.metadata.name"></copy-to-clipboard>
@@ -408,7 +407,7 @@ <h3>Triggers</h3>
408407
</div>
409408
<dt>Manual (CLI):
410409
<a href="{{'start-build' | helpLink}}" target="_blank">
411-
<span class="learn-more-block">Learn more <i class="fa fa-external-link"> </i></span>
410+
<span class="learn-more-block">Learn More&nbsp;<i class="fa fa-external-link" aria-hidden="true"> </i></span>
412411
</a>
413412
</dt>
414413
<dd>
@@ -425,8 +424,8 @@ <h3>Triggers</h3>
425424
<h3>Environment Variables</h3>
426425
<div style="margin-top: -5px;" ng-if="BCEnvVarsFromImage.length">
427426
The builder image has additional environment variables defined. Variables defined below will overwrite any from the image with the same name.
428-
<a href="" ng-click="expand.imageEnv = true" ng-if="!expand.imageEnv">Show image environment variables</a>
429-
<a href="" ng-click="expand.imageEnv = false" ng-if="expand.imageEnv">Hide image environment variables</a>
427+
<a href="" ng-click="expand.imageEnv = true" ng-if="!expand.imageEnv">Show Image Environment Variables</a>
428+
<a href="" ng-click="expand.imageEnv = false" ng-if="expand.imageEnv">Hide Image Environment Variables</a>
430429
</div>
431430
<key-value-editor
432431
ng-if="expand.imageEnv"
@@ -447,7 +446,7 @@ <h3>Environment Variables</h3>
447446
key-validator="[A-Za-z_][A-Za-z0-9_]*"
448447
key-validator-error="Please enter a valid key"
449448
key-validator-error-tooltip="A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."
450-
add-row-link="Add environment variable"
449+
add-row-link="Add Environment Variable"
451450
show-header></key-value-editor>
452451
<key-value-editor
453452
ng-if="!('buildconfigs' | canI : 'update')"
@@ -468,7 +467,7 @@ <h3>Environment Variables</h3>
468467
href=""
469468
ng-click="clearEnvVarUpdates()"
470469
class="mar-left-sm"
471-
style="vertical-align: -2px;">Clear changes</a>
470+
style="vertical-align: -2px;">Clear Changes</a>
472471
</div>
473472
</ng-form>
474473
</uib-tab>

0 commit comments

Comments
 (0)