Skip to content

Commit 655e2da

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2400 from sg00dwin/env-from-cleanup
Automatic merge from submit-queue. Follow-on updates from jennyhaines Requested changes #2362 (comment) and #2182 (comment) <img width="755" alt="screen shot 2017-10-30 at 3 49 34 pm" src="https://user-images.githubusercontent.com/1874151/32193045-65a72b30-bd8c-11e7-9704-c763ab161392.png"> <img width="326" alt="screen shot 2017-10-30 at 4 08 01 pm" src="https://user-images.githubusercontent.com/1874151/32193095-8c67a470-bd8c-11e7-832b-6dc4914311ce.png">
2 parents 57ae92d + 9b85d2f commit 655e2da

File tree

7 files changed

+86
-59
lines changed

7 files changed

+86
-59
lines changed

‎app/styles/_kve.less

+23-2
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,13 @@
125125
position: relative;
126126
table-layout: fixed;
127127
width: 100%;
128-
@media(min-width: @screen-xs-min) {
129-
.environment-from-editor-button {
128+
.environment-from-editor-button {
129+
top: 26px; // position to align with config-map ui-select when stacked
130+
@media(min-width: @screen-xs-min) {
130131
float: left;
131132
padding: 0 5px;
132133
position: relative;
134+
top: 0; // position when not stacked
133135
width: auto;
134136
}
135137
}
@@ -185,6 +187,25 @@
185187
}
186188
}
187189

