Skip to content

Commit 8806409

Browse files
sg00dwinsg00dwin
committed
Follow-on updates from @jennyhaines
openshift#2362 (comment)
1 parent fe5fdfe commit 8806409

File tree

7 files changed

+54
-52
lines changed

7 files changed

+54
-52
lines changed

‎app/styles/_kve.less

+17
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,23 @@
192192
margin-bottom: 0;
193193
padding-right: 5px;
194194
width: 50%;
195+
&.config-map-header {
196+
> span {
197+
display: none;
198+
}
199+
@media(max-width: @screen-xxs-max) {
200+
width: 100%;
201+
> span {
202+
display: inline;
203+
}
204+
}
205+
}
206+
&.prefix-header {
207+
display: none;
208+
@media(min-width: @screen-xs-min) {
209+
display: block;
210+
}
211+
}
195212
}
196213

197214
.key-value-editor-entry-header,

‎app/styles/_tooltip.less

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

5+
.tooltip-default-icon {
6+
font-size: @font-size-base - 1;
7+
vertical-align: top;
8+
}
59
.tooltip-inner {
610
.word-break(); // so that long, unbroken strings don't overflow
711
}

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

+12-18
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
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>
7+
<span>and Prefix <small
8+
class="pficon pficon-help tooltip-default-icon"
9+
aria-hidden="true"
10+
data-toggle="tooltip"
11+
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>
12+
</span>
913
</div>
10-
<div class="form-group environment-from-editor-header value-header">
11-
<div class="input-group"
12-
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
14+
<div
15+
class="environment-from-editor-header prefix-header"
16+
ng-if="!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()">
1317
Prefix
14-
<small class="pficon pficon-help"
18+
<small class="pficon pficon-help tooltip-default-icon"
1519
aria-hidden="true"
1620
data-toggle="tooltip"
17-
data-original-title="Optional prefix added to each environment variable name."></small>
18-
</div>
21+
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>
1922
</div>
2023
</div>
2124

@@ -79,15 +82,6 @@
7982
<span class="help-block key-validation-error"
8083
ng-show="$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$error.pattern">
8184
<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>
9185
</span>
9286
</span>
9387
</div>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<form ng-if="$ctrl.apiObject" name="$ctrl.form" class="mar-bottom-xl">
22
<confirm-on-exit ng-if="$ctrl.canIUpdate && !$ctrl.ngReadonly" dirty="$ctrl.form.$dirty"></confirm-on-exit>
33
<div ng-repeat="container in $ctrl.containers">
4-
<h3>Container {{container.name}}</h3>
4+
<h2>Container {{container.name}}</h2>
55

66
<div ng-if="!$ctrl.canIUpdate || $ctrl.ngReadonly">
77
<span ng-if="!container.env.length">
@@ -34,13 +34,13 @@ <h3>Container {{container.name}}</h3>
3434
show-header>
3535
</key-value-editor>
3636

37-
<h4 class="section-label">
37+
<h3>
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>
43-
</h4>
43+
</h3>
4444
<edit-environment-from
4545
entries="container.envFrom"
4646
env-from-selector-options="$ctrl.valueFromObjects"

‎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

+9-22
Original file line numberDiff line numberDiff line change
@@ -6698,16 +6698,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
66986698
$templateCache.put('views/directives/edit-environment-from.html',
66996699
"<ng-form name=\"$ctrl.editEnvironmentFromForm\" novalidate>\n" +
67006700
"<div ng-if=\"$ctrl.showHeader\" class=\"environment-from-entry environment-from-editor-entry-header\">\n" +
6701-
"<div class=\"form-group environment-from-editor-header value-header\">\n" +
6702-
"<div class=\"input-group\">\n" +
6701+
"<div class=\"form-group environment-from-editor-header config-map-header\">\n" +
67036702
"Config Map/Secret\n" +
67046703
"</div>\n" +
6705-
"</div>\n" +
6706-
"<div class=\"form-group environment-from-editor-header value-header\">\n" +
6707-
"<div class=\"input-group\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
6704+
"<div class=\"form-group environment-from-editor-header prefix-header\" ng-if=\"!$ctrl.isEnvFromReadonly() && $ctrl.hasOptions()\">\n" +
67086705
"Prefix\n" +
6709-
"<small class=\"pficon pficon-help\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Optional prefix added to each environment variable name.\"></small>\n" +
6710-
"</div>\n" +
6706+
"<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" +
67116707
"</div>\n" +
67126708
"</div>\n" +
67136709
"<div ng-model=\"$ctrl.entries\" class=\"environment-from-editor\" as-sortable=\"$ctrl.dragControlListeners\">\n" +
@@ -6747,11 +6743,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
67476743
"<span ng-show=\"$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$touched\">\n" +
67486744
"<span class=\"help-block key-validation-error\" ng-show=\"$ctrl.editEnvironmentFromForm['envfrom-prefix-'+$index].$error.pattern\">\n" +
67496745
"<span class=\"validation-text\">Please enter a valid prefix.</span>\n" +
6750-
"<span class=\"help action-inline\">\n" +
6751-
"<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" +
6752-
"<span class=\"pficon pficon-help\"></span>\n" +
6753-
"</a>\n" +
6754-
"</span>\n" +
67556746
"</span>\n" +
67566747
"</span>\n" +
67576748
"</div>\n" +
@@ -6815,7 +6806,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68156806
"<form ng-if=\"$ctrl.apiObject\" name=\"$ctrl.form\" class=\"mar-bottom-xl\">\n" +
68166807
"<confirm-on-exit ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" dirty=\"$ctrl.form.$dirty\"></confirm-on-exit>\n" +
68176808
"<div ng-repeat=\"container in $ctrl.containers\">\n" +
6818-
"<h3>Container {{container.name}}</h3>\n" +
6809+
"<h2>Container {{container.name}}</h2>\n" +
68196810
"<div ng-if=\"!$ctrl.canIUpdate || $ctrl.ngReadonly\">\n" +
68206811
"<span ng-if=\"!container.env.length\">\n" +
68216812
"No environment variables set in the {{$ctrl.apiObject.kind | humanizeKind}} template for container {{container.name}}.\n" +
@@ -6825,10 +6816,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68256816
"</div>\n" +
68266817
"<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" +
68276818
"</key-value-editor>\n" +
6828-
"<h4 class=\"section-label\">\n" +
6819+
"<h3>\n" +
68296820
"Environment From\n" +
6830-
"<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" +
6831-
"</h4>\n" +
6821+
"<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" +
6822+
"</h3>\n" +
68326823
"<edit-environment-from entries=\"container.envFrom\" env-from-selector-options=\"$ctrl.valueFromObjects\" is-readonly=\"$ctrl.ngReadonly\" show-header>\n" +
68336824
"</edit-environment-from>\n" +
68346825
"</div>\n" +
@@ -7433,14 +7424,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
74337424
"<ng-form name=\"forms.keyValueEditor\" novalidate ng-if=\"entries\">\n" +
74347425
"<div ng-if=\"showHeader\" class=\"key-value-editor-entry key-value-editor-entry-header\">\n" +
74357426
"<div class=\"form-group key-value-editor-header key-header\">\n" +
7436-
"<div class=\"input-group\">\n" +
7437-
"<span class=\"help-block\">{{keyPlaceholder}}</span>\n" +
7438-
"</div>\n" +
7427+
"{{keyPlaceholder}}\n" +
74397428
"</div>\n" +
74407429
"<div class=\"form-group key-value-editor-header value-header\">\n" +
7441-
"<div class=\"input-group\">\n" +
7442-
"<span class=\"help-block\">{{valuePlaceholder}}</span>\n" +
7443-
"</div>\n" +
7430+
"{{valuePlaceholder}}\n" +
74447431
"</div>\n" +
74457432
"</div>\n" +
74467433
"<div ng-model=\"entries\" class=\"key-value-editor\" as-sortable=\"dragControlListeners\">\n" +

‎dist/styles/main.css

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

0 commit comments

Comments
 (0)