190+
.environment-from-editor-header {
191+
&.config-map-header,
192+
&.prefix-header {
193+
@media(max-width: @screen-xxs-max) {
194+
display: none;
195+
width: 100%;
196+
}
197+
&.config-map-header-mobile,
198+
&.prefix-header-mobile {
199+
display: block;
200+
margin-bottom: 0;
201+
margin-top: 5px;
202+
@media(min-width: @screen-xs-min) {
203+
display: none;
204+
}
205+
}
206+
}
207+
}
208+
188209
.key-value-editor .key-value-editor-input,
189210
.key-value-editor-header,
190211
.environment-from-editor-header {

‎app/styles/_tooltip.less

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
// Tooltips
33
// --------------------------------------------------
44

5+
// TODO Go thru and apply consistantly across pages
6+
.tooltip-default-icon {
7+
cursor: help;
8+
font-size: @font-size-base - 1;
9+
}
510
.tooltip-inner {
611
.word-break(); // so that long, unbroken strings don't overflow
712
}

‎app/views/directives/edit-environment-from.html

+23-21
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
<div
33
ng-if="$ctrl.showHeader"
44
class="environment-from-entry environment-from-editor-entry-header">
5-
<div class="form-group environment-from-editor-header value-header">
6-
<div class="input-group">
5+
<div class="environment-from-editor-header config-map-header">
76
Config Map/Secret
8-
</div>
97
</div>
10-
<div class="form-group environment-from-editor-header value-header">
11-
<div class="input-group"
12-
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
8+
<div
9+
class="environment-from-editor-header prefix-header"
10+
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
1311
Prefix
14-
<small class="pficon pficon-help"
12+
<small class="pficon pficon-help tooltip-default-icon"
1513
aria-hidden="true"
1614
data-toggle="tooltip"
17-
data-original-title="Optional prefix added to each environment variable name."></small>
18-
</div>
15+
data-original-title="Optional prefix added to each environment variable name. A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."></small>
1916
</div>
2017
</div>
2118

@@ -27,7 +24,12 @@
2724
ng-repeat="entry in $ctrl.envFromEntries"
2825
as-sortable-item>
2926

30-
<div class="form-group environment-from-input">
27+
<div class="environment-from-input">
28+
<div class="environment-from-editor-entry-header">
29+
<div class="environment-from-editor-header config-map-header config-map-header-mobile">
30+
Config Map/Secret
31+
</div>
32+
</div>
3133
<div ng-if="$ctrl.isEnvFromReadonly(entry) || !$ctrl.hasOptions()" class="faux-input-group">
3234
<div ng-if="!entry.configMapRef.name && !entry.secretRef.name">
3335
No config maps or secrets have been added as Environment From.
@@ -62,7 +64,16 @@
6264
</div>
6365
</div>
6466

65-
<div class="form-group environment-from-input prefix">
67+
<div class="environment-from-input prefix">
68+
<div
69+
class="environment-from-editor-header prefix-header prefix-header-mobile"
70+
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
71+
Prefix
72+
<small class="pficon pficon-help tooltip-default-icon"
73+
aria-hidden="true"
74+
data-toggle="tooltip"
75+
data-original-title="Optional prefix added to each environment variable name. A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores."></small>
76+
</div>
6677
<div class="environment-from-input"
6778
ng-if="!$ctrl.isEnvFromReadonly(entry) && $ctrl.hasOptions()"
6879
ng-class="{ 'has-error': ($ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$invalid && $ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$touched) }">
@@ -79,15 +90,6 @@
7990
<span class="help-block key-validation-error"
8091
ng-show="$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$error.pattern">
8192
<span class="validation-text">Please enter a valid prefix.</span>
82-
<span class="help action-inline">
83-
<a
84-
aria-hidden="true"
85-
data-toggle="tooltip"
86-
data-placement="top"
87-
data-original-title="A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.">
88-
<span class="pficon pficon-help"></span>
89-
</a>
90-
</span>
9193
</span>
9294
</span>
9395
</div>
@@ -118,7 +120,7 @@
118120
</div>
119121
</div>
120122

121-
<div class="environment-from-entry form-group" ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
123+
<div class="environment-from-entry" ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
122124
<a
123125
href=""
124126
class="add-row-link"

‎app/views/directives/edit-environment-variables.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ <h3>Container {{container.name}}</h3>
3434
show-header>
3535
</key-value-editor>
3636

37-
<h4 class="section-label">
37+
<h4>
3838
Environment From
39-
<span class="pficon pficon-help"
39+
<span class="pficon pficon-help tooltip-default-icon"
4040
aria-hidden="true"
4141
data-toggle="tooltip"
4242
data-original-title="Environment From lets you add all key-value pairs from a config map or secret as environment variables."></span>

‎app/views/directives/key-value-editor.html

+4-8
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
<div
44
ng-if="showHeader"
55
class="key-value-editor-entry key-value-editor-entry-header">
6-
<div class="form-group key-value-editor-header key-header">
7-
<div class="input-group">
8-
<span class="help-block">{{keyPlaceholder}}</span>
9-
</div>
6+
<div class="key-value-editor-header key-header">
7+
{{keyPlaceholder}}
108
</div>
11-
<div class="form-group key-value-editor-header value-header">
12-
<div class="input-group">
13-
<span class="help-block">{{valuePlaceholder}}</span>
14-
</div>
9+
<div class="key-value-editor-header value-header">
10+
{{valuePlaceholder}}
1511
</div>
1612
</div>
1713

‎dist/scripts/templates.js

+21-25
Original file line numberDiff line numberDiff line change
@@ -6695,21 +6695,22 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
66956695
$templateCache.put('views/directives/edit-environment-from.html',
66966696
"<ng-form name=\"$ctrl.editEnvironmentFromForm\" novalidate>\n" +
66976697
"<div ng-if=\"$ctrl.showHeader\" class=\"environment-from-entry environment-from-editor-entry-header\">\n" +
6698-
"<div class=\"form-group environment-from-editor-header value-header\">\n" +
6699-
"<div class=\"input-group\">\n" +
6698+
"<div class=\"environment-from-editor-header config-map-header\">\n" +
67006699
"Config Map/Secret\n" +
67016700
"</div>\n" +
6702-
"</div>\n" +
6703-
"<div class=\"form-group environment-from-editor-header value-header\">\n" +
6704-
"<div class=\"input-group\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
6701+
"<div class=\"environment-from-editor-header prefix-header\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
67056702
"Prefix\n" +
6706-
"<small class=\"pficon pficon-help\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Optional prefix added to each environment variable name.\"></small>\n" +
6707-
"</div>\n" +
6703+
"<small class=\"pficon pficon-help tooltip-default-icon\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Optional prefix added to each environment variable name. A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\"></small>\n" +
67086704
"</div>\n" +
67096705
"</div>\n" +
67106706
"<div ng-model=\"$ctrl.entries\" class=\"environment-from-editor\" as-sortable=\"$ctrl.dragControlListeners\">\n" +
67116707
"<div class=\"environment-from-entry\" ng-class-odd=\"'odd'\" ng-class-even=\"'even'\" ng-repeat=\"entry in $ctrl.envFromEntries\" as-sortable-item>\n" +
6712-
"<div class=\"form-group environment-from-input\">\n" +
6708+
"<div class=\"environment-from-input\">\n" +
6709+
"<div class=\"environment-from-editor-entry-header\">\n" +
6710+
"<div class=\"environment-from-editor-header config-map-header config-map-header-mobile\">\n" +
6711+
"Config Map/Secret\n" +
6712+
"</div>\n" +
6713+
"</div>\n" +
67136714
"<div ng-if=\"$ctrl.isEnvFromReadonly(entry) || !$ctrl.hasOptions()\" class=\"faux-input-group\">\n" +
67146715
"<div ng-if=\"!entry.configMapRef.name && !entry.secretRef.name\">\n" +
67156716
"No config maps or secrets have been added as Environment From.\n" +
@@ -6737,18 +6738,17 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
67376738
"</div>\n" +
67386739
"</div>\n" +
67396740
"</div>\n" +
6740-
"<div class=\"form-group environment-from-input prefix\">\n" +
6741+
"<div class=\"environment-from-input prefix\">\n" +
6742+
"<div class=\"environment-from-editor-header prefix-header prefix-header-mobile\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
6743+
"Prefix\n" +
6744+
"<small class=\"pficon pficon-help tooltip-default-icon\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Optional prefix added to each environment variable name. A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\"></small>\n" +
6745+
"</div>\n" +
67416746
"<div class=\"environment-from-input\" ng-if=\"!$ctrl.isEnvFromReadonly(entry) && $ctrl.hasOptions()\" ng-class=\"{ 'has-error': ($ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$invalid && $ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$touched) }\">\n" +
67426747
"<label for=\"envfrom-prefix-{{$index}}\" class=\"sr-only\">Prefix</label>\n" +
67436748
"<input type=\"text\" class=\"form-control\" placeholder=\"Add prefix\" id=\"envfrom-prefix-{{$index}}\" name=\"envfrom-prefix-{{$index}}\" ng-model=\"entry.prefix\" ng-pattern=\"/^[a-zA-Z0-9_]+$/\">\n" +
67446749
"<span ng-show=\"$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$touched\">\n" +
67456750
"<span class=\"help-block key-validation-error\" ng-show=\"$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$error.pattern\">\n" +
67466751
"<span class=\"validation-text\">Please enter a valid prefix.</span>\n" +
6747-
"<span class=\"help action-inline\">\n" +
6748-
"<a aria-hidden=\"true\" data-toggle=\"tooltip\" data-placement=\"top\" data-original-title=\"A valid prefix is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\">\n" +
6749-
"<span class=\"pficon pficon-help\"></span>\n" +
6750-
"</a>\n" +
6751-
"</span>\n" +
67526752
"</span>\n" +
67536753
"</span>\n" +
67546754
"</div>\n" +
@@ -6761,7 +6761,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
67616761
"</div>\n" +
67626762
"</div>\n" +
67636763
"</div>\n" +
6764-
"<div class=\"environment-from-entry form-group\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
6764+
"<div class=\"environment-from-entry\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
67656765
"<a href=\"\" class=\"add-row-link\" role=\"button\" ng-click=\"$ctrl.onAddRow()\">Add ALL Values from Config Map or Secret</a>\n" +
67666766
"</div>\n" +
67676767
"</div>\n" +
@@ -6822,9 +6822,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68226822
"</div>\n" +
68236823
"<key-value-editor ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" value-from-selector-options=\"$ctrl.valueFromObjects\" key-validator=\"[A-Za-z_][A-Za-z0-9_]*\" key-validator-error=\"Please enter a valid key.\" 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.\" add-row-link=\"Add Value\" add-row-with-selectors-link=\"Add Value from Config Map or Secret\" show-header>\n" +
68246824
"</key-value-editor>\n" +
6825-
"<h4 class=\"section-label\">\n" +
6825+
"<h4>\n" +
68266826
"Environment From\n" +
6827-
"<span class=\"pficon pficon-help\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Environment From lets you add all key-value pairs from a config map or secret as environment variables.\"></span>\n" +
6827+
"<span class=\"pficon pficon-help tooltip-default-icon\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Environment From lets you add all key-value pairs from a config map or secret as environment variables.\"></span>\n" +
68286828
"</h4>\n" +
68296829
"<edit-environment-from entries=\"container.envFrom\" env-from-selector-options=\"$ctrl.valueFromObjects\" is-readonly=\"$ctrl.ngReadonly\" show-header>\n" +
68306830
"</edit-environment-from>\n" +
@@ -7429,15 +7429,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
74297429
$templateCache.put('views/directives/key-value-editor.html',
74307430
"<ng-form name=\"forms.keyValueEditor\" novalidate ng-if=\"entries\">\n" +
74317431
"<div ng-if=\"showHeader\" class=\"key-value-editor-entry key-value-editor-entry-header\">\n" +
7432-
"<div class=\"form-group key-value-editor-header key-header\">\n" +
7433-
"<div class=\"input-group\">\n" +
7434-
"<span class=\"help-block\">{{keyPlaceholder}}</span>\n" +
7435-
"</div>\n" +
7436-
"</div>\n" +
7437-
"<div class=\"form-group key-value-editor-header value-header\">\n" +
7438-
"<div class=\"input-group\">\n" +
7439-
"<span class=\"help-block\">{{valuePlaceholder}}</span>\n" +
7432+
"<div class=\"key-value-editor-header key-header\">\n" +
7433+
"{{keyPlaceholder}}\n" +
74407434
"</div>\n" +
7435+
"<div class=\"key-value-editor-header value-header\">\n" +
7436+
"{{valuePlaceholder}}\n" +
74417437
"</div>\n" +
74427438
"</div>\n" +
74437439
"<div ng-model=\"entries\" class=\"key-value-editor\" as-sortable=\"dragControlListeners\">\n" +

‎dist/styles/main.css

+8-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